Commit Graph

543 Commits

Author SHA1 Message Date
10b1423cb9 Merge branch 'develop' into develop 2017-07-20 10:13:45 +08:00
0cbcbf8e91 Merge pull request #330 from shadowsocksr/feature/multiple_select
服务器面板可多选
2017-07-20 10:11:20 +08:00
5a9ccc456a Merge branch 'develop' into feature/multiple_select 2017-07-20 10:06:02 +08:00
0f050f6e44 remove keeplive key from plist, update shell script adding launchctl start/stop command
keeplive key  makes the services of shadowsocks-ng automatically start when logining system
Replace the original way with launchctl start/stop, then start the services when needed as shadowsocks-ng using
2017-05-11 13:52:07 +08:00
fd99f16130 Merge branch 'develop' 2017-05-02 21:46:34 +08:00
55971b4c05 Merge pull request #349 from julienschmidt/readme
README: Mention AEAD Ciphers instead of OTA Support
2017-05-02 18:23:37 +08:00
b89d9879f2 README: Mention AEAD Ciphers instead of OTA Support
OTA is deprecated
2017-05-02 16:37:01 +08:00
7a9b2ebddc Merge branch 'develop' of https://github.com/shadowsocks/ShadowsocksX-NG into develop 2017-05-02 11:27:48 +08:00
4b819938d6 Change version number. 2017-05-02 11:25:35 +08:00
6df0290d2f Fix bug. 2017-05-02 11:24:15 +08:00
12dfd52664 Merge pull request #345 from julienschmidt/typo
Fix typo
2017-04-27 14:48:09 +08:00
db810976f7 Fix typo 2017-04-26 22:27:23 +08:00
efd0c76763 Revert "实现在多选状态下的多个profile复制"
This reverts commit 923aad5d94.
2017-04-24 17:24:11 +08:00
923aad5d94 实现在多选状态下的多个profile复制 2017-04-24 15:36:08 +08:00
9ce6b01cba Merge branch 'develop' 2017-04-24 14:32:23 +08:00
f6a46311c3 删除服务器配置后滚动问题 2017-04-15 22:43:26 +08:00
3df85772b0 修复不连续多选删除错误问题 2017-04-15 09:11:37 +08:00
f356cd2d5c 服务器面板可多选 2017-04-15 09:03:42 +08:00
037366ff44 Increase bundle version. 2017-04-09 18:58:50 +08:00
25faa69b06 Fix #317 2017-04-09 18:57:38 +08:00
494a96b9e1 Merge pull request #315 from Vayn/develop
Make HUD window front but not in focus
2017-04-09 13:30:57 +08:00
efb1e64a6b Rollback Pod files 2017-04-09 12:34:14 +08:00
82802c8912 Merge branch 'develop' of github.com:Vayn/ShadowsocksX-NG into develop 2017-04-08 11:46:36 +08:00
4674d9a947 Make HUD window front but not in focus 2017-04-08 11:45:21 +08:00
406e0d40ad Merge pull request #311 from crispgm/fix-icon
Fix gitter icon
2017-04-06 13:01:22 +08:00
412b05cfe3 Fix gitter icon 2017-04-06 12:01:14 +08:00
5a2b413084 Change default encryption method to aes-124-gcm. 2017-04-03 23:42:52 +08:00
3751d02f45 Update README.md file. 2017-03-29 22:01:36 +08:00
64b268de54 Increase bundle version. 2017-03-29 21:59:04 +08:00
44c2a2a47b Support yosemites dark mode. 2017-03-29 21:56:55 +08:00
5ce5b191c9 Increase bundle version. 2017-03-28 23:38:22 +08:00
55d300d437 Fix dependences error of ss-local. 2017-03-28 23:34:30 +08:00
6c73432eed Reimplement auto launch helper by objective-c. 2017-03-28 20:25:35 +08:00
d51cc88dcb Fix #291 2017-03-27 21:52:07 +08:00
0b761c755a Better ss url paser. 2017-03-26 20:07:55 +08:00
2c68038865 Rename pac mode. 2017-03-25 22:01:14 +08:00
73396e4ff1 Romve show proxy mode as text on status bar. 2017-03-25 15:15:53 +08:00
2b8dd02b5f Use diferent icon resperent the proxy mode. 2017-03-25 15:05:17 +08:00
ad747021e5 MSIC 2017-03-25 14:22:25 +08:00
be6859f525 Fix warning. #288 2017-03-24 17:37:20 +08:00
9fe0b944de Fix typo. 2017-03-24 16:35:55 +08:00
ad0c3d53e8 Support add other custom arguments for kcptun.
TOFIX: Don't support space between quotation marks.
2017-03-24 00:43:31 +08:00
6339000797 Optimize server profile layout. 2017-03-23 23:19:42 +08:00
ead31e6dcf Increase bundle version. 2017-03-23 21:00:31 +08:00
9c18ffabf4 Fix all in one preferences window layout. 2017-03-23 21:00:16 +08:00
f4ae598ca3 Translating. 2017-03-23 20:46:25 +08:00
a8fef3ddee Set test target to shared scheme. 2017-03-23 19:47:10 +08:00
e10b142efe Update kctptun to version 20170322 2017-03-23 19:31:35 +08:00
b2335f632e Code clean. 2017-03-22 22:42:43 +08:00
fb17132b02 Update encrypt method list. 2017-03-22 22:41:18 +08:00