Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #161

Open
wants to merge 55 commits into
base: rm
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
17a3d3a
init subscribe
qinyuhang Jun 14, 2017
2b592e9
add subscribe manager
qinyuhang Jun 20, 2017
5027ef6
refine subscribe manager
qinyuhang Jun 20, 2017
75d71ae
Add Subscribe Class
qinyuhang Jul 13, 2017
6f6b75b
Rerange menu items
qinyuhang Jul 14, 2017
1c2e395
bind data
qinyuhang Jul 16, 2017
55ef345
localization
qinyuhang Jul 16, 2017
a984a62
finish viewcontroller
qinyuhang Jul 16, 2017
010b093
Merge branch 'develop' into feature/subscribe
qinyuhang Jul 16, 2017
b4ce1eb
update subscribe at launch
qinyuhang Jul 16, 2017
944cfb4
Fix subscribe cannot delete to zero
qinyuhang Jul 16, 2017
08f1308
refine subscribe class
qinyuhang Jul 17, 2017
09437bd
fix wrong notification on bad netstat
qinyuhang Jul 18, 2017
1249a9f
hold wrong maxCount
qinyuhang Jul 19, 2017
290865a
Fix if update subscribe delete using node problem
qinyuhang Jul 22, 2017
5366345
Move profile manager function to the Class
qinyuhang Jul 22, 2017
b143d78
Fix activeProfileId not sync change with subscribe
qinyuhang Jul 22, 2017
d529c29
Delete profiles to 0 stop the app, and Not auto connect if no activeP…
qinyuhang Jul 22, 2017
9313641
fix accidently remove ss-config profile
qinyuhang Jul 22, 2017
37050b6
get group name from the res
qinyuhang Jul 22, 2017
5dd66ea
while network err and not fill subscribe name using New Subscribe
qinyuhang Jul 23, 2017
d4305d4
fix Method Obfs Protocol upcase problem, make it lowcased
qinyuhang Jul 23, 2017
ac027b8
Merge branch 'develop' into feature/subscribe
qinyuhang Jul 23, 2017
5ce8e61
fix crash problem
qinyuhang Jul 23, 2017
eb3815d
fix connect at launch not work as expected
qinyuhang Jul 24, 2017
c0f017f
fix typo
qinyuhang Jul 25, 2017
8162d73
add auth_chain_b
qinyuhang Jul 31, 2017
294c2a9
Bump version
qinyuhang Jul 31, 2017
25d2dfd
修改订阅去重复策略
qinyuhang Aug 3, 2017
e94ba06
更新libev
qinyuhang Aug 3, 2017
8e09347
compile with macOS 10.11
qinyuhang Aug 17, 2017
682fc34
Compile with macOS 10.11
qinyuhang Aug 18, 2017
8baf1c8
Fix typo. (#12)
tssujt Sep 7, 2017
61e40e7
Fix show QR require GPU
qinyuhang Oct 21, 2017
abfb8c1
Merge branch 'develop' of github.com:qinyuhang/shadowsocksX-NG-R into…
qinyuhang Oct 21, 2017
f38ade4
Bump Build version
qinyuhang Oct 21, 2017
509b996
Modify new version update check url and acl files' url
halftrue Oct 24, 2017
f38c2b8
Fix issues/65
qinyuhang Feb 2, 2018
539cba7
bump version
qinyuhang Feb 2, 2018
c5f1fc7
Merge pull request #32 from xuxiaokang/develop
qinyuhang Feb 2, 2018
e0644d2
update gfwlist
qinyuhang Oct 7, 2018
e3b2846
update travis ci config
qinyuhang Oct 7, 2018
6fd2965
update pods
qinyuhang Oct 7, 2018
533f953
bump version
qinyuhang Oct 7, 2018
bb6b71d
sytanx refine
qinyuhang Oct 11, 2018
51be0e5
update config
qinyuhang Oct 11, 2018
1f592d1
update pod conf to swift 4.2
qinyuhang Oct 11, 2018
bbc35ac
underscores should be allowed in domain names
KevinWang15 Aug 6, 2019
596ad01
Rename configuration directory
rainux Nov 6, 2019
08dbd99
Rename launch agents
rainux Nov 6, 2019
2eb1b05
Rename bundle identifier and build target
rainux Nov 6, 2019
c8d1209
Add some convenient shortcuts for main menu
rainux Nov 6, 2019
14f1ac9
Merge pull request #139 from KevinWang15/patch-1
qinyuhang Nov 11, 2019
4c4fe95
Merge pull request #150 from rainux/standalone
qinyuhang Nov 11, 2019
81acc0c
Merge branch 'develop' of github.com:qinyuhang/shadowsocksX-NG-R into…
qinyuhang Nov 11, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode8.3
osx_image: xcode10
xcode_workspace: ShadowsocksX-NG.xcworkspace
xcode_scheme: ShadowsocksX-NG
script: set -o pipefail && xcodebuild test -workspace ShadowsocksX-NG.xcworkspace -scheme ShadowsocksX-NG -sdk macosx10.12 CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO|xcpretty
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ end
post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '3.0'
config.build_settings['SWIFT_VERSION'] = '4.2'
end
end
end
18 changes: 12 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
PODS:
- Alamofire (4.2.0)
- BRLOptionParser (0.3.1)
- GCDWebServer (3.3.3):
- GCDWebServer/Core (= 3.3.3)
- GCDWebServer/Core (3.3.3)
- GCDWebServer (3.4.2):
- GCDWebServer/Core (= 3.4.2)
- GCDWebServer/Core (3.4.2)

DEPENDENCIES:
- Alamofire (~> 4.2.0)
- BRLOptionParser (~> 0.3.1)
- GCDWebServer (~> 3.0)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Alamofire
- BRLOptionParser
- GCDWebServer

SPEC CHECKSUMS:
Alamofire: aa2e09d871c9160ac53c90e83c68064a94e3dfbe
BRLOptionParser: a03256a8ff003ca1f5376c55f55f210e085a3958
GCDWebServer: 1c39a1f0763e4eb492bee021e4270fce097d3555
GCDWebServer: 8d67ee9f634b4bb91eb4b8aee440318a5fc6debd

PODFILE CHECKSUM: 8e98b2fb2d6be56882a44b2ff9241a800101e1d4
PODFILE CHECKSUM: 6b485731eac897a000e5b608b7849ad661fe16da

COCOAPODS: 1.1.1
COCOAPODS: 1.5.3
51 changes: 27 additions & 24 deletions Pods/GCDWebServer/GCDWebServer/Core/GCDWebServer.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading