Commit Graph
256 Commits
Author SHA1 Message Date
Charlie Qiu 25353cdf70 Fix bug when compose http proxy export cmd line. 2017-03-08 15:22:40 +08:00
Charlie Qiu 3833bb7d28 Fix typo. #254 2017-03-02 23:52:27 +08:00
Charlie Qiu 1a1691cfdb Add ip/port placeholder in server preference panel. 2017-03-02 23:47:47 +08:00
Charlie Qiu 71a3e82014 Merge branch 'develop' into release/1.4.0 2017-03-02 23:35:52 +08:00
Charlie Qiu d5f5361c5f Update build number to 4. 2017-03-02 23:34:51 +08:00
Qiu Yuzhou cbd60f17dd Merge pull request #253 from shadowsocksr/fix_ss_url_crash
fix typo, which causing crash on click ss url
2017-03-02 23:31:14 +08:00
Charlie Qiu 5450b5de99 Start services after stop one second. 2017-03-02 23:19:02 +08:00
Charlie Qiu b1779d37f8 Fix autolayout constraints of adv proxy panel. 2017-03-02 22:51:47 +08:00
Charlie Qiu 5a80d94af7 Fix autolayout constraints of User Rule panel. 2017-03-02 22:50:35 +08:00
Charlie Qiu aabb67f2c5 Move "Copy HTTP Proxy Export" from preference panel to menu. 2017-03-02 22:47:37 +08:00
Charlie Qiu b981b93f5f Merge commit '05f31fb4f4f6dbb0d6d8e6d66d3cd38195dbfd4f' into release/1.4.0 2017-03-02 22:47:21 +08:00
秦宇航 2e61b28ab0 fix typo, which causing crash on click ss url 2017-02-21 08:31:13 +08:00
Qiu Yuzhou 05f31fb4f4 Merge pull request #228 from shadowsocksr/add-git-issue-template
Add issue template
2017-02-08 15:20:21 +08:00
Qiu Yuzhou dee47ada8b Merge branch 'develop' into add-git-issue-template 2017-02-08 15:20:09 +08:00
Qiu Yuzhou 3348cae584 Merge pull request #225 from nidom/develop
fix  scanQR function memery leak
2017-02-08 15:19:48 +08:00
Qiu Yuzhou af1fc406d7 Merge branch 'develop' into develop 2017-02-08 10:28:40 +08:00
Qiu Yuzhou ae502d3d99 Merge branch 'develop' into add-git-issue-template 2017-02-08 10:28:15 +08:00
Charlie Qiu 7cfef2a8e9 Merge branch 'develop' into release/1.4.0 2017-02-07 15:40:22 +08:00
Charlie Qiu 2a17f43965 Fix typo in readme 2017-02-07 15:39:43 +08:00
Charlie Qiu 8aaffbb6a3 Set default pac listen port to 1089 instead of 8090. 2017-02-07 12:19:34 +08:00
qinyuhang 78606ca396 Add issue template 2017-02-05 22:34:52 +08:00
nidom 9b91d13cad fix scanQR function memery leak 2017-02-01 21:56:38 +08:00
Charlie Qiu 9b5f2d8a23 Fix #218 2017-01-23 17:50:39 +08:00
Charlie Qiu ffccf62f8a May be better, refactor selecting server. 2017-01-20 21:55:21 +08:00
Charlie Qiu e481860075 [BUG] Fix #215 v1.4-beta 2017-01-20 16:10:11 +08:00
Charlie Qiu c28be0134c Only show A/G/M on status bar. 2017-01-20 14:21:39 +08:00
Charlie Qiu 0e8098c631 Delete proxy.pac from project. 2017-01-20 00:25:13 +08:00
Charlie Qiu 41a02b41ae Update Bundle version to 3. 2017-01-20 00:08:49 +08:00
Charlie Qiu 196e48ddd0 Disable toggle ss on/off by shortcut.
Current hard coded shortcut is frequently-used in other softwares.
2017-01-20 00:07:52 +08:00
Charlie Qiu 568eabd5cc Refactor lauch agent utils. 2017-01-20 00:04:00 +08:00
Charlie Qiu 546fca160a Upgrade kcptun client to version 20170117. 2017-01-20 00:02:02 +08:00
Charlie Qiu fe2df2c5b7 [BUG] Fix typo #212 2017-01-17 02:15:13 +08:00
Charlie Qiu 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
Charlie Qiu e5c8e965d4 [BUG] Fix #211 Exported server settings JSON does not include KCPTUN related configuration 2017-01-17 01:57:49 +08:00
Charlie Qiu d4aa0f7b47 [BUG] Fix #210 Duplicating KCPTUN enabled profiles does not copy KCPTUN related settings 2017-01-17 01:42:05 +08:00
Qiu Yuzhou bc813ff072 Add gitter chat badge to README.md 2017-01-16 16:54:57 +08:00
Charlie Qiu 59f914febe Refactor launch agent utils. v1.4-alpha 2017-01-16 14:47:40 +08:00
Charlie Qiu 0ac549ad04 Add kcptun adv preferences. 2017-01-15 23:02:17 +08:00
Charlie Qiu f5bd02e98b Add kcptun conn configure. 2017-01-15 22:49:24 +08:00
Qiu Yuzhou 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
Rizwan 3a0515b2d5 [ADD] Global hot key to toggle SS running On/Off 2017-01-13 20:52:41 +08:00
Charlie Qiu 492c517cbf Code clean. 2017-01-13 15:50:42 +08:00
Qiu Yuzhou 6c34fd730f Merge pull request #203 from NobelLiu/fix
Add Shell Export.
2017-01-13 15:30:47 +08:00
Qiu Yuzhou da5b1bf725 Merge branch 'develop' into fix 2017-01-13 15:30:36 +08:00
Qiu Yuzhou 8af177690c Merge pull request #204 from shadowsocksr/add-license
Add license file
2017-01-13 15:30:20 +08:00
qinyuhang c34fc2417b add license file 2017-01-13 13:08:32 +08:00
Qiu Yuzhou fa5e5140e7 Merge branch 'develop' into fix 2017-01-13 10:39:05 +08:00
Charlie Qiu 03420401bd Update gfwlist.txt 2017-01-13 01:08:10 +08:00
Charlie Qiu a4cf382962 Update readme. 2017-01-13 01:06:06 +08:00
Charlie Qiu dc1fa683d6 Optimalize order of menu items. 2017-01-13 01:00:01 +08:00