xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 5450b5de99 Start services after stop one second. Charlie Qiu 2017-03-02 23:19:02 +08:00
  • b1779d37f8 Fix autolayout constraints of adv proxy panel. Charlie Qiu 2017-03-02 22:51:47 +08:00
  • 5a80d94af7 Fix autolayout constraints of User Rule panel. Charlie Qiu 2017-03-02 22:50:35 +08:00
  • aabb67f2c5 Move "Copy HTTP Proxy Export" from preference panel to menu. Charlie Qiu 2017-03-02 14:26:32 +08:00
  • b981b93f5f Merge commit '05f31fb4f4f6dbb0d6d8e6d66d3cd38195dbfd4f' into release/1.4.0 Charlie Qiu 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 Qiu Yuzhou 2017-02-08 15:20:21 +08:00
  • dee47ada8b Merge branch 'develop' into add-git-issue-template Qiu Yuzhou 2017-02-08 15:20:09 +08:00
  • 3348cae584 Merge pull request #225 from nidom/develop Qiu Yuzhou 2017-02-08 15:19:48 +08:00
  • af1fc406d7 Merge branch 'develop' into develop Qiu Yuzhou 2017-02-08 10:28:40 +08:00
  • ae502d3d99 Merge branch 'develop' into add-git-issue-template Qiu Yuzhou 2017-02-08 10:28:15 +08:00
  • 7cfef2a8e9 Merge branch 'develop' into release/1.4.0 Charlie Qiu 2017-02-07 15:40:22 +08:00
  • 2a17f43965 Fix typo in readme Charlie Qiu 2017-02-07 15:39:43 +08:00
  • 8aaffbb6a3 Set default pac listen port to 1089 instead of 8090. Charlie Qiu 2017-02-07 12:19:34 +08:00
  • 78606ca396 Add issue template qinyuhang 2017-02-05 22:34:52 +08:00
  • 9b91d13cad fix scanQR function memery leak nidom 2017-02-01 21:56:38 +08:00
  • 9b5f2d8a23 Fix #218 Charlie Qiu 2017-01-23 17:50:39 +08:00
  • ffccf62f8a May be better, refactor selecting server. Charlie Qiu 2017-01-20 21:55:21 +08:00
  • e481860075 [BUG] Fix #215 Charlie Qiu 2017-01-20 16:10:11 +08:00
  • c28be0134c Only show A/G/M on status bar. Charlie Qiu 2017-01-20 14:21:39 +08:00
  • 0e8098c631 Delete proxy.pac from project. Charlie Qiu 2017-01-20 00:25:13 +08:00
  • 41a02b41ae Update Bundle version to 3. Charlie Qiu 2017-01-20 00:08:49 +08:00
  • 196e48ddd0 Disable toggle ss on/off by shortcut. Charlie Qiu 2017-01-20 00:07:52 +08:00
  • 568eabd5cc Refactor lauch agent utils. Charlie Qiu 2017-01-20 00:04:00 +08:00
  • 546fca160a Upgrade kcptun client to version 20170117. Charlie Qiu 2017-01-20 00:02:02 +08:00
  • 54a3655b6a Set theme jekyll-theme-slate Qiu Yuzhou 2017-01-17 11:23:25 +08:00
  • a7c92c2044 Set theme jekyll-theme-cayman Qiu Yuzhou 2017-01-17 11:21:39 +08:00
  • 87c19ea2a1 Set theme jekyll-theme-slate Qiu Yuzhou 2017-01-17 11:18:03 +08:00
  • fe2df2c5b7 [BUG] Fix typo #212 Charlie Qiu 2017-01-17 02:15:13 +08:00
  • f730c5cba2 [BUG] Show import/export panel as modal panel. Charlie Qiu 2017-01-17 02:07:33 +08:00
  • e5c8e965d4 [BUG] Fix #211 Exported server settings JSON does not include KCPTUN related configuration Charlie Qiu 2017-01-17 01:57:49 +08:00
  • d4aa0f7b47 [BUG] Fix #210 Duplicating KCPTUN enabled profiles does not copy KCPTUN related settings Charlie Qiu 2017-01-17 01:42:05 +08:00
  • bc813ff072 Add gitter chat badge to README.md Qiu Yuzhou 2017-01-16 16:54:57 +08:00
  • 59f914febe Refactor launch agent utils. Charlie Qiu 2017-01-16 14:47:40 +08:00
  • 0ac549ad04 Add kcptun adv preferences. Charlie Qiu 2017-01-15 23:02:17 +08:00
  • f5bd02e98b Add kcptun conn configure. Charlie Qiu 2017-01-15 22:49:24 +08:00
  • 489d9fe71b Merge pull request #206 from rizwankce/feature/toggle-running-hotkey Qiu Yuzhou 2017-01-13 23:33:14 +08:00
  • 3a0515b2d5 [ADD] Global hot key to toggle SS running On/Off Rizwan 2017-01-13 20:52:41 +08:00
  • 492c517cbf Code clean. Charlie Qiu 2017-01-13 14:59:54 +08:00
  • 6c34fd730f Merge pull request #203 from NobelLiu/fix Qiu Yuzhou 2017-01-13 15:30:47 +08:00
  • da5b1bf725 Merge branch 'develop' into fix Qiu Yuzhou 2017-01-13 15:30:36 +08:00
  • 8af177690c Merge pull request #204 from shadowsocksr/add-license Qiu Yuzhou 2017-01-13 15:30:20 +08:00
  • c34fc2417b add license file qinyuhang 2017-01-13 13:08:32 +08:00
  • fa5e5140e7 Merge branch 'develop' into fix Qiu Yuzhou 2017-01-13 10:39:05 +08:00
  • 03420401bd Update gfwlist.txt Charlie Qiu 2017-01-13 01:08:10 +08:00
  • a4cf382962 Update readme. Charlie Qiu 2017-01-13 01:06:06 +08:00
  • dc1fa683d6 Optimalize order of menu items. Charlie Qiu 2017-01-13 01:00:01 +08:00
  • 57fce4c25d Merge branch 'develop' into fix Qiu Yuzhou 2017-01-13 00:14:24 +08:00
  • f137d51cb2 Use a new approach to implement launch at login. Charlie Qiu 2017-01-12 23:44:29 +08:00
  • 29c6bf8c3a Reset constraint for preferences. Charlie Qiu 2017-01-12 19:20:38 +08:00
  • 43e68a2810 Change version number to 1.4.0 Charlie Qiu 2017-01-12 16:29:36 +08:00
  • 72c4c3e4e4 Set the ‘Skip Install’ option of proxy_conf_helper to YES. Charlie Qiu 2017-01-12 16:24:55 +08:00
  • fbd5d3b8a2 Support configure kcptun mtu. Charlie Qiu 2017-01-12 15:31:23 +08:00
  • 781031165e [BUG]Remove libpcre.1.dylib from ShadowsocksX-NG link libraries. Charlie Qiu 2017-01-12 12:30:44 +08:00
  • 5c1db71ab7 Encode kcptun infomations to ss url. Charlie Qiu 2017-01-12 11:35:05 +08:00
  • f7cca35948 Support kcptun. Charlie Qiu 2017-01-11 20:49:37 +08:00
  • 6d4cbedcfa Add kcptun installer. Charlie Qiu 2017-01-11 18:29:50 +08:00
  • ad938a355a Add KcptunProfile. Charlie Qiu 2017-01-11 16:44:58 +08:00
  • 361742ba38 [BUG] Update a new ss-local binary which support macos 12.11 Charlie Qiu 2017-01-12 15:00:41 +08:00
  • 913e1cc0bc Add Commend Export Nobel 2017-01-12 14:55:06 +08:00
  • d68dac0f7d [BUG]Remove libpcre.1.dylib from ShadowsocksX-NG link libraries. Charlie Qiu 2017-01-12 12:28:23 +08:00
  • 62648d02f1 Add a 'Copy' context menu to the QRCode window. Charlie Qiu 2017-01-12 11:58:57 +08:00
  • 1388c065c7 Send a system notification when not found valid qrcode of ss profile. Charlie Qiu 2017-01-12 11:45:57 +08:00
  • 5099e0bcc0 [BUG]Fixed decoding ss url. Charlie Qiu 2017-01-12 11:31:38 +08:00
  • 1de6fa0b5a [BUG]chmod +x install_helper.sh Charlie Qiu 2017-01-11 18:20:44 +08:00
  • e9398b4238 [BUG] Add libpcre.1.dylib to project. Charlie Qiu 2017-01-11 18:07:12 +08:00
  • cb4e6d7f19 Monitor pac file with GCD instead of FSEventStreamCreate. Charlie Qiu 2017-01-11 10:43:37 +08:00
  • 332232a202 Merge branch 'develop' of https://github.com/shadowsocks/ShadowsocksX-NG into develop Vicent Tsai 2017-01-10 21:40:55 +08:00
  • 78f0aa9c63 Add new encrypt methods to the selector list. Charlie Qiu 2017-01-10 17:50:59 +08:00
  • 43f6bd6c4b Update ss-local from 2.4.6 to 2.5.6 Charlie Qiu 2017-01-10 17:28:16 +08:00
  • 58c5befa04 Merge branch 'master' of https://github.com/shadowsocks/ShadowsocksX-NG into fix Nobel 2017-01-10 17:05:30 +08:00
  • 6175ec2888 CustomSetting Nobel 2017-01-10 17:04:18 +08:00
  • 208e9d03f5 Merge branch 'pr/95' into develop Charlie Qiu 2017-01-10 15:53:50 +08:00
  • c63f6b2ee3 Merge branch 'pr/159' into develop Charlie Qiu 2017-01-10 15:23:13 +08:00
  • 1e4ad0b108 add examplejson to Xcode project file qinyuhang 2017-01-10 15:02:54 +08:00
  • 500e524d05 Merge branch 'pr/95' into develop Charlie Qiu 2017-01-10 14:21:39 +08:00
  • 8f2267950f Merge branch 'pr/154' into develop Charlie Qiu 2017-01-10 14:17:48 +08:00
  • 0acfc98474 Merge branch 'pr/197' into develop Charlie Qiu 2017-01-10 14:14:54 +08:00
  • 845c554330 Merge branch 'pr/198' into develop Charlie Qiu 2017-01-10 12:31:51 +08:00
  • 5ff740a9a9 Merge commit 'dcce6cfce569108520fe32fed9d65e18e3157e09' into develop Charlie Qiu 2017-01-10 12:26:10 +08:00
  • dcce6cfce5 Merge pull request #170 from imnotpopo/master Qiu Yuzhou 2017-01-10 12:22:49 +08:00
  • 638f701e9c Merge pull request #171 from imnotpopo/develop Qiu Yuzhou 2017-01-10 12:21:31 +08:00
  • dfb06cdf70 Refactor tests as well Rainux Luo 2017-01-09 22:00:34 +08:00
  • dbc6ee92d5 Refactor ParseSSURL as ServerProfile initializer Rainux Luo 2017-01-09 21:49:09 +08:00
  • c50e18d832 Support generate SS URL with Remark and OTA Rainux Luo 2017-01-07 12:48:10 +08:00
  • 9dafb4fb79 Add tests for ServerProfile Rainux Luo 2017-01-07 09:26:32 +08:00
  • 5e06b4b4f0 Support parse SS URL with query string Rainux Luo 2017-01-07 08:51:57 +08:00
  • faf029c7f7 Parse SS URL with much cleaner URL struct methods Rainux Luo 2017-01-07 06:54:31 +08:00
  • 97801c4ee6 Add tests for ParseSSURL() Rainux Luo 2017-01-07 04:08:28 +08:00
  • 59e3de1697 [ADD] localised text Rizwan 2017-01-05 18:52:39 +08:00
  • 35d764fe2a [ADD] option to duplicate server profile on preference Rizwan 2017-01-05 18:26:33 +08:00
  • cc3b016a51 Update PreferencesWindowController.strings imnotpopo 2016-12-20 17:52:58 +08:00
  • 0b4bc25373 Update Localizable.strings imnotpopo 2016-12-20 17:52:18 +08:00
  • 417f8f8457 Update HTTPPreferencesWindowController.xib imnotpopo 2016-12-20 17:51:27 +08:00
  • d6b74afdc9 Update AdvPreferencesWindowController.xib imnotpopo 2016-12-20 17:50:46 +08:00
  • 8ca67b8ece Update Localizable.strings imnotpopo 2016-12-20 17:43:03 +08:00
  • a71f31705c Update AdvPreferencesWindowController.xib imnotpopo 2016-12-20 17:41:09 +08:00
  • cf4fb9a75e Update PreferencesWindowController.strings imnotpopo 2016-12-20 17:37:59 +08:00
  • 0c3c021f21 Merge branch 'feature/global_shortcut' into develop Vicent Tsai 2016-12-11 17:21:07 +08:00
  • 4dd3bd495e Update Alamofire to 4.2.0 with new version of Xcode 8.1 Vicent Tsai 2016-12-11 17:17:36 +08:00