Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-18 03:33:40 +00:00
Code Releases Activity
338 Commits 7 Branches 17 Tags
1.4.2-R8-fix-subscribe
Commit Graph
338 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
qinyuhang ff0ab584e9 bug fixs 2016-09-08 21:11:22 +08:00
qinyuhang 706d8e54f4 fix sign problem 2016-09-08 20:20:36 +08:00
qinyuhang f956740150 Merge branch 'display-server-in-menu' into develop 2016-09-08 18:49:07 +08:00
qinyuhang 9aaf6940e2 菜单现在显示实际使用中的服务器名 
菜单现在显示实际使用中的服务器名
 2016-09-08 18:47:01 +08:00
qinyuhang ff4cda30c1 Revert "Fix typo" 
This reverts commit bdb3017910.
 2016-09-01 16:35:12 +08:00
qinyuhang f338698043 update signature setting 2016-09-01 14:34:15 +08:00
qinyuhang 63ad13af87 Make import and export panel top window 
Make import and export panel top window
 2016-08-30 17:49:55 +08:00
qinyuhang 2bb5579e57 open Finder after export configs 2016-08-28 11:31:54 +08:00
qinyuhang 695083602e Bump version 2016-08-28 08:34:03 +08:00
qinyuhang 24df1be763 Merge branch 'import-json-configs' into develop 2016-08-28 08:28:15 +08:00
qinyuhang 303cc41016 finish export function 
finish export function
fix issue https://github.com/qinyuhang/ShadowsocksX-NG/issues/8
 2016-08-28 08:24:33 +08:00
qinyuhang d5d9aeabf8 Show example file function 
Show example file function
 2016-08-27 18:58:40 +08:00
qinyuhang 6df2715651 Update Localization 
Update Localization
 2016-08-27 17:07:15 +08:00
qinyuhang a48805d687 Finish import function 
Finish import function
TODO: export function & show example config function
 2016-08-27 09:47:25 +08:00
qinyuhang bdb3017910 Fix typo 
Fix typo
 2016-08-26 22:47:05 +08:00
qinyuhang 4e255921b5 add menu button 
add menu button
 2016-08-26 13:32:05 +08:00
qinyuhang b7642936f8 init bunch import json configs 
init bunch import json config
add example config file
 2016-08-26 10:58:24 +08:00
qinyuhang 88f96b1e5a Merge remote-tracking branch 'qiuyuzhou/develop' into develop 2016-08-25 12:58:40 +08:00
qinyuhang abfa8c78e1 Merge remote-tracking branch 'qiuyuzhou/develop' into develop 
# Conflicts:
#	ShadowsocksX-NG/PreferencesWindowController.swift
add fix duplicate profile error
 2016-08-25 12:41:37 +08:00
qinyuhang 0068a96481 Bump version 
add custom white list & white ip list settings
 2016-08-25 12:02:00 +08:00
qinyuhang 020ad8b2cf add adv setting for local PAC server 
add adv setting for local PAC server
 2016-08-25 10:01:22 +08:00
qinyuhang cd1b1cd87f add adv settings for pac server 
add adv settings for pac server address & port
handle accident crash on stop pac server
 2016-08-25 09:19:47 +08:00
qinyuhang 999776d1d2 fix accident crash 
fix accident crash
 2016-08-25 00:19:34 +08:00
qinyuhang b3e8d6f095 Bump up version 
Bump up version
Add stop pac server method
 2016-08-24 11:54:16 +08:00
qinyuhang 66b0b622f0 add stop pac server method 
add stop pac server method to avoid switch pac file failure
 2016-08-24 11:52:40 +08:00
qinyuhang e8b073281d Merge branch 'hotfix-macOS10.12' of https://github.com/qinyuhang/ShadowsocksX-NG into merge-hotfix-macOS10.12 2016-08-23 20:49:52 +08:00
qinyuhang bc7ca9eb0e merge from hotfix-macOS10.12 
add local server to serve PAC file, this works on macOS 10.12 PAC mode
 2016-08-23 20:37:35 +08:00
