|
|
c63f6b2ee3
|
Merge branch 'pr/159' into develop
# Conflicts:
# ShadowsocksX-NG/Base.lproj/MainMenu.xib
|
2017-01-10 15:23:13 +08:00 |
|
|
|
500e524d05
|
Merge branch 'pr/95' into develop
|
2017-01-10 14:21:39 +08:00 |
|
|
|
9dafb4fb79
|
Add tests for ServerProfile
|
2017-01-09 18:16:44 +08:00 |
|
|
|
23967eca20
|
Added global Keyboard shortcut
So we could switch between different proxy modes with global shortcut.
|
2016-12-11 15:39:56 +08:00 |
|
|
|
327609c840
|
批量导入导出配置文件功能 for Swift 3
已解决冲突问题，请Merge
|
2016-10-17 23:28:22 +08:00 |
|
|
|
7a7249b80f
|
Update for swift 3.
- Convert code to swift 3
- Update alamofire to 4.0.1 for swift 3.
|
2016-10-02 01:17:07 +08:00 |
|
|
|
94e065ea63
|
Bugfix use a singleton ServerProfileManager
|
2016-06-23 10:07:26 +08:00 |
|
|
|
ccd666bc2a
|
Look like working now.
|
2016-06-10 03:59:27 +08:00 |
|
|
|
33a093950e
|
Rename is_valid to isValid
|
2016-06-09 05:44:18 +08:00 |
|
|
|
76be94bb2c
|
大量代码。
|
2016-06-09 00:30:08 +08:00 |
|
