Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-21 06:54:41 +00:00
Code Releases Activity
104 Commits 7 Branches 17 Tags
eddb2d4f82ad7a97c2cbb213e25e432ac0470e95
Commit Graph
104 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
qinyuhang eddb2d4f82 Update duplicate icons 
Update duplicate icons
Fix up force quite app ss-local still running background
 2016-08-23 10:41:04 +08:00
qinyuhang 72d5c985e9 Bump up version & update readme 
Bump up version & update readme
 2016-08-22 19:37:11 +08:00
qinyuhang b24b9e9b14 Add duplicate server profile 
1. Add duplicate server profile button
2. Update status bar icon (改进了之前颜色太浅的问题)
3. Fix layout on server preference window
4. Add alert or shake window when profile is not completed
 2016-08-22 19:18:35 +08:00
qinyuhang 1a8c171493 Update Readme 
Update Readme
Remove Protocol auth_simple
 2016-08-22 00:30:09 +08:00
qinyuhang f505c39c42 Fix typo 
Fix typo
 2016-08-17 12:56:50 +08:00
qinyuhang e7a33b705d update ss-local with updated obfs protocols 
update ss-local sync with breakwa11
updated methods, obfs protocols, obfs methods:
method: add
rc4-md5-6
chacha20-ietf
camellia-128-cfb
camellia-192-cfb
camellia-256-cfb
idea-cfb
rc2-cfb
seed-cfb
obfs: add
tls_simple
random_head
obfs: remove
tls1.0_session_auth
 2016-08-16 11:34:23 +08:00
qinyuhang d3b4971313 hot-fix crash at macOS 10.12 2016-08-14 23:18:51 +08:00
秦宇航 83cecb7459 Merge pull request #1 from qinyuhang/white-list 
add White list feature
 2016-08-14 07:58:44 +08:00
qinyuhang 134ededf89 Merge branch 'develop' into white-list 2016-08-14 07:50:56 +08:00
qinyuhang eae605910c 新增加白名单模式 
新增白名单模式，白名单来自破娃酱
注意事项，替换白名单中proxy的地址时发现原来的IP白名单中 wall_proxy 只有 socks5，而域名白名单中 wall_proxy
有 socks 和 socks5（只有这样才会work）。故此在后面的处理替换中将两个都加上了。后续变化，还需要看破娃酱 white list
具体变化。
 2016-08-14 00:40:14 +08:00
qinyuhang be51992ba8 init white list 2016-08-13 16:59:26 +08:00
qinyuhang 2d27b20cb2 Merge remote-tracking branch 'qiuyuzhou/develop' into develop 2016-08-13 13:34:39 +08:00
Qiu Yuzhou f9f342d7cf Merge pull request #36 from alejx/patch-1 
Fix some misspelled words.
 2016-08-13 11:27:35 +08:00
stonenya d8644e4e84 Fix some misspelled words. 2016-08-13 11:21:02 +08:00
qinyuhang 4f6f392b24 fix add server from QR code 
fix add server from QR code
 2016-08-12 10:26:37 +08:00
qinyuhang 6eea282f69 fix config 
fix config
 2016-08-11 11:57:12 +08:00
qinyuhang 8569bc590c finish integration basic ssr function 
finish integration basic ssr function
 2016-08-11 11:23:09 +08:00
qinyuhang 8bd4f25e7b Start integrate SSR 
Start integrate SSR
1. modify profile, added SSR configure and init this profile to empty
to compatible with origin SS
2. replace ss-local from v2.4.6 to 2.4.8 (from @breakwa11 )
3. add obfs params box to configure view
4. add scan from “ssr://” QR code
Todo:
make modify to program interaction with ss-local to accept SSR
 2016-08-11 09:33:58 +08:00
qinyuhang c43ed478fd Merge remote-tracking branch 'qiuyuzhou/develop' into develop 2016-08-08 22:08:20 +08:00
Charlie Qiu b874a9dc23 Resize server profiles list in the preferences window. 2016-08-04 16:47:00 +08:00
Charlie Qiu 9068970c35 Resize server profiles list in the preferences window. 2016-08-04 00:55:03 +08:00
Charlie Qiu 245770afcf Fix bug #24 
避免清空不是由ShadowsocksX-NG设置代理配置。
 2016-08-04 00:41:00 +08:00
