Commit Graph

429 Commits

Author SHA1 Message Date
9ce64aad56 MISC 2017-03-18 17:35:11 +08:00
72985b32ae Refactor. 2017-03-18 12:20:51 +08:00
c9b3b80008 Code clean. 2017-03-18 12:16:51 +08:00
e507a41a6d Refactor apply config. 2017-03-17 23:18:44 +08:00
f865395062 Clean. 2017-03-17 23:12:33 +08:00
fd0971d88d All in one preferences window. 2017-03-17 23:11:12 +08:00
24836d203a Add new pods.
- RxSwift
- RXCocoa
2017-03-17 23:08:52 +08:00
0bbc55748c Update issue template. 2017-03-11 19:22:48 +08:00
2abdf7242a Remove shortcut tip in main menu. 2017-03-11 12:13:16 +08:00
484826f00e Revert "Add leaked 'weak'."
This reverts commit 8e1c8c8cd5.
2017-03-11 00:58:36 +08:00
e6468c1390 Change version number and update readme. 2017-03-11 00:22:45 +08:00
905d445fe6 Add README.md to project. 2017-03-11 00:20:38 +08:00
8e1c8c8cd5 Add leaked 'weak'. 2017-03-11 00:16:43 +08:00
6a6b144ac9 Merge branch 'feature/shortcuts' into develop 2017-03-11 00:15:14 +08:00
003727a0fe Implement configurable shortcuts for toggle running and switch proxy mode.
- By MASShortcut.
- A new shortcuts preferences window.
2017-03-11 00:14:56 +08:00
52709213e4 Add pod MASShortcut 2.3.6 2017-03-10 22:35:50 +08:00
bc17592ad6 Merge branch 'release/1.4.0' 2017-03-10 21:55:58 +08:00
e003b89c2b Merge branch 'release/1.4.0' into develop 2017-03-10 21:55:58 +08:00
25353cdf70 Fix bug when compose http proxy export cmd line. 2017-03-08 15:22:40 +08:00
3833bb7d28 Fix typo. #254 2017-03-02 23:52:27 +08:00
1a1691cfdb Add ip/port placeholder in server preference panel. 2017-03-02 23:47:47 +08:00
71a3e82014 Merge branch 'develop' into release/1.4.0 2017-03-02 23:35:52 +08:00
d5f5361c5f Update build number to 4. 2017-03-02 23:34:51 +08:00
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
5450b5de99 Start services after stop one second. 2017-03-02 23:19:02 +08:00
b1779d37f8 Fix autolayout constraints of adv proxy panel. 2017-03-02 22:51:47 +08:00
5a80d94af7 Fix autolayout constraints of User Rule panel. 2017-03-02 22:50:35 +08:00
aabb67f2c5 Move "Copy HTTP Proxy Export" from preference panel to menu. 2017-03-02 22:47:37 +08:00
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
05f31fb4f4 Merge pull request #228 from shadowsocksr/add-git-issue-template
Add issue template
2017-02-08 15:20:21 +08:00
dee47ada8b Merge branch 'develop' into add-git-issue-template 2017-02-08 15:20:09 +08:00
3348cae584 Merge pull request #225 from nidom/develop
fix  scanQR function memery leak
2017-02-08 15:19:48 +08:00
af1fc406d7 Merge branch 'develop' into develop 2017-02-08 10:28:40 +08:00
ae502d3d99 Merge branch 'develop' into add-git-issue-template 2017-02-08 10:28:15 +08:00
7cfef2a8e9 Merge branch 'develop' into release/1.4.0 2017-02-07 15:40:22 +08:00
2a17f43965 Fix typo in readme 2017-02-07 15:39:43 +08:00
8aaffbb6a3 Set default pac listen port to 1089 instead of 8090. 2017-02-07 12:19:34 +08:00
78606ca396 Add issue template 2017-02-05 22:34:52 +08:00
9b91d13cad fix scanQR function memery leak 2017-02-01 21:56:38 +08:00
9b5f2d8a23 Fix #218 2017-01-23 17:50:39 +08:00
ffccf62f8a May be better, refactor selecting server. 2017-01-20 21:55:21 +08:00
e481860075 [BUG] Fix #215 2017-01-20 16:10:11 +08:00
c28be0134c Only show A/G/M on status bar. 2017-01-20 14:21:39 +08:00
0e8098c631 Delete proxy.pac from project. 2017-01-20 00:25:13 +08:00
41a02b41ae Update Bundle version to 3. 2017-01-20 00:08:49 +08:00
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
568eabd5cc Refactor lauch agent utils. 2017-01-20 00:04:00 +08:00
546fca160a Upgrade kcptun client to version 20170117. 2017-01-20 00:02:02 +08:00
54a3655b6a Set theme jekyll-theme-slate 2017-01-17 11:23:25 +08:00