Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-11-05 21:45:06 +00:00
Code Releases Activity

Compare commits

base: Alawn/ShadowsocksX-NG-R:feature/subscribe
Branches Tags
Alawn/ShadowsocksX-NG-R:rm Alawn/ShadowsocksX-NG-R:feature_swift_5 Alawn/ShadowsocksX-NG-R:develop Alawn/ShadowsocksX-NG-R:fix_QR_GPU Alawn/ShadowsocksX-NG-R:master Alawn/ShadowsocksX-NG-R:feature/subscribe Alawn/ShadowsocksX-NG-R:release/1.4.0
Alawn/ShadowsocksX-NG-R:1.4.4-r8 Alawn/ShadowsocksX-NG-R:1.4.4-r8-resigning Alawn/ShadowsocksX-NG-R:1.4.3-R8-build3 Alawn/ShadowsocksX-NG-R:1.4.3-R8-build2 Alawn/ShadowsocksX-NG-R:1.4.3-R8 Alawn/ShadowsocksX-NG-R:1.4.2-R8 Alawn/ShadowsocksX-NG-R:1.4.2-R8-fix-subscribe Alawn/ShadowsocksX-NG-R:v1.4-beta Alawn/ShadowsocksX-NG-R:v1.4-alpha Alawn/ShadowsocksX-NG-R:1.3.2 Alawn/ShadowsocksX-NG-R:1.3.1 Alawn/ShadowsocksX-NG-R:1.3 Alawn/ShadowsocksX-NG-R:1.2 Alawn/ShadowsocksX-NG-R:1.1 Alawn/ShadowsocksX-NG-R:1.0 Alawn/ShadowsocksX-NG-R:v1.0-beta2 Alawn/ShadowsocksX-NG-R:v1.0-beta
...
compare: Alawn/ShadowsocksX-NG-R:1.4.3-R8
Branches Tags
Alawn/ShadowsocksX-NG-R:feature_swift_5 Alawn/ShadowsocksX-NG-R:develop Alawn/ShadowsocksX-NG-R:rm Alawn/ShadowsocksX-NG-R:fix_QR_GPU Alawn/ShadowsocksX-NG-R:master Alawn/ShadowsocksX-NG-R:feature/subscribe Alawn/ShadowsocksX-NG-R:release/1.4.0
Alawn/ShadowsocksX-NG-R:1.4.4-r8 Alawn/ShadowsocksX-NG-R:1.4.4-r8-resigning Alawn/ShadowsocksX-NG-R:1.4.3-R8-build3 Alawn/ShadowsocksX-NG-R:1.4.3-R8-build2 Alawn/ShadowsocksX-NG-R:1.4.3-R8 Alawn/ShadowsocksX-NG-R:1.4.2-R8 Alawn/ShadowsocksX-NG-R:1.4.2-R8-fix-subscribe Alawn/ShadowsocksX-NG-R:v1.4-beta Alawn/ShadowsocksX-NG-R:v1.4-alpha Alawn/ShadowsocksX-NG-R:1.3.2 Alawn/ShadowsocksX-NG-R:1.3.1 Alawn/ShadowsocksX-NG-R:1.3 Alawn/ShadowsocksX-NG-R:1.2 Alawn/ShadowsocksX-NG-R:1.1 Alawn/ShadowsocksX-NG-R:1.0 Alawn/ShadowsocksX-NG-R:v1.0-beta2 Alawn/ShadowsocksX-NG-R:v1.0-beta
6 Commits
feature/subscribe ... 1.4.3-R8
Author SHA1 Message Date
秦宇航 682fc346f8 Compile with macOS 10.11 
To avoid install ss-local failed
 2017-08-18 18:39:36 +08:00
秦宇航 8e09347fac compile with macOS 10.11 2017-08-17 21:13:23 +08:00
秦宇航 e94ba06959 更新libev 2017-08-03 12:04:00 +08:00
秦宇航 25d2dfdd4a 修改订阅去重复策略 2017-08-03 12:03:41 +08:00
秦宇航 294c2a94e1 Bump version 2017-07-31 10:11:50 +08:00
秦宇航 8162d7346b add auth_chain_b 2017-07-31 08:48:08 +08:00
6 changed files with 6 additions and 5 deletions
Expand all files Collapse all files
ShadowsocksX-NG/Info.plist
+2 -2
View File
@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.4.1-R8</string> <string>1.4.3-R8</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
@@ -48,7 +48,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>4</string> <string>1</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string> <string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
ShadowsocksX-NG/LaunchAgentUtils.swift
+1 -1
View File
@@ -8,7 +8,7 @@
import Foundation import Foundation
let SS_LOCAL_VERSION = "2.5.6.9.static" let SS_LOCAL_VERSION = "2.5.6.12.static"
let PRIVOXY_VERSION = "3.0.26.static" let PRIVOXY_VERSION = "3.0.26.static"
let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/" let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/"
let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/" let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/"
ShadowsocksX-NG/PreferencesWindowController.swift
+1
View File
@@ -81,6 +81,7 @@ class PreferencesWindowController: NSWindowController
"auth_aes128_sha1", "auth_aes128_sha1",
"auth_aes128_md5", "auth_aes128_md5",
"auth_chain_a", "auth_chain_a",
"auth_chain_b",
]) ])
ObfsTextField.addItems(withObjectValues: [ ObfsTextField.addItems(withObjectValues: [
"plain", "plain",
ShadowsocksX-NG/ServerProfileManager.swift
+1 -1
View File
@@ -94,7 +94,7 @@ class ServerProfileManager: NSObject {
func isExisted(profile: ServerProfile) -> (Bool, Int){ func isExisted(profile: ServerProfile) -> (Bool, Int){
for (index, value) in profiles.enumerated() { for (index, value) in profiles.enumerated() {
let ret = value.serverHost == profile.serverHost let ret = (value.serverHost == profile.serverHost && value.serverPort == profile.serverPort)
if ret { if ret {
return (ret, index) return (ret, index)
} }
ShadowsocksX-NG/install_ss_local.sh
+1 -1
View File
@@ -8,7 +8,7 @@
cd `dirname "${BASH_SOURCE[0]}"` cd `dirname "${BASH_SOURCE[0]}"`
ssLocalVersion=2.5.6.9.static ssLocalVersion=2.5.6.12.static
mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion" mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion"
cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion/" cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion/"
rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local" rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local"
ShadowsocksX-NG/ss-local
BIN
View File
Binary file not shown.