Charlie Qiu f096ed2b23 Merge branch 'feature/bug23' into develop 2016-08-03 23:51:55 +08:00
Charlie Qiu 2d69aedd17 Merge branch 'pr/21' into develop 2016-08-03 23:51:07 +08:00
Charlie Qiu 7e1dc05b17 Fix bug #23: 没有~/Library/LaunchAgents文件夹启动故障 2016-08-03 23:45:46 +08:00
bjzhou1990 fecc4a9ef5 revert unneed changes 2016-08-02 13:43:51 +08:00
bjzhou1990 995d43a41e add edit user rule window 2016-08-01 15:28:59 +08:00
Charlie Qiu 9e0c650e33 Update README 2016-07-10 18:36:22 +08:00
Qiu Yuzhou 8c1ea5dd38 Merge pull request #14 from jackwish/develop 
Move PAC & QRCode menu items to level 2 menu
 2016-07-10 18:08:31 +08:00
WANG Zhenhua de8aa45b02 Move PAC & QRCode menu items to level 2 menu 
1. Move PAC related items to *Proxy* submenu.
2. Move QR related items to *Server* submenu.
3. Remove some separators of main menu.
 2016-07-10 17:52:33 +08:00
Charlie Qiu 03cefc5099 Support drag & drop reorder the server profiles. 2016-07-09 15:10:05 +08:00
Charlie Qiu 6c40f8c167 Change version number to 1.2 2016-07-07 15:56:55 +08:00
Charlie Qiu 810479a40b Fix Assets.xcassets 2016-07-07 15:56:24 +08:00
Charlie Qiu 65af97edae Show current proxy mode on top menu item. 2016-07-07 15:51:27 +08:00
Charlie Qiu 7ab319e23e Merge branch 'release/1.1' 1.1 2016-07-06 19:50:34 +08:00
Charlie Qiu f1e264ae47 Localize advance proxy preferences panel. 2016-07-06 13:18:07 +08:00
Charlie Qiu e1ec9d7c8e Localization 2016-07-06 12:36:31 +08:00
Charlie Qiu e41a130c1c Change ss port minimum limit from 128 to 1. 2016-07-01 16:09:48 +08:00
Charlie Qiu ea4e006133 Advance preference for proxy. 
Manual spesify network services which would be configure.
 2016-06-30 02:33:37 +08:00
Charlie Qiu 1380f245d5 Fix spell errors. Rename all 'Shadowsocks-NE' to 'Shadowsocks-NG' 2016-06-25 15:00:03 +08:00
Charlie Qiu 012c0de1c5 Update README 2016-06-25 09:47:27 +08:00
Charlie Qiu 0d2172a565 Change version to 1.1 2016-06-25 09:45:36 +08:00
Charlie Qiu 2ef7adde6e Fix wrong spell in path. 2016-06-25 09:44:51 +08:00
Charlie Qiu fa6d9d64de Merge branch 'develop' of https://github.com/qiuyuzhou/ShadowsocksX-NG into develop 2016-06-23 12:10:34 +08:00
Charlie Qiu 6bfa77d773 Cocoa Keyboard Shortcuts in Dialog without an Edit Menu 2016-06-23 12:10:22 +08:00
Qiu Yuzhou 598ac6ea4d Merge pull request #8 from cs17899219/develop 
Use a singleton ServerProfileManager
 2016-06-23 11:24:22 +08:00
C.S 94e065ea63 Bugfix use a singleton ServerProfileManager 2016-06-23 10:07:26 +08:00
Charlie Qiu 78bb0b7d32 Change to use flat app icons. 2016-06-21 22:35:43 +08:00
Charlie Qiu 64b1e0f488 Merge branch 'release/1.0' 1.0 2016-06-20 15:42:11 +08:00
Charlie Qiu 81df618fe0 Merge branch 'release/1.0' into develop 2016-06-20 15:42:11 +08:00