Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-18 11:43:43 +00:00
Code Releases Activity
363 Commits 7 Branches 17 Tags
develop
Commit Graph
363 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nobel b6b97b7f30 Sync server name menu when server preference changed. 2017-01-11 15:01:02 +08:00
qinyuhang 6fc13af5fe Fix Bundle Path logic 2017-01-10 14:49:26 +08:00
qinyuhang ff41dbb2fa fix user ruler rich text 2017-01-09 23:27:50 +08:00
qinyuhang 515010a5e8 Fix typo 2017-01-09 23:15:56 +08:00
qinyuhang 6576ffd0cc Sync SSR-local 
1. 更新 ss-locla
2. 现在开启软件自动检查更新了（bug UI会卡住一下，是异步的问题，待查）
3. 菜单添加检查更新按钮
 2017-01-09 20:05:16 +08:00
qinyuhang 615b80c7fc speed up json import 
speed up json config file import, you should see it happend
 2017-01-08 23:10:31 +08:00
qinyuhang daa4ef64f6 fix wrong key in json import 2017-01-08 22:59:52 +08:00
qinyuhang 9ed1eb08e6 sync ssr-local for protocol method 
1. 支持协议参数，为单端口多用户做好准备
2. 支持Group参数，可用于分组节点列表
 2017-01-08 21:10:50 +08:00
qinyuhang 3643070280 sync ssr-local 
sync ssr-local, now support protocol param
bump to build 6
 2017-01-07 09:49:39 +08:00
qinyuhang f64a8eb78c update README 2016-12-28 10:58:09 +08:00
qinyuhang 68f1cdfa62 sync ss-libev 2016-12-24 10:27:47 +08:00
qinyuhang 857a6c9883 build static libpcre into ss-local 
Note `./configure --with-pcre=/usr/local/Cellar/pcre/8.39/static
--with-openssl=/usr/local/Cellar/openssl/1.0.2j/static
--disable-documentation  --disable-dynamic-pcre  && make clean && make`
 2016-11-16 09:04:24 +08:00
qinyuhang 2a5507bb84 fix aes128_md5 & aes128_sha1 problem 
https://github.com/qinyuhang/ShadowsocksX-NG/issues/60
 2016-10-30 19:32:20 +08:00
qinyuhang 67d39ecbbf fix ssr QR code scan problem 
https://github.com/qinyuhang/ShadowsocksX-NG/issues/59
 2016-10-30 19:26:41 +08:00
qinyuhang c4574b644a update xcode project settings 2016-10-30 18:35:44 +08:00
qinyuhang e0dfcfa8d5 update ss-local version to 2.5.4 2016-10-24 13:10:44 +08:00
qinyuhang d7093eb0a2 sync ss-libev 
support auth_aes128_md5 & auth_aes128_sha1 (TCP only)
 2016-10-22 11:40:04 +08:00
Charlie Qiu 13a0ba7390 bind continuously updates value 
https://github.com/shadowsocks/ShadowsocksX-NG/issues/102
 2016-10-22 09:35:51 +08:00
Charlie Qiu f1eabc735e fix cannot show current QR 
issue https://github.com/shadowsocks/ShadowsocksX-NG/issues/104
 2016-10-22 09:30:10 +08:00
qinyuhang 7c4444e417 fix issue #51 
fix issue 51 IP white list not working
 2016-10-19 14:39:34 +08:00
qinyuhang eefc1893c4 更新ss-libev修正tls1.2_ticket_auth发包问题 
参考
https://github.com/breakwa11/shadowsocks-libev/commit/7fe1e2b8e6bcc2b05d
7f613f5d4f91963a0b10e3
 2016-10-18 15:24:00 +08:00
qinyuhang d4940ce9ae Bump build version 2016-10-12 15:19:54 +08:00
秦宇航 7d67ed04ec Merge pull request #44 from zhfish/feature/privoxy 
recompile privoxy within libpcre
 2016-10-10 22:57:10 +08:00
