555 Commits

Author SHA1 Message Date
43e68a2810 Change version number to 1.4.0 2017-01-12 16:29:36 +08:00
72c4c3e4e4 Set the ‘Skip Install’ option of proxy_conf_helper to YES. 2017-01-12 16:24:55 +08:00
fbd5d3b8a2 Support configure kcptun mtu. 2017-01-12 15:31:23 +08:00
781031165e [BUG]Remove libpcre.1.dylib from ShadowsocksX-NG link libraries. 2017-01-12 15:04:09 +08:00
5c1db71ab7 Encode kcptun infomations to ss url. 2017-01-12 15:04:09 +08:00
f7cca35948 Support kcptun. 2017-01-12 15:04:09 +08:00
6d4cbedcfa Add kcptun installer. 2017-01-12 15:04:09 +08:00
ad938a355a Add KcptunProfile. 2017-01-12 15:04:08 +08:00
361742ba38 [BUG] Update a new ss-local binary which support macos 12.11
The old one only support macos 12.12
2017-01-12 15:00:41 +08:00
913e1cc0bc Add Commend Export 2017-01-12 14:55:06 +08:00
d68dac0f7d [BUG]Remove libpcre.1.dylib from ShadowsocksX-NG link libraries. 2017-01-12 12:28:23 +08:00
62648d02f1 Add a 'Copy' context menu to the QRCode window. 2017-01-12 11:58:57 +08:00
1388c065c7 Send a system notification when not found valid qrcode of ss profile. 2017-01-12 11:45:57 +08:00
5099e0bcc0 [BUG]Fixed decoding ss url.
Base64 string may containe character '/'.
2017-01-12 11:31:38 +08:00
1de6fa0b5a [BUG]chmod +x install_helper.sh 2017-01-11 18:20:44 +08:00
e9398b4238 [BUG] Add libpcre.1.dylib to project. 2017-01-11 18:07:12 +08:00
cb4e6d7f19 Monitor pac file with GCD instead of FSEventStreamCreate.
Old approach is not working on new version MacOS.
2017-01-11 10:43:37 +08:00
332232a202 Merge branch 'develop' of https://github.com/shadowsocks/ShadowsocksX-NG into develop 2017-01-10 21:40:55 +08:00
78f0aa9c63 Add new encrypt methods to the selector list. 2017-01-10 17:50:59 +08:00
43f6bd6c4b Update ss-local from 2.4.6 to 2.5.6 2017-01-10 17:28:16 +08:00
58c5befa04 Merge branch 'master' of https://github.com/shadowsocks/ShadowsocksX-NG into fix
# Conflicts:
#	ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib
2017-01-10 17:05:30 +08:00
6175ec2888 CustomSetting 2017-01-10 17:04:18 +08:00
208e9d03f5 Merge branch 'pr/95' into develop
# Conflicts:
#	ShadowsocksX-NG.xcodeproj/project.pbxproj
2017-01-10 15:53:50 +08:00
c63f6b2ee3 Merge branch 'pr/159' into develop
# Conflicts:
#	ShadowsocksX-NG/Base.lproj/MainMenu.xib
2017-01-10 15:23:13 +08:00
1e4ad0b108 add examplejson to Xcode project file
add examplejson to Xcode project file
fix resource method
2017-01-10 15:02:54 +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
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