Commit Graph
16 Commits
Author SHA1 Message Date
Qiu Yuzhou d56b108eb8 Conversion to Swift 4. 2017-10-20 18:39:25 +08:00
Qiu Yuzhou 72985b32ae Refactor. 2017-03-18 12:20:51 +08:00
Charlie Qiu f730c5cba2 [BUG] Show import/export panel as modal panel.
This approach would ensure the panel show in most front and in center of screen.
2017-01-17 02:07:33 +08:00
Charlie Qiu e5c8e965d4 [BUG] Fix #211 Exported server settings JSON does not include KCPTUN related configuration 2017-01-17 01:57:49 +08:00
Charlie Qiu 208e9d03f5 Merge branch 'pr/95' into develop
# Conflicts:
#	ShadowsocksX-NG.xcodeproj/project.pbxproj
2017-01-10 15:53:50 +08:00
Charlie Qiu c63f6b2ee3 Merge branch 'pr/159' into develop
# Conflicts:
#	ShadowsocksX-NG/Base.lproj/MainMenu.xib
2017-01-10 15:23:13 +08:00
qinyuhang 1e4ad0b108 add examplejson to Xcode project file
add examplejson to Xcode project file
fix resource method
2017-01-10 15:02:54 +08:00
Charlie Qiu 500e524d05 Merge branch 'pr/95' into develop 2017-01-10 14:21:39 +08:00
Rainux Luo 9dafb4fb79 Add tests for ServerProfile 2017-01-09 18:16:44 +08:00
Vicent Tsai 23967eca20 Added global Keyboard shortcut
So we could switch between different proxy modes with global shortcut.
2016-12-11 15:39:56 +08:00
qinyuhang 327609c840 批量导入导出配置文件功能 for Swift 3
已解决冲突问题,请Merge
2016-10-17 23:28:22 +08:00
Charlie Qiu 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
C.S 94e065ea63 Bugfix use a singleton ServerProfileManager 2016-06-23 10:07:26 +08:00
Charlie Qiu ccd666bc2a Look like working now. 2016-06-10 03:59:27 +08:00
Charlie Qiu 33a093950e Rename is_valid to isValid 2016-06-09 05:44:18 +08:00
Charlie Qiu 76be94bb2c 大量代码。 2016-06-09 00:30:08 +08:00