Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-11 22:46:56 +00:00
Code Releases Activity
363 Commits 7 Branches 17 Tags
develop
Commit Graph
75 Commits
Author SHA1 Message Date
Rainux Luo c8d12097ef Add some convenient shortcuts for main menu 2019-11-06 16:59:14 +08:00
ImPerat0R_ 8baf1c8485 Fix typo. (#12) 
* Fix typo.

* Fix typo
 2017-09-07 18:02:21 +08:00
秦宇航 944cfb47da Fix subscribe cannot delete to zero 2017-07-17 08:42:27 +08:00
秦宇航 010b093368 Merge branch 'develop' into feature/subscribe 2017-07-16 21:08:36 +08:00
秦宇航 a984a62f7e finish viewcontroller 2017-07-16 21:07:31 +08:00
秦宇航 55ef345611 localization 2017-07-16 09:26:38 +08:00
秦宇航 6f6b75b664 Rerange menu items 
TODO finish the table view of subscribe management
Especially the bind profile thing
 2017-07-14 08:55:20 +08:00
秦宇航 82d7558b58 Fix profile bind problem 2017-07-14 00:17:42 +08:00
秦宇航 17a3d3a59f init subscribe 2017-06-15 06:27:08 +08:00
秦宇航 a5b1e63db8 fix typo 2017-05-16 14:33:15 +08:00
秦宇航 36d59645d9 可自定义远端ACL文件地址 2017-05-14 08:32:02 +08:00
秦宇航 0cf8229623 FIX ACL Path bug 2017-05-07 19:09:58 +08:00
秦宇航 95bf7b84ba 新增ACL自动模式 和 回国模式（Proxy Back China） 
回国模式必须搭配一个回国的SS才可使用。原理为仅代理国内IP
 2017-05-07 14:40:21 +08:00
秦宇航 c1b37d4482 更新白名单模式 
更新白名单模式，现在基于全局模式下使用ACL文件分流
TODO 基于ACL的自动和回国模式
 2017-05-07 12:58:18 +08:00
qinyuhang 27add56b38 Remove OTA 2017-02-05 20:10:04 +08:00
qinyuhang fc5cbe8621 Add check updates at launch menu 2017-02-05 17:34:46 +08:00
imnotpopo f290ecb567 Update Localizable.strings 
Fixed typo
 2017-01-11 15:06:04 +08:00
imnotpopo 989cf67f77 Update AdvPreferencesWindowController.xib 2017-01-11 15:05:16 +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 9ed1eb08e6 sync ssr-local for protocol method 
1. 支持协议参数，为单端口多用户做好准备
2. 支持Group参数，可用于分组节点列表
 2017-01-08 21:10:50 +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
王晨 e91eabfc5a 增加 HTTP代理 跟随全局设置 2016-10-09 14:31:13 +08:00
王晨 4f985feae0 增加privacy 2016-10-07 17:52:30 +08:00
qinyuhang bfa617be6f Merge branch 'shadowsocks/develop' into swift3-syntax 2016-10-02 09:12:24 +08:00
Charlie Qiu bfc39d8179 顶级菜单中服务器名前加上文字:服务器. 2016-10-02 01:45:59 +08:00
Charlie Qiu 7076523cbd Merge branch 'pr/44' into develop 2016-10-02 00:08:33 +08:00
qinyuhang 83df982029 增加 打开时自动连接 选项 2016-09-12 16:09:39 +08:00
qinyuhang 48a46d79e2 try merge yichengchen/ssr 2016-09-09 12:51:37 +08:00
qinyuhang 303cc41016 finish export function 
finish export function
fix issue https://github.com/qinyuhang/ShadowsocksX-NG/issues/8
 2016-08-28 08:24:33 +08:00
qinyuhang d5d9aeabf8 Show example file function 
Show example file function
 2016-08-27 18:58:40 +08:00
qinyuhang 6df2715651 Update Localization 
Update Localization
 2016-08-27 17:07:15 +08:00
qinyuhang a48805d687 Finish import function 
Finish import function
TODO: export function & show example config function
 2016-08-27 09:47:25 +08:00
qinyuhang 4e255921b5 add menu button 
add menu button
 2016-08-26 13:32:05 +08:00
qinyuhang abfa8c78e1 Merge remote-tracking branch 'qiuyuzhou/develop' into develop 
# Conflicts:
#	ShadowsocksX-NG/PreferencesWindowController.swift
add fix duplicate profile error
 2016-08-25 12:41:37 +08:00
qinyuhang 0068a96481 Bump version 
add custom white list & white ip list settings
 2016-08-25 12:02:00 +08:00
qinyuhang 020ad8b2cf add adv setting for local PAC server 
add adv setting for local PAC server
 2016-08-25 10:01:22 +08:00
qinyuhang cd1b1cd87f add adv settings for pac server 
add adv settings for pac server address & port
handle accident crash on stop pac server
 2016-08-25 09:19:47 +08:00
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
Yicheng 4f982d48e0 prevent remove all servers 2016-08-22 23:17:31 +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 f505c39c42 Fix typo 
Fix typo
 2016-08-17 12:56:50 +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 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
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
bjzhou1990 fecc4a9ef5 revert unneed changes 2016-08-02 13:43:51 +08:00