qinyuhang f64798504c Fix typo 
Fix typo
 2016-08-23 19:40:05 +08:00
qinyuhang 1813d4a4da Fix update white list port 
Fix update white list port
 2016-08-23 19:15:26 +08:00
Charlie Qiu 9c0c8e219a Merge branch 'pr/41' into develop 2016-08-23 17:34:19 +08:00
qinyuhang 7520fd54a6 解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题 
解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题
https://github.com/qiuyuzhou/ShadowsocksX-NG/issues/30
PS 手头没有 macOS 10.12 的机器，麻烦有的请帮忙测试一下
或者可以从 https://github.com/qinyuhang/ShadowsocksX-NG/tree/webserver 下载去
Xcode build 一下
 2016-08-23 17:08:21 +08:00
qinyuhang eddb2d4f82 Update duplicate icons 
Update duplicate icons
Fix up force quite app ss-local still running background
 2016-08-23 10:41:04 +08:00
Yicheng 671816b592 auto active service when create first server profile 2016-08-22 23:26:04 +08:00
Yicheng 4f982d48e0 prevent remove all servers 2016-08-22 23:17:31 +08:00
Yicheng 689693e42d shakewindows 2016-08-22 23:10:33 +08:00
qinyuhang 72d5c985e9 Bump up version & update readme 
Bump up version & update readme
 2016-08-22 19:37:11 +08:00
qinyuhang b24b9e9b14 Add duplicate server profile 
1. Add duplicate server profile button
2. Update status bar icon (改进了之前颜色太浅的问题)
3. Fix layout on server preference window
4. Add alert or shake window when profile is not completed
 2016-08-22 19:18:35 +08:00
qinyuhang 1a8c171493 Update Readme 
Update Readme
Remove Protocol auth_simple
 2016-08-22 00:30:09 +08:00
qinyuhang f505c39c42 Fix typo 
Fix typo
 2016-08-17 12:56:50 +08:00
qinyuhang e7a33b705d update ss-local with updated obfs protocols 
update ss-local sync with breakwa11
updated methods, obfs protocols, obfs methods:
method: add
rc4-md5-6
chacha20-ietf
camellia-128-cfb
camellia-192-cfb
camellia-256-cfb
idea-cfb
rc2-cfb
seed-cfb
obfs: add
tls_simple
random_head
obfs: remove
tls1.0_session_auth
 2016-08-16 11:34:23 +08:00
qinyuhang d3b4971313 hot-fix crash at macOS 10.12 2016-08-14 23:18:51 +08:00
秦宇航 83cecb7459 Merge pull request #1 from qinyuhang/white-list 
add White list feature
 2016-08-14 07:58:44 +08:00
qinyuhang 134ededf89 Merge branch 'develop' into white-list 2016-08-14 07:50:56 +08:00
qinyuhang eae605910c 新增加白名单模式 
新增白名单模式，白名单来自破娃酱
注意事项，替换白名单中proxy的地址时发现原来的IP白名单中 wall_proxy 只有 socks5，而域名白名单中 wall_proxy
有 socks 和 socks5（只有这样才会work）。故此在后面的处理替换中将两个都加上了。后续变化，还需要看破娃酱 white list
具体变化。
 2016-08-14 00:40:14 +08:00
qinyuhang be51992ba8 init white list 2016-08-13 16:59:26 +08:00
qinyuhang 2d27b20cb2 Merge remote-tracking branch 'qiuyuzhou/develop' into develop 2016-08-13 13:34:39 +08:00
Qiu Yuzhou f9f342d7cf Merge pull request #36 from alejx/patch-1 
Fix some misspelled words.
 2016-08-13 11:27:35 +08:00
stonenya d8644e4e84 Fix some misspelled words. 2016-08-13 11:21:02 +08:00
qinyuhang 4f6f392b24 fix add server from QR code 
fix add server from QR code
 2016-08-12 10:26:37 +08:00
qinyuhang 6eea282f69 fix config 
fix config
 2016-08-11 11:57:12 +08:00