位敏 73cab83c86 recompile privoxy within libpcre 2016-10-10 20:47:24 +08:00
qinyuhang c0446a49ea fix crash on import json config file 2016-10-09 17:45:40 +08:00
qinyuhang f790b22516 Bump version 
Now is 1.3.4-R
Now on GLOBAL mode, we enable privoxy to supply http & https proxy!
Swift 2.3 version will keep up after a while.
 2016-10-09 15:12:30 +08:00
qinyuhang 65a009eed6 修正menu bar 颜色问题 
修正menu bar 颜色问题
 2016-10-09 15:05:20 +08:00
秦宇航 dc9f045ec7 Merge pull request #37 from zhfish/feature/privoxy 
增加privoxy
 2016-10-09 15:04:53 +08:00
王晨 e91eabfc5a 增加 HTTP代理 跟随全局设置 2016-10-09 14:31:13 +08:00
王晨 2420b8b1e3 更新两处http开关，随ss开启和关闭 2016-10-08 17:16:02 +08:00
qinyuhang 1de918d40c typo fix 
https://github.com/qinyuhang/ShadowsocksX-NG/issues/38
 2016-10-08 13:33:10 +08:00
王晨 4f985feae0 增加privacy 2016-10-07 17:52:30 +08:00
qinyuhang d26410aae6 bug fix 
1. fix issue https://github.com/qinyuhang/ShadowsocksX-NG/issues/35
2. add new ss-local support traffic log (experiment only count traffic
going through proxy)
3. ping client update menu upon finish ping any one server
 2016-10-07 10:50:03 +08:00
qinyuhang afa46d20b4 Merge branch 'swift3-syntax' into develop 2016-10-05 09:58:18 +08:00
qinyuhang 8f5fdcdec6 disable show MODE on system bar 
disable show MODE on system bar, current solution is taking too much
space, we need new solution
 2016-10-03 12:31:06 +08:00
qinyuhang 9c30b67500 Merge branch 'shadowsocks/develop' into swift3-syntax 2016-10-02 20:42:13 +08:00
Charlie Qiu cc467c4df2 Update travis to use image xocde8 instead of xocde7.3 2016-10-02 15:14:09 +08:00
qinyuhang bfa617be6f Merge branch 'shadowsocks/develop' into swift3-syntax 2016-10-02 09:12:24 +08:00
qinyuhang 5e14ad3fb0 update alamo fire to 4.0.1 2016-10-02 08:07:09 +08:00
qinyuhang 0922622962 Merge branch 'develop' into swift3-syntax 2016-10-02 07:42:09 +08:00
Charlie Qiu dff5679dcb Update requirements in readme. 2016-10-02 02:11:09 +08:00
Charlie Qiu bfc39d8179 顶级菜单中服务器名前加上文字:服务器. 2016-10-02 01:45:59 +08:00
Charlie Qiu cb9d2b62ad Convert to swift 3 syntax. 2016-10-02 01:39:21 +08:00
Charlie Qiu 294073011b Merge branch 'pr/75' into develop 2016-10-02 01:36:32 +08:00
Charlie Qiu cd5c724bb7 Merge branch 'pr/54' into develop 
# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift

Update to swift 3 syntax
 2016-10-02 01:34:48 +08:00
Qiu Yuzhou 07532daac2 Merge pull request #73 from whao/patch-1 
Typo fix
 2016-10-02 01:26:55 +08:00
Charlie Qiu b389dc226c Call webServer startWithOptions instead of startWithPort 
建议使用 webServer.startWithOptions(["BindToLocalhost":true,"Port":xxxx]) 来避免提示允许监听端口
 2016-10-02 01:24:38 +08:00
Charlie Qiu 25f8319e85 Update version number from 1.2 to 1.3 2016-10-02 01:19:17 +08:00
Charlie Qiu 7a7249b80f Update for swift 3. 
- Convert code to swift 3
- Update alamofire to 4.0.1 for swift 3.
 2016-10-02 01:17:07 +08:00
Charlie Qiu 7076523cbd Merge branch 'pr/44' into develop 2016-10-02 00:08:33 +08:00