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

Commit Graph

  • 23967eca20 Added global Keyboard shortcut Vicent Tsai 2016-12-11 15:39:56 +08:00
  • 37e157b024 Sync server name menu when server preference changed. Nobel 2016-12-05 10:46:51 +08:00
  • cc342df5b5 Merge branch 'pr/116' into develop Charlie Qiu 2016-11-03 23:36:34 +08:00
  • 1ef2d7b909 Fix spell error. Charlie Qiu 2016-11-03 09:30:04 +08:00
  • 9e231a7b34 Merge branch 'release/1.3.2' Charlie Qiu 2016-11-01 11:36:46 +08:00
  • e6cdfbbc26 Fix typo Julien Schmidt 2016-10-26 19:25:35 +08:00
  • 381b9ce634 Update version number to 1.3.2 Charlie Qiu 2016-10-21 23:37:23 +08:00
  • cf2f5d1a9c Fix bug #106 by workaround. Charlie Qiu 2016-10-21 23:36:05 +08:00
  • d2b8ca1c97 Fix bug #104. Charlie Qiu 2016-10-21 23:27:30 +08:00
  • 082c25f5e2 Fix bug. http preferences 输入框bind需要启用：continuously updates value Charlie Qiu 2016-10-20 10:58:26 +08:00
  • 969c94eaff Merge branch 'pr/100' into develop Charlie Qiu 2016-10-20 08:31:33 +08:00
  • e4236f21a1 Corrected Spellings Julien Schmidt 2016-10-20 01:14:47 +08:00
  • 15193a978d fix storyboard merge problem qinyuhang 2016-10-20 00:30:33 +08:00
  • 299abfee7b Fix #98, Don't turn off when app Terminate. Charlie Qiu 2016-10-19 23:59:52 +08:00
  • 713bcae7b1 Merge branch 'release/1.3.1' Charlie Qiu 2016-10-19 14:32:40 +08:00
  • 3c77fc9fe9 Fix the project file. Charlie Qiu 2016-10-19 00:30:53 +08:00
  • 53d41ad27b Update version number to 1.3.1 Charlie Qiu 2016-10-19 00:30:21 +08:00
  • a85fc4e3b4 Disable the rich text attribute of the user pac fule edit control. Charlie Qiu 2016-10-19 00:26:16 +08:00
  • e5b342c134 Monitor PAC file. Disable then enable the system pac configure after it has been modified. Charlie Qiu 2016-10-19 00:24:45 +08:00
  • d0ad272198 Refactor pac proxy. Charlie Qiu 2016-10-18 23:35:17 +08:00
  • 7ad9dc42a0 Fix bug caused by pr #97 Charlie Qiu 2016-10-18 22:18:54 +08:00
  • 5ed5789c31 Merge branch 'pr/97' into develop Charlie Qiu 2016-10-18 22:11:04 +08:00
  • c7211ceb19 Merge commit 'fc11cc78fd9ad96d026485e07e643c751ad4669b' into develop Charlie Qiu 2016-10-18 16:07:05 +08:00
  • fc11cc78fd Merge pull request #92 from linuxbelletian/master Qiu Yuzhou 2016-10-18 16:04:10 +08:00
  • dd20ebda68 fix crash problem qinyuhang 2016-10-18 15:36:56 +08:00
  • 52a32a68af UI fix qinyuhang 2016-10-18 00:20:13 +08:00
  • 327609c840 批量导入导出配置文件功能 for Swift 3 qinyuhang 2016-09-12 17:05:28 +08:00
  • 22d654dd69 defaults.array(forKey: "ServerProfiles") would return nil ,but not handle 田兵 2016-10-17 16:13:42 +08:00
  • 8fa7f76faa Add a download link in readme. Qiu Yuzhou 2016-10-15 00:33:53 +08:00
  • 8ba816300c Merge branch 'release/1.3' Charlie Qiu 2016-10-15 00:02:18 +08:00
  • 54ad13ec08 Some UI fixes. Charlie Qiu 2016-10-14 23:44:14 +08:00
  • 91124b9e90 Merge branch 'pr/85' into develop Charlie Qiu 2016-10-14 23:39:11 +08:00
  • 82de054b83 Merge branch 'pr/78' into develop Charlie Qiu 2016-10-13 14:46:58 +08:00
  • 1eddfd48fa update recompiled privoxy 位敏 2016-10-10 20:47:24 +08:00
  • 4c295965f2 增加 HTTP代理 跟随全局设置 王晨 2016-10-09 14:31:13 +08:00
  • 3f7e433dd2 更新两处http开关，随ss开启和关闭 王晨 2016-10-08 17:16:02 +08:00
  • 2ab6f95631 add privoxy 王晨 2016-10-07 17:52:30 +08:00
  • 5815c29003 Set deployment target from 10.10 to 10.11 Charlie Qiu 2016-10-07 10:32:30 +08:00
  • e564405a8e Update travis ci status image to new link. Charlie Qiu 2016-10-06 15:05:35 +08:00
  • b699d060af bug fix bestv 2016-10-04 08:57:53 +08:00
  • 20d76a0850 代理菜单内增加状态栏文本显示开关 bestv 2016-10-02 23:59:01 +08:00
  • cc467c4df2 Update travis to use image xocde8 instead of xocde7.3 Charlie Qiu 2016-10-02 15:14:09 +08:00
  • dff5679dcb Update requirements in readme. Charlie Qiu 2016-10-02 02:11:09 +08:00
  • bfc39d8179 顶级菜单中服务器名前加上文字:服务器. Charlie Qiu 2016-10-02 01:45:59 +08:00
  • cb9d2b62ad Convert to swift 3 syntax. Charlie Qiu 2016-10-02 01:39:21 +08:00
  • 294073011b Merge branch 'pr/75' into develop Charlie Qiu 2016-10-02 01:36:32 +08:00
  • cd5c724bb7 Merge branch 'pr/54' into develop Charlie Qiu 2016-10-02 01:34:48 +08:00
  • 07532daac2 Merge pull request #73 from whao/patch-1 Qiu Yuzhou 2016-10-02 01:26:55 +08:00
  • b389dc226c Call webServer startWithOptions instead of startWithPort Charlie Qiu 2016-10-02 01:24:38 +08:00
  • 25f8319e85 Update version number from 1.2 to 1.3 Charlie Qiu 2016-10-02 01:19:17 +08:00
  • 7a7249b80f Update for swift 3. Charlie Qiu 2016-10-02 01:17:07 +08:00
  • 7076523cbd Merge branch 'pr/44' into develop Charlie Qiu 2016-10-02 00:08:33 +08:00
  • 9c24595486 show running mode on status bar bestv 2016-10-01 12:45:42 +08:00
  • 03244a8ed7 Typo fix Wei Hao 2016-09-28 13:57:04 +08:00
  • ff0ab584e9 bug fixs qinyuhang 2016-09-08 21:11:22 +08:00
  • 9aaf6940e2 菜单现在显示实际使用中的服务器名 qinyuhang 2016-09-08 18:47:01 +08:00
  • ff4cda30c1 Revert "Fix typo" qinyuhang 2016-09-01 16:35:12 +08:00
  • bdb3017910 Fix typo qinyuhang 2016-08-26 22:47:05 +08:00
  • cd1b1cd87f add adv settings for pac server qinyuhang 2016-08-25 09:19:47 +08:00
  • 66b0b622f0 add stop pac server method qinyuhang 2016-08-24 11:52:40 +08:00
  • f64798504c Fix typo qinyuhang 2016-08-23 19:40:05 +08:00
  • 9c0c8e219a Merge branch 'pr/41' into develop Charlie Qiu 2016-08-23 17:34:19 +08:00
  • 7520fd54a6 解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题 qinyuhang 2016-08-23 17:08:21 +08:00
  • 671816b592 auto active service when create first server profile Yicheng 2016-08-22 23:26:04 +08:00
  • 4f982d48e0 prevent remove all servers Yicheng 2016-08-22 23:17:31 +08:00
  • 689693e42d shakewindows Yicheng 2016-08-22 23:10:33 +08:00
  • f9f342d7cf Merge pull request #36 from alejx/patch-1 Qiu Yuzhou 2016-08-13 11:27:35 +08:00
  • d8644e4e84 Fix some misspelled words. stonenya 2016-08-13 11:21:02 +08:00
  • c43ed478fd Merge remote-tracking branch 'qiuyuzhou/develop' into develop qinyuhang 2016-08-08 22:08:20 +08:00
  • f03287ec0e Merge branch 'release/1.2' Charlie Qiu 2016-08-04 16:48:03 +08:00
  • b874a9dc23 Resize server profiles list in the preferences window. Charlie Qiu 2016-08-04 16:47:00 +08:00
  • 9068970c35 Resize server profiles list in the preferences window. Charlie Qiu 2016-08-04 00:55:03 +08:00
  • 245770afcf Fix bug #24 Charlie Qiu 2016-08-04 00:41:00 +08:00
  • f096ed2b23 Merge branch 'feature/bug23' into develop Charlie Qiu 2016-08-03 23:51:55 +08:00
  • 2d69aedd17 Merge branch 'pr/21' into develop Charlie Qiu 2016-08-03 23:51:07 +08:00
  • 7e1dc05b17 Fix bug #23: 没有~/Library/LaunchAgents文件夹启动故障 Charlie Qiu 2016-08-03 23:45:46 +08:00
  • fecc4a9ef5 revert unneed changes bjzhou1990 2016-08-02 13:39:21 +08:00
  • 995d43a41e add edit user rule window bjzhou1990 2016-08-01 15:28:59 +08:00
  • 9e0c650e33 Update README Charlie Qiu 2016-07-10 18:36:22 +08:00
  • 8c1ea5dd38 Merge pull request #14 from jackwish/develop Qiu Yuzhou 2016-07-10 18:08:31 +08:00
  • de8aa45b02 Move PAC & QRCode menu items to level 2 menu WANG Zhenhua 2016-07-10 14:15:31 +08:00
  • 03cefc5099 Support drag & drop reorder the server profiles. Charlie Qiu 2016-07-09 15:10:05 +08:00
  • 6c40f8c167 Change version number to 1.2 Charlie Qiu 2016-07-07 15:56:55 +08:00
  • 810479a40b Fix Assets.xcassets Charlie Qiu 2016-07-07 15:56:24 +08:00
  • 65af97edae Show current proxy mode on top menu item. Charlie Qiu 2016-07-07 15:51:27 +08:00
  • 7ab319e23e Merge branch 'release/1.1' Charlie Qiu 2016-07-06 19:50:34 +08:00
  • f1e264ae47 Localize advance proxy preferences panel. Charlie Qiu 2016-07-06 13:18:07 +08:00
  • e1ec9d7c8e Localization Charlie Qiu 2016-07-06 12:36:31 +08:00
  • e41a130c1c Change ss port minimum limit from 128 to 1. Charlie Qiu 2016-07-01 16:09:48 +08:00
  • ea4e006133 Advance preference for proxy. Charlie Qiu 2016-06-30 02:33:37 +08:00
  • 1380f245d5 Fix spell errors. Rename all 'Shadowsocks-NE' to 'Shadowsocks-NG' Charlie Qiu 2016-06-25 15:00:03 +08:00
  • 012c0de1c5 Update README Charlie Qiu 2016-06-25 09:47:27 +08:00
  • 0d2172a565 Change version to 1.1 Charlie Qiu 2016-06-25 09:45:36 +08:00
  • 2ef7adde6e Fix wrong spell in path. Charlie Qiu 2016-06-25 09:44:51 +08:00
  • fa6d9d64de Merge branch 'develop' of https://github.com/qiuyuzhou/ShadowsocksX-NG into develop Charlie Qiu 2016-06-23 12:10:34 +08:00
  • 6bfa77d773 Cocoa Keyboard Shortcuts in Dialog without an Edit Menu Charlie Qiu 2016-06-23 12:10:22 +08:00
  • 598ac6ea4d Merge pull request #8 from cs17899219/develop Qiu Yuzhou 2016-06-23 11:24:22 +08:00
  • 94e065ea63 Bugfix use a singleton ServerProfileManager C.S 2016-06-18 13:38:58 +08:00
  • 78bb0b7d32 Change to use flat app icons. Charlie Qiu 2016-06-21 22:35:43 +08:00
  • 64b1e0f488 Merge branch 'release/1.0' Charlie Qiu 2016-06-20 15:42:11 +08:00