ShadowsocksX-NG-R

Alawn/ShadowsocksX-NG-R

Fork 0

mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-03 17:24:06 +00:00

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

8244c6307f bump up version qinyuhang 2016-09-14 07:38:53 +08:00
83df982029 增加打开时自动连接选项 qinyuhang 2016-09-12 16:09:39 +08:00
38ece2f86c Remove BunchImportUtils.swift qinyuhang 2016-09-12 15:39:23 +08:00
ba9aebab4e 代码重构 qinyuhang 2016-09-12 15:38:56 +08:00
6c5af29cc2 修正问题 qinyuhang 2016-09-12 08:16:30 +08:00
930ee272b4 New dark mode icon qinyuhang 2016-09-12 08:01:08 +08:00
f150f720ea fix typo qinyuhang 2016-09-09 20:15:36 +08:00
d640593fbf 中文化 qinyuhang 2016-09-09 20:14:36 +08:00
b6d86a1b07 fix dark mode display bug qinyuhang 2016-09-09 15:09:22 +08:00
2c1894e255 Add Ping result in main menu qinyuhang 2016-09-09 13:59:53 +08:00
648ec753e8 Merge pull request #15 from qinyuhang/yichengchen-ssr 秦宇航 2016-09-09 12:56:24 +08:00
48a46d79e2 try merge yichengchen/ssr qinyuhang 2016-09-09 12:51:37 +08:00
28961a39fa fix up firewall permission request qinyuhang 2016-09-09 11:05:40 +08:00
ca38c9a2a2 Merge branch 'display-server-in-menu' into develop qinyuhang 2016-09-08 21:11:42 +08:00
ff0ab584e9 bug fixs qinyuhang 2016-09-08 21:11:22 +08:00
706d8e54f4 fix sign problem qinyuhang 2016-09-08 20:20:36 +08:00
f956740150 Merge branch 'display-server-in-menu' into develop qinyuhang 2016-09-08 18:49:07 +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
f338698043 update signature setting qinyuhang 2016-09-01 14:34:15 +08:00
63ad13af87 Make import and export panel top window qinyuhang 2016-08-30 17:49:55 +08:00
2bb5579e57 open Finder after export configs qinyuhang 2016-08-28 11:31:54 +08:00
695083602e Bump version qinyuhang 2016-08-28 08:34:03 +08:00
24df1be763 Merge branch 'import-json-configs' into develop qinyuhang 2016-08-28 08:28:15 +08:00
303cc41016 finish export function qinyuhang 2016-08-28 08:24:33 +08:00
d5d9aeabf8 Show example file function qinyuhang 2016-08-27 18:58:40 +08:00
6df2715651 Update Localization qinyuhang 2016-08-27 17:07:15 +08:00
a48805d687 Finish import function qinyuhang 2016-08-27 09:47:25 +08:00
bdb3017910 Fix typo qinyuhang 2016-08-26 22:47:05 +08:00
4e255921b5 add menu button qinyuhang 2016-08-26 13:32:05 +08:00
b7642936f8 init bunch import json configs qinyuhang 2016-08-26 10:58:24 +08:00
88f96b1e5a Merge remote-tracking branch 'qiuyuzhou/develop' into develop qinyuhang 2016-08-25 12:58:40 +08:00
abfa8c78e1 Merge remote-tracking branch 'qiuyuzhou/develop' into develop qinyuhang 2016-08-25 12:41:37 +08:00
0068a96481 Bump version qinyuhang 2016-08-25 12:02:00 +08:00
020ad8b2cf add adv setting for local PAC server qinyuhang 2016-08-25 10:01:22 +08:00
cd1b1cd87f add adv settings for pac server qinyuhang 2016-08-25 09:19:47 +08:00
999776d1d2 fix accident crash qinyuhang 2016-08-25 00:19:34 +08:00
b3e8d6f095 Bump up version qinyuhang 2016-08-24 11:54:16 +08:00
66b0b622f0 add stop pac server method qinyuhang 2016-08-24 11:52:40 +08:00
e8b073281d Merge branch 'hotfix-macOS10.12' of https://github.com/qinyuhang/ShadowsocksX-NG into merge-hotfix-macOS10.12 qinyuhang 2016-08-23 20:49:52 +08:00
bc7ca9eb0e merge from hotfix-macOS10.12 qinyuhang 2016-08-23 20:37:35 +08:00
f64798504c Fix typo qinyuhang 2016-08-23 19:40:05 +08:00
1813d4a4da Fix update white list port qinyuhang 2016-08-23 19:15:26 +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
eddb2d4f82 Update duplicate icons qinyuhang 2016-08-23 10:41:04 +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
72d5c985e9 Bump up version & update readme qinyuhang 2016-08-22 19:37:11 +08:00
b24b9e9b14 Add duplicate server profile qinyuhang 2016-08-22 19:18:35 +08:00
1a8c171493 Update Readme qinyuhang 2016-08-22 00:30:09 +08:00
f505c39c42 Fix typo qinyuhang 2016-08-17 12:56:50 +08:00
e7a33b705d update ss-local with updated obfs protocols qinyuhang 2016-08-16 11:34:23 +08:00
d3b4971313 hot-fix crash at macOS 10.12 qinyuhang 2016-08-14 23:18:51 +08:00
83cecb7459 Merge pull request #1 from qinyuhang/white-list 秦宇航 2016-08-14 07:58:44 +08:00
134ededf89 Merge branch 'develop' into white-list qinyuhang 2016-08-14 07:50:56 +08:00
eae605910c 新增加白名单模式 qinyuhang 2016-08-14 00:40:14 +08:00
be51992ba8 init white list qinyuhang 2016-08-13 16:59:26 +08:00
2d27b20cb2 Merge remote-tracking branch 'qiuyuzhou/develop' into develop qinyuhang 2016-08-13 13:34:39 +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
4f6f392b24 fix add server from QR code qinyuhang 2016-08-12 10:26:37 +08:00
6eea282f69 fix config qinyuhang 2016-08-11 11:57:12 +08:00
8569bc590c finish integration basic ssr function qinyuhang 2016-08-11 11:23:09 +08:00
8bd4f25e7b Start integrate SSR qinyuhang 2016-08-11 09:33:58 +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' 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' 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' 1.0 Charlie Qiu 2016-06-20 15:42:11 +08:00
81df618fe0 Merge branch 'release/1.0' into develop Charlie Qiu 2016-06-20 15:42:11 +08:00
4659a963b3 Update build number to 3. Charlie Qiu 2016-06-20 15:41:12 +08:00

... 3 4 5 6 7