|
|
c63f6b2ee3
|
Merge branch 'pr/159' into develop
# Conflicts:
# ShadowsocksX-NG/Base.lproj/MainMenu.xib
|
2017-01-10 15:23:13 +08:00 |
|
|
|
500e524d05
|
Merge branch 'pr/95' into develop
|
2017-01-10 14:21:39 +08:00 |
|
|
|
8f2267950f
|
Merge branch 'pr/154' into develop
|
2017-01-10 14:17:48 +08:00 |
|
|
|
845c554330
|
Merge branch 'pr/198' into develop
|
2017-01-10 12:31:51 +08:00 |
|
|
|
dbc6ee92d5
|
Refactor ParseSSURL as ServerProfile initializer
|
2017-01-09 22:01:05 +08:00 |
|
|
|
9dafb4fb79
|
Add tests for ServerProfile
|
2017-01-09 18:16:44 +08:00 |
|
|
|
23967eca20
|
Added global Keyboard shortcut
So we could switch between different proxy modes with global shortcut.
|
2016-12-11 15:39:56 +08:00 |
|
|
|
37e157b024
|
Sync server name menu when server preference changed.
|
2016-12-05 10:46:51 +08:00 |
|
|
|
e6cdfbbc26
|
Fix typo
Globel -> Global
|
2016-10-26 19:32:27 +08:00 |
|
|
|
299abfee7b
|
Fix #98, Don't turn off when app Terminate.
|
2016-10-19 23:59:52 +08:00 |
|
|
|
e5b342c134
|
Monitor PAC file. Disable then enable the system pac configure after it has been modified.
|
2016-10-19 00:24:45 +08:00 |
|
|
|
d0ad272198
|
Refactor pac proxy.
|
2016-10-18 23:35:17 +08:00 |
|
|
|
7ad9dc42a0
|
Fix bug caused by pr #97
|
2016-10-18 22:18:54 +08:00 |
|
|
|
5ed5789c31
|
Merge branch 'pr/97' into develop
# Conflicts:
# ShadowsocksX-NG/AppDelegate.swift
|
2016-10-18 22:11:04 +08:00 |
|
|
|
dd20ebda68
|
fix crash problem
|
2016-10-18 15:36:56 +08:00 |
|
|
|
327609c840
|
批量导入导出配置文件功能 for Swift 3
已解决冲突问题，请Merge
|
2016-10-17 23:28:22 +08:00 |
|
|
|
22d654dd69
|
defaults.array(forKey: "ServerProfiles") would return nil ,but not handle
|
2016-10-17 16:13:42 +08:00 |
|
|
|
91124b9e90
|
Merge branch 'pr/85' into develop
# Conflicts:
# ShadowsocksX-NG/AppDelegate.swift
|
2016-10-14 23:39:11 +08:00 |
|
|
|
4c295965f2
|
增加 HTTP代理 跟随全局设置
|
2016-10-10 14:17:47 +08:00 |
|
|
|
3f7e433dd2
|
更新两处http开关，随ss开启和关闭
|
2016-10-10 14:17:30 +08:00 |
|
|
|
2ab6f95631
|
add privoxy
|
2016-10-10 14:17:02 +08:00 |
|
|
|
20d76a0850
|
代理菜单内增加状态栏文本显示开关
|
2016-10-02 23:59:01 +08:00 |
|
|
|
bfc39d8179
|
顶级菜单中服务器名前加上文字:服务器.
|
2016-10-02 01:45:59 +08:00 |
|
|
|
cb9d2b62ad
|
Convert to swift 3 syntax.
|
2016-10-02 01:39:21 +08:00 |
|
|
|
294073011b
|
Merge branch 'pr/75' into develop
|
2016-10-02 01:36:32 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
7076523cbd
|
Merge branch 'pr/44' into develop
|
2016-10-02 00:08:33 +08:00 |
|
|
|
9c24595486
|
show running mode on status bar
|
2016-10-01 12:45:42 +08:00 |
|
|
|
ff0ab584e9
|
bug fixs
|
2016-09-08 21:11:22 +08:00 |
|
|
|
9aaf6940e2
|
菜单现在显示实际使用中的服务器名
菜单现在显示实际使用中的服务器名
|
2016-09-08 18:47:01 +08:00 |
|
|
|
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 |
|
|
|
7520fd54a6
|
解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题
解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题
https://github.com/qiuyuzhou/ShadowsocksX-NG/issues/30
PS 手头没有 macOS 10.12 的机器，麻烦有的请帮忙测试一下
或者可以从 https://github.com/qinyuhang/ShadowsocksX-NG/tree/webserver 下载去
Xcode build 一下
|
2016-08-23 17:08:21 +08:00 |
|
|
|
671816b592
|
auto active service when create first server profile
|
2016-08-22 23:26:04 +08:00 |
|
|
|
995d43a41e
|
add edit user rule window
|
2016-08-01 15:28:59 +08:00 |
|
|
|
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 |
|
|
|
65af97edae
|
Show current proxy mode on top menu item.
|
2016-07-07 15:51:27 +08:00 |
|
|
|
ea4e006133
|
Advance preference for proxy.
Manual spesify network services which would be configure.
|
2016-06-30 02:33:37 +08:00 |
|
|
|
94e065ea63
|
Bugfix use a singleton ServerProfileManager
|
2016-06-23 10:07:26 +08:00 |
|
|
|
23696420a5
|
Add show logs menu item.
|
2016-06-18 11:06:49 +08:00 |
|
|
|
7e184d5a1b
|
Add "Enable verbose mode" to adv preferences panel.
|
2016-06-18 10:44:09 +08:00 |
|
|
|
ce2d4e8a55
|
Change Default listen address from localhost to 127.0.0.1
|
2016-06-14 20:26:12 +08:00 |
|
|
|
a4bee86080
|
Add about menu item.
|
2016-06-12 08:25:52 +08:00 |
|
|
|
4991c2cdc4
|
Add new menu item: "Apply User Rules For PAC"
|
2016-06-12 08:03:27 +08:00 |
|
|
|
0b3d3a1320
|
Better english
|
2016-06-12 01:19:06 +08:00 |
|
|
|
5077e880a8
|
Add feedback menuitem
|
2016-06-11 18:02:57 +08:00 |
|
|
|
7590cf2b71
|
Add menu item "Manual Mode"
|
2016-06-11 17:47:18 +08:00 |
|
|
|
69ef77f277
|
Add menu item "Edit User Rules For PAC..."
|
2016-06-11 06:21:19 +08:00 |
|
|
|
98689a83aa
|
Embed libcrypto.1.0.0.dylib which been depand by ss-local.
|
2016-06-11 00:44:52 +08:00 |
|
|
|
1e0a1e8618
|
Handle ss url.
|
2016-06-10 22:30:48 +08:00 |
|
