close
The Wayback Machine - https://web.archive.org/web/20201017092431/https://github.com/ginkosen/ShadowsocksX-NG/pull/1
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

merge from master branch #1

Merged
merged 72 commits into from Aug 5, 2020
Merged

merge from master branch #1

merged 72 commits into from Aug 5, 2020

Conversation

@ginkosen
Copy link
Owner

@ginkosen ginkosen commented Aug 5, 2020

merge from master branch

guoxu0514 and others added 30 commits Jun 3, 2019
From this commit. The lowest support macOS version changed from 10.11 to 10.12.
…y-plugin/releases

Use a tag rather than the `master`. Easy to upgrade it in future.
It means the password here should be plain text, not percent-encoded.
Add a label with content `The QRCode is in SIP002 format`.
This is NSJSONSerialization.dataWithJSONObject that likes to insert additional backslashes.
Escaped forward slashes is also valid json. May be ss-local hasn't handle it correctly.
Use origin kcptun binary with an adapter script.
Add github action workflow configure file.
- Fixes typo in README.
- Add github action badge in README.
qiuyuzhou and others added 28 commits Sep 15, 2019
Add some convenient shortcuts for main menu
GCDWebServer not support to specify the ip listen on.
Only could specify bind to localhost or any ip(INADDR_ANY).
Make sure the folder `~/.ShadowsocksX-NG` exists.
At present it will create `v2ray-plugin` symbolic link but in Android it's `v2ray`. Sometime need to share configuration using QR code that time need to edit it manually. In this change will create `v2ray` symbolic link.
added additional v2ray symbolic link as an alias.
override the gwf rules with user rules
@ginkosen ginkosen merged commit 8ef80bb into ginkosen:develop Aug 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.