Commit Graph

Select branches

Hide Pull Requests

develop

feature/subscribe

feature_swift_5

fix_QR_GPU

master

release/1.4.0

rm

#12

#139

#149

#149

#150

#152

#152

#153

#153

#161

#32

1.0

1.1

1.2

1.3

1.3.1

1.3.2

1.4.2-R8

1.4.2-R8-fix-subscribe

1.4.3-R8

1.4.3-R8-build2

1.4.3-R8-build3

1.4.4-r8

1.4.4-r8-resigning

v1.0-beta

v1.0-beta2

v1.4-alpha

v1.4-beta

Mono Color

• 10b1423cb9 Merge branch 'develop' into develop Qiu Yuzhou 2017-07-20 10:13:45 +08:00
• 0cbcbf8e91 Merge pull request #330 from shadowsocksr/feature/multiple_select Qiu Yuzhou 2017-07-20 10:11:20 +08:00
• 5a9ccc456a Merge branch 'develop' into feature/multiple_select Qiu Yuzhou 2017-07-20 10:06:02 +08:00
• cc710f564a Remove due to regulateion 秦宇航 2017-07-19 22:02:06 +08:00
• 1249a9f1a8 hold wrong maxCount 秦宇航 2017-07-19 21:56:21 +08:00
• 09437bdc61 fix wrong notification on bad netstat 秦宇航 2017-07-18 08:30:08 +08:00
• 08f130858c refine subscribe class 秦宇航 2017-07-17 09:05:52 +08:00
• 944cfb47da Fix subscribe cannot delete to zero 秦宇航 2017-07-16 22:16:52 +08:00
• b4ce1eb460 update subscribe at launch 秦宇航 2017-07-16 21:23:57 +08:00
• 010b093368 Merge branch 'develop' into feature/subscribe 秦宇航 2017-07-16 21:08:36 +08:00
• a984a62f7e finish viewcontroller 秦宇航 2017-07-16 21:07:31 +08:00
• 55ef345611 localization 秦宇航 2017-07-16 09:26:38 +08:00
• 1c2e395248 bind data 秦宇航 2017-07-16 09:23:15 +08:00
• 6f6b75b664 Rerange menu items 秦宇航 2017-07-14 08:55:20 +08:00
• 82d7558b58 Fix profile bind problem 秦宇航 2017-07-14 00:17:13 +08:00
• 75d71ae3a2 Add Subscribe Class 秦宇航 2017-07-13 22:20:54 +08:00
• 5027ef621e refine subscribe manager 秦宇航 2017-06-20 18:41:45 +08:00
• 2b592e9be6 add subscribe manager 秦宇航 2017-06-20 18:22:38 +08:00
• a0a550a465 Bump version 秦宇航 2017-06-15 06:29:14 +08:00
• 17a3d3a59f init subscribe 秦宇航 2017-06-15 06:27:08 +08:00
• a35f045fba sync ssr-local 秦宇航 2017-06-14 14:26:02 +08:00
• d3bdc73054 Now handler multiper config in one ss url #165 秦宇航 2017-06-14 10:01:54 +08:00
• abf99692d8 update ACL from User rule 秦宇航 2017-06-12 17:36:59 +08:00
• 15833de218 Merge pull request #168 from mcfans/develop 秦宇航 2017-06-10 00:30:30 +08:00
• 2d331b2bd0 remove unused func mcfans 2017-06-09 13:06:00 +08:00
• 5e4d07e06e make the ping process Thread-safe mcfans 2017-06-09 13:04:45 +08:00
• 9eeb0233ab update build for Xcode9 秦宇航 2017-06-07 16:16:13 +08:00
• f35d94a828 Bump version 秦宇航 2017-06-06 15:08:20 +08:00
• f4a076fdb0 Merge pull request #163 from mcfans/develop 秦宇航 2017-06-06 15:03:44 +08:00
• 158af9f90b update xcodeproj mcfans 2017-06-05 10:25:08 +08:00
• 5b8c196640 add some judgement when app lauch first time mcfans 2017-06-05 00:09:20 +08:00
• 039148696d remove some unused files. mcfans 2017-06-05 00:08:20 +08:00
• 363d3318bb fix switch mode not update ss-local run condition 秦宇航 2017-06-04 23:53:22 +08:00
• 84e20d915c show “failed” when test failed mcfans 2017-06-04 23:50:15 +08:00
• a1cd296998 thread-safe access array mcfans 2017-06-03 22:47:48 +08:00
• 4ca89e16a8 rewrite pingClient.swift mcfans 2017-06-03 21:22:04 +08:00
• 03957fd127 update ss-local fix #161 秦宇航 2017-06-02 06:37:21 +08:00
• 5017884c33 Merge pull request #156 from clavichord93/develop 秦宇航 2017-05-24 08:28:52 +08:00
• 0df6eb0429 remove unnecessary psd and png files clavichord93 2017-05-23 23:35:24 +08:00
• 99bc1433bc fix type in README.md clavichord93 2017-05-21 23:35:17 +08:00
• 82d074b478 Merge pull request #1 from shadowsocksr/develop Zheng Qin 2017-05-18 20:49:16 +08:00
• a5b1e63db8 fix typo 秦宇航 2017-05-16 14:33:15 +08:00
• d172878c11 add none chiper 秦宇航 2017-05-15 22:31:10 +08:00
• 310f311030 bump version 秦宇航 2017-05-15 10:33:54 +08:00
• fc9f998512 add auth_chain_a obfs method 秦宇航 2017-05-15 10:28:38 +08:00
• c53bd2dd2c Merge pull request #149 from clavichord93/develop 秦宇航 2017-05-15 07:54:21 +08:00
• b8bad1ad58 modify menu icon clavichord93 2017-05-15 01:18:04 +08:00
• 73a8f83ba6 bump version and new release 秦宇航 2017-05-14 08:46:25 +08:00
• 0f8dd8bc22 update readme 秦宇航 2017-05-14 08:39:10 +08:00
• 36d59645d9 可自定义远端ACL文件地址 秦宇航 2017-05-14 08:32:02 +08:00
• 83a9e475be fix bug #140 #121 Ping result not shown on server menu 秦宇航 2017-05-13 08:32:43 +08:00
• 3ce21085c6 #148 秦宇航 2017-05-12 18:46:56 +08:00
• 70b9f39701 refactor 秦宇航 2017-05-12 07:34:40 +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 Gino Zhao 2017-05-11 13:52:07 +08:00
• b8bda08a7c refactor checkupdate 秦宇航 2017-05-11 08:09:15 +08:00
• c294e2a242 update ss-local fix auth_sha1_v4 connection problem 秦宇航 2017-05-10 07:59:33 +08:00
• 53c4b846df Fix bug in acl auto mode and whit list mode 秦宇航 2017-05-07 22:06:47 +08:00
• e19d516320 UI fix 秦宇航 2017-05-07 21:25:01 +08:00
• 20330d2293 Fix typo 秦宇航 2017-05-07 19:38:19 +08:00
• 0cf8229623 FIX ACL Path bug 秦宇航 2017-05-07 18:09:04 +08:00
• 7452e1852d FIX BUG #141 秦宇航 2017-05-07 16:31:43 +08:00
• c36b96521c 增加翻译。Bump version 秦宇航 2017-05-07 14:48:19 +08:00
• 95bf7b84ba 新增ACL自动模式 和 回国模式（Proxy Back China） 秦宇航 2017-05-07 14:40:21 +08:00
• c1b37d4482 更新白名单模式 秦宇航 2017-05-07 12:58:18 +08:00
• fd99f16130 Merge branch 'develop' Qiu Yuzhou 2017-05-02 21:46:34 +08:00
• 55971b4c05 Merge pull request #349 from julienschmidt/readme Qiu Yuzhou 2017-05-02 18:23:37 +08:00
• b89d9879f2 README: Mention AEAD Ciphers instead of OTA Support Julien Schmidt 2017-04-29 01:00:39 +08:00
• 7a9b2ebddc Merge branch 'develop' of https://github.com/shadowsocks/ShadowsocksX-NG into develop Qiu Yuzhou 2017-05-02 11:27:48 +08:00
• 4b819938d6 Change version number. Qiu Yuzhou 2017-05-02 11:25:35 +08:00
• 6df0290d2f Fix bug. Qiu Yuzhou 2017-05-02 11:24:15 +08:00
• 12dfd52664 Merge pull request #345 from julienschmidt/typo Qiu Yuzhou 2017-04-27 14:48:09 +08:00
• db810976f7 Fix typo Julien Schmidt 2017-04-26 22:27:23 +08:00
• 7e045b9d9c bump version 秦宇航 2017-04-26 12:00:34 +08:00
• efd0c76763 Revert "实现在多选状态下的多个profile复制" 秦宇航 2017-04-24 17:24:11 +08:00
• 40944fda80 多选的时候disable复制按钮 秦宇航 2017-04-24 16:01:10 +08:00
• 923aad5d94 实现在多选状态下的多个profile复制 秦宇航 2017-04-24 15:36:08 +08:00
• 9ce6b01cba Merge branch 'develop' Qiu Yuzhou 2017-04-24 14:32:23 +08:00
• b89f61021c 拆分app url scheme解析子函数 秦宇航 2017-04-16 10:52:55 +08:00
• f6a46311c3 删除服务器配置后滚动问题 秦宇航 2017-04-15 22:40:25 +08:00
• acc7e0361a 删除服务器配置后滚动问题 秦宇航 2017-04-15 22:40:25 +08:00
• 3df85772b0 修复不连续多选删除错误问题 秦宇航 2017-04-15 09:10:42 +08:00
• 56e00417af 修复不连续多选删除错误问题 秦宇航 2017-04-15 09:10:42 +08:00
• f356cd2d5c 服务器面板可多选 秦宇航 2017-04-15 09:03:42 +08:00
• 1112ae9c23 服务器面板可多选删除 秦宇航 2017-04-15 08:56:01 +08:00
• ceeeb6892f cherry-pick a58993748e Qiu Yuzhou 2017-03-18 17:56:12 +08:00
• ff618dd0f5 using GDC aync to avoid freeze of operation on show current QR 秦宇航 2017-04-12 23:22:28 +08:00
• 2ef8cdb798 bump version 秦宇航 2017-04-12 14:00:32 +08:00
• ee781af0e4 refactor ssr url parse 秦宇航 2017-04-12 13:54:57 +08:00
• 557a6634d7 fix #127 #119 秦宇航 2017-04-11 00:12:46 +08:00
• 720afb1b69 cherry-pick 25faa69b06 秦宇航 2017-04-11 00:11:14 +08:00
• 037366ff44 Increase bundle version. Qiu Yuzhou 2017-04-09 18:58:50 +08:00
• 25faa69b06 Fix #317 Qiu Yuzhou 2017-04-09 18:57:26 +08:00
• 494a96b9e1 Merge pull request #315 from Vayn/develop Qiu Yuzhou 2017-04-09 13:30:57 +08:00
• efb1e64a6b Rollback Pod files Vicent Tsai 2017-04-09 12:34:14 +08:00
• 82802c8912 Merge branch 'develop' of github.com:Vayn/ShadowsocksX-NG into develop Vicent Tsai 2017-04-08 11:46:36 +08:00
• 4674d9a947 Make HUD window front but not in focus Vicent Tsai 2017-04-08 11:45:21 +08:00
• 406e0d40ad Merge pull request #311 from crispgm/fix-icon Qiu Yuzhou 2017-04-06 13:01:22 +08:00
• 412b05cfe3 Fix gitter icon David Zhang 2017-04-06 12:01:14 +08:00
• 803d14a33b [Bug fix] #123 秦宇航 2017-04-05 15:24:21 +08:00
• badc98b2e7 bump version 秦宇航 2017-04-05 12:01:36 +08:00