Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-10 22:14:00 +00:00
Code Releases Activity
93 Commits 7 Branches 17 Tags
2d27b20cb299340887c88a67f32f2bb381b92c0d
Commit Graph
93 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Charlie Qiu 4659a963b3 Update build number to 3. 2016-06-20 15:41:12 +08:00
Charlie Qiu 23696420a5 Add show logs menu item. 2016-06-18 11:06:49 +08:00
Charlie Qiu 7e184d5a1b Add "Enable verbose mode" to adv preferences panel. 2016-06-18 10:44:09 +08:00
Charlie Qiu 326b080027 Enable ss-local verbose mode. 2016-06-15 05:38:50 +08:00
Charlie Qiu a28612b1c3 Build number to 2 v1.0-beta2 2016-06-14 20:29:55 +08:00
Charlie Qiu ce2d4e8a55 Change Default listen address from localhost to 127.0.0.1 2016-06-14 20:26:12 +08:00
Charlie Qiu 98e3fb6bea Update README v1.0-beta 2016-06-14 10:53:08 +08:00
Charlie Qiu 3e11995462 Translations. 2016-06-14 10:32:34 +08:00
Charlie Qiu b65ad287db The code related to pasteboard is not work. Same code work in oc. So disable the copy url button now. 2016-06-14 10:27:32 +08:00
Charlie Qiu c072244ebd Add .gitignore 2016-06-14 10:21:54 +08:00
Charlie Qiu 20b5a73f13 Update travis.yml 2016-06-12 10:44:16 +08:00