|
|
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 |
|
|
|
cc342df5b5
|
Merge branch 'pr/116' into develop
|
2016-11-03 23:36:34 +08:00 |
|
|
|
1ef2d7b909
|
Fix spell error.
Listien -> Listen
|
2016-11-03 09:30:04 +08:00 |
|
|
|
9e231a7b34
|
Merge branch 'release/1.3.2'
|
2016-11-01 11:36:46 +08:00 |
|
|
|
e6cdfbbc26
|
Fix typo
Globel -> Global
|
2016-10-26 19:32:27 +08:00 |
|
|
|
381b9ce634
|
Update version number to 1.3.2
|
2016-10-21 23:37:23 +08:00 |
|
|
|
cf2f5d1a9c
|
Fix bug #106 by workaround.
|
2016-10-21 23:36:05 +08:00 |
|
|
|
d2b8ca1c97
|
Fix bug #104.
Implement show qrcode by core image generator instead of embed a web view.
|
2016-10-21 23:27:30 +08:00 |
|
|
|
082c25f5e2
|
Fix bug. http preferences 输入框bind需要启用：continuously updates value
|
2016-10-20 10:58:26 +08:00 |
|
|
|
969c94eaff
|
Merge branch 'pr/100' into develop
|
2016-10-20 08:31:33 +08:00 |
|
|
|
e4236f21a1
|
Corrected Spellings
|
2016-10-20 01:14:47 +08:00 |
|
|
|
15193a978d
|
fix storyboard merge problem
那三个按钮是灰色的大概是因为merge的时候storyboard 文件冲突
|
2016-10-20 00:30:33 +08:00 |
|
|
|
299abfee7b
|
Fix #98, Don't turn off when app Terminate.
|
2016-10-19 23:59:52 +08:00 |
|
|
|
713bcae7b1
|
Merge branch 'release/1.3.1'
|
2016-10-19 14:32:40 +08:00 |
|
|
|
3c77fc9fe9
|
Fix the project file.
|
2016-10-19 00:30:53 +08:00 |
|
|
|
53d41ad27b
|
Update version number to 1.3.1
|
2016-10-19 00:30:21 +08:00 |
|
|
|
a85fc4e3b4
|
Disable the rich text attribute of the user pac fule edit control.
|
2016-10-19 00:26:16 +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 |
|
|
|
c7211ceb19
|
Merge commit 'fc11cc78fd9ad96d026485e07e643c751ad4669b' into develop
|
2016-10-18 16:07:05 +08:00 |
|
|
|
fc11cc78fd
|
Merge pull request #92 from linuxbelletian/master
defaults.array(forKey: "ServerProfiles") would return nil ,but not h…
|
2016-10-18 16:04:10 +08:00 |
|
|
|
dd20ebda68
|
fix crash problem
|
2016-10-18 15:36:56 +08:00 |
|
|
|
52a32a68af
|
UI fix
|
2016-10-18 00:20:13 +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 |
|
|
|
8fa7f76faa
|
Add a download link in readme.
|
2016-10-15 00:33:53 +08:00 |
|
|
|
8ba816300c
|
Merge branch 'release/1.3'
|
2016-10-15 00:02:18 +08:00 |
|
|
|
54ad13ec08
|
Some UI fixes.
- Center all dialogs.
- Fix pac listen port input field format.
|
2016-10-14 23:44:14 +08:00 |
|
|
|
91124b9e90
|
Merge branch 'pr/85' into develop
# Conflicts:
# ShadowsocksX-NG/AppDelegate.swift
|
2016-10-14 23:39:11 +08:00 |
|
|
|
82de054b83
|
Merge branch 'pr/78' into develop
|
2016-10-13 14:46:58 +08:00 |
|
|
|
1eddfd48fa
|
update recompiled privoxy
|
2016-10-10 23:01:13 +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 |
|
|
|
5815c29003
|
Set deployment target from 10.10 to 10.11
|
2016-10-07 10:32:30 +08:00 |
|
|
|
e564405a8e
|
Update travis ci status image to new link.
|
2016-10-06 15:05:35 +08:00 |
|
|
|
b699d060af
|
bug fix
|
2016-10-04 08:57:53 +08:00 |
|
|
|
20d76a0850
|
代理菜单内增加状态栏文本显示开关
|
2016-10-02 23:59:01 +08:00 |
|
|
|
cc467c4df2
|
Update travis to use image xocde8 instead of xocde7.3
|
2016-10-02 15:14:09 +08:00 |
|
|
|
dff5679dcb
|
Update requirements in readme.
|
2016-10-02 02:11:09 +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 |
|
|
|
07532daac2
|
Merge pull request #73 from whao/patch-1
Typo fix
|
2016-10-02 01:26:55 +08:00 |
|
|
|
b389dc226c
|
Call webServer startWithOptions instead of startWithPort
建议使用 webServer.startWithOptions(["BindToLocalhost":true,"Port":xxxx]) 来避免提示允许监听端口
|
2016-10-02 01:24:38 +08:00 |
|
|
|
25f8319e85
|
Update version number from 1.2 to 1.3
|
2016-10-02 01:19:17 +08:00 |
|
