|
|
0acfc98474
|
Merge branch 'pr/197' into develop
# Conflicts:
# ShadowsocksX-NG/ServerProfile.swift
|
2017-01-10 14:14:54 +08:00 |
|
|
|
845c554330
|
Merge branch 'pr/198' into develop
|
2017-01-10 12:31:51 +08:00 |
|
|
|
5ff740a9a9
|
Merge commit 'dcce6cfce569108520fe32fed9d65e18e3157e09' into develop
|
2017-01-10 12:26:10 +08:00 |
|
|
|
dcce6cfce5
|
Merge pull request #170 from imnotpopo/master
fix typo
|
2017-01-10 12:22:49 +08:00 |
|
|
|
638f701e9c
|
Merge pull request #171 from imnotpopo/develop
fix typo
|
2017-01-10 12:21:31 +08:00 |
|
|
|
dfb06cdf70
|
Refactor tests as well
|
2017-01-09 22:04:56 +08:00 |
|
|
|
dbc6ee92d5
|
Refactor ParseSSURL as ServerProfile initializer
|
2017-01-09 22:01:05 +08:00 |
|
|
|
c50e18d832
|
Support generate SS URL with Remark and OTA
|
2017-01-09 18:16:44 +08:00 |
|
|
|
9dafb4fb79
|
Add tests for ServerProfile
|
2017-01-09 18:16:44 +08:00 |
|
|
|
5e06b4b4f0
|
Support parse SS URL with query string
So we can encode Remark and OTA to query string
|
2017-01-09 18:16:35 +08:00 |
|
|
|
faf029c7f7
|
Parse SS URL with much cleaner URL struct methods
|
2017-01-08 23:36:47 +08:00 |
|
|
|
97801c4ee6
|
Add tests for ParseSSURL()
|
2017-01-07 12:30:12 +08:00 |
|
|
|
59e3de1697
|
[ADD] localised text
|
2017-01-05 18:52:39 +08:00 |
|
|
|
35d764fe2a
|
[ADD] option to duplicate server profile on preference
|
2017-01-05 18:26:33 +08:00 |
|
|
|
cc3b016a51
|
Update PreferencesWindowController.strings
fix typo
|
2016-12-20 17:52:58 +08:00 |
|
|
|
0b4bc25373
|
Update Localizable.strings
fix typo
|
2016-12-20 17:52:18 +08:00 |
|
|
|
417f8f8457
|
Update HTTPPreferencesWindowController.xib
fix typo
|
2016-12-20 17:51:27 +08:00 |
|
|
|
d6b74afdc9
|
Update AdvPreferencesWindowController.xib
fix typo
|
2016-12-20 17:50:46 +08:00 |
|
|
|
8ca67b8ece
|
Update Localizable.strings
Fixed typo
|
2016-12-20 17:43:03 +08:00 |
|
|
|
a71f31705c
|
Update AdvPreferencesWindowController.xib
fixed typo
|
2016-12-20 17:41:09 +08:00 |
|
|
|
cf4fb9a75e
|
Update PreferencesWindowController.strings
fix typo
|
2016-12-20 17:37:59 +08:00 |
|
|
|
0c3c021f21
|
Merge branch 'feature/global_shortcut' into develop
|
2016-12-11 17:21:07 +08:00 |
|
|
|
4dd3bd495e
|
Update Alamofire to 4.2.0 with new version of Xcode 8.1
|
2016-12-11 17:17:36 +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 |
|
|
|
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 |
|
