62 Commits
Author SHA1 Message Date
秦宇航 81acc0cfeb Merge branch 'develop' of github.com:qinyuhang/shadowsocksX-NG-R into develop 2019-11-11 22:08:22 +08:00
Rainux Luo 2eb1b0512a Rename bundle identifier and build target 2019-11-06 16:59:14 +08:00
秦宇航 51be0e57a9 update config 2018-10-11 11:44:02 +08:00
秦宇航 6fd29658bd update pods 2018-10-08 06:33:14 +08:00
秦宇航 55ef345611 localization 2017-07-16 09:26:38 +08:00
秦宇航 2b592e9be6 add subscribe manager 2017-06-20 18:22:38 +08:00
秦宇航 17a3d3a59f init subscribe 2017-06-15 06:27:08 +08:00
mcfans 158af9f90b update xcodeproj 2017-06-05 10:25:08 +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
秦宇航 ead8ef5a74 add new image and change mode image swith 2017-04-02 12:26:31 +08:00
qinyuhang 42274f6ad7 Add missdeleted PingTest 2017-02-03 20:19:20 +08:00
qinyuhang f85cc98563 Bug fix& delete pingtest 2017-02-02 22:52:35 +08:00
qinyuhang e6b02efc8b Bump version
include fix QR problem, copy QR image from ‘show current server QR’,
GPL LICENSE(well we missed it for a long time)
2017-01-14 23:00:49 +08:00
imnotpopo 5280c301b0 update pod Alamofire to 4.2.0 2017-01-11 15:52:11 +08:00
qinyuhang 6576ffd0cc Sync SSR-local
1. 更新 ss-locla
2. 现在开启软件自动检查更新了(bug UI会卡住一下,是异步的问题,待查)
3. 菜单添加检查更新按钮
2017-01-09 20:05:16 +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 c4574b644a update xcode project settings 2016-10-30 18:35:44 +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 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
王晨 4f985feae0 增加privacy 2016-10-07 17:52:30 +08:00
qinyuhang 34db2cb9ca convert project file from swift2.3 to swift3.0 2016-09-22 20:17:12 +08:00
qinyuhang 5825234b7f fix travis ci build fail problem 2016-09-22 19:29:50 +08:00
qinyuhang 2f38f95f55 fix bug
修正服务器设置面板不能拷贝到剪切板的bug
重新组织了AppDelegate的结构
修正travis-ci报错问题
2016-09-15 16:22:02 +08:00
qinyuhang 8f23900bc6 Update network monitor to swift 2.3 2016-09-14 12:20:32 +08:00
qinyuhang 5ec413b282 Update alamofire to 3.5 to work with Xcode 8 2016-09-14 09:43:34 +08:00
qinyuhang 8244c6307f bump up version 2016-09-14 07:38:53 +08:00
qinyuhang ba9aebab4e 代码重构
代码重构,将导入导出功能移动到ServerProfileManager类下,移除BunchImportUtils.swift
2016-09-12 15:38:56 +08:00
qinyuhang 48a46d79e2 try merge yichengchen/ssr 2016-09-09 12:51:37 +08:00
qinyuhang 706d8e54f4 fix sign problem 2016-09-08 20:20:36 +08:00
qinyuhang f338698043 update signature setting 2016-09-01 14:34:15 +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 b7642936f8 init bunch import json configs
init bunch import json config
add example config file
2016-08-26 10:58:24 +08:00
qinyuhang bc7ca9eb0e merge from hotfix-macOS10.12
add local server to serve PAC file, this works on macOS 10.12 PAC mode
2016-08-23 20:37:35 +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 eae605910c 新增加白名单模式
新增白名单模式,白名单来自破娃酱
注意事项,替换白名单中proxy的地址时发现原来的IP白名单中 wall_proxy 只有 socks5,而域名白名单中 wall_proxy
有 socks 和 socks5(只有这样才会work)。故此在后面的处理替换中将两个都加上了。后续变化,还需要看破娃酱 white list
具体变化。
2016-08-14 00:40:14 +08:00
qinyuhang 4f6f392b24 fix add server from QR code
fix add server from QR code
2016-08-12 10:26:37 +08:00
bjzhou1990 995d43a41e add edit user rule window 2016-08-01 15:28:59 +08:00
Charlie Qiu 65af97edae Show current proxy mode on top menu item. 2016-07-07 15:51:27 +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 ea4e006133 Advance preference for proxy.
Manual spesify network services which would be configure.
2016-06-30 02:33:37 +08:00
Charlie Qiu 6bfa77d773 Cocoa Keyboard Shortcuts in Dialog without an Edit Menu 2016-06-23 12:10:22 +08:00
Charlie Qiu 680efa09a9 Fix project 2016-06-12 10:32:13 +08:00
Charlie Qiu 14a18f5b21 Fix scheme 2016-06-12 10:26:18 +08:00
Charlie Qiu 4629009916 Delete UITests target. 2016-06-12 09:35:00 +08:00
Charlie Qiu 94d8c0b08e Disable sign 2016-06-12 09:24:09 +08:00