Commit Graph

429 Commits

Author SHA1 Message Date
a7c92c2044 Set theme jekyll-theme-cayman 2017-01-17 11:21:39 +08:00
87c19ea2a1 Set theme jekyll-theme-slate 2017-01-17 11:18:03 +08:00
fe2df2c5b7 [BUG] Fix typo #212 2017-01-17 02:15:13 +08:00
f730c5cba2 [BUG] Show import/export panel as modal panel.
This approach would ensure the panel show in most front and in center of screen.
2017-01-17 02:07:33 +08:00
e5c8e965d4 [BUG] Fix #211 Exported server settings JSON does not include KCPTUN related configuration 2017-01-17 01:57:49 +08:00
d4aa0f7b47 [BUG] Fix #210 Duplicating KCPTUN enabled profiles does not copy KCPTUN related settings 2017-01-17 01:42:05 +08:00
bc813ff072 Add gitter chat badge to README.md 2017-01-16 16:54:57 +08:00
59f914febe Refactor launch agent utils. 2017-01-16 14:47:40 +08:00
0ac549ad04 Add kcptun adv preferences. 2017-01-15 23:02:17 +08:00
f5bd02e98b Add kcptun conn configure. 2017-01-15 22:49:24 +08:00
489d9fe71b Merge pull request #206 from rizwankce/feature/toggle-running-hotkey
Add global keyboard shortcut to toggle On/Off
2017-01-13 23:33:14 +08:00
3a0515b2d5 [ADD] Global hot key to toggle SS running On/Off 2017-01-13 20:52:41 +08:00
492c517cbf Code clean. 2017-01-13 15:50:42 +08:00
6c34fd730f Merge pull request #203 from NobelLiu/fix
Add Shell Export.
2017-01-13 15:30:47 +08:00
da5b1bf725 Merge branch 'develop' into fix 2017-01-13 15:30:36 +08:00
8af177690c Merge pull request #204 from shadowsocksr/add-license
Add license file
2017-01-13 15:30:20 +08:00
c34fc2417b add license file 2017-01-13 13:08:32 +08:00
fa5e5140e7 Merge branch 'develop' into fix 2017-01-13 10:39:05 +08:00
03420401bd Update gfwlist.txt 2017-01-13 01:08:10 +08:00
a4cf382962 Update readme. 2017-01-13 01:06:06 +08:00
dc1fa683d6 Optimalize order of menu items. 2017-01-13 01:00:01 +08:00
57fce4c25d Merge branch 'develop' into fix 2017-01-13 00:14:24 +08:00
f137d51cb2 Use a new approach to implement launch at login. 2017-01-12 23:44:29 +08:00
29c6bf8c3a Reset constraint for preferences. 2017-01-12 19:20:38 +08:00
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