Commit Graph

35 Commits

Author SHA1 Message Date
f4ae598ca3 Translating. 2017-03-23 20:46:25 +08:00
4479dc59d9 Deprecate OTA. 2017-03-20 00:23:52 +08:00
fd0971d88d All in one preferences window. 2017-03-17 23:11:12 +08:00
fa5e5140e7 Merge branch 'develop' into fix 2017-01-13 10:39:05 +08:00
dc1fa683d6 Optimalize order of menu items. 2017-01-13 01:00:01 +08:00
57fce4c25d Merge branch 'develop' into fix 2017-01-13 00:14:24 +08:00
913e1cc0bc Add Commend Export 2017-01-12 14:55:06 +08:00
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
59e3de1697 [ADD] localised text 2017-01-05 18:52:39 +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
e6cdfbbc26 Fix typo
Globel -> Global
2016-10-26 19:32:27 +08:00
e4236f21a1 Corrected Spellings 2016-10-20 01:14:47 +08:00
327609c840 批量导入导出配置文件功能 for Swift 3
已解决冲突问题,请Merge
2016-10-17 23:28:22 +08:00
91124b9e90 Merge branch 'pr/85' into develop
# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift
2016-10-14 23:39:11 +08:00
4c295965f2 增加 HTTP代理 跟随全局设置 2016-10-10 14:17:47 +08:00
2ab6f95631 add privoxy 2016-10-10 14:17:02 +08:00
20d76a0850 代理菜单内增加状态栏文本显示开关 2016-10-02 23:59:01 +08:00
bfc39d8179 顶级菜单中服务器名前加上文字:服务器. 2016-10-02 01:45:59 +08:00
03244a8ed7 Typo fix 2016-09-28 13:57:04 +08:00
995d43a41e add edit user rule window 2016-08-01 15:28:59 +08:00
65af97edae Show current proxy mode on top menu item. 2016-07-07 15:51:27 +08:00
f1e264ae47 Localize advance proxy preferences panel. 2016-07-06 13:18:07 +08:00
e1ec9d7c8e Localization 2016-07-06 12:36:31 +08:00
1380f245d5 Fix spell errors. Rename all 'Shadowsocks-NE' to 'Shadowsocks-NG' 2016-06-25 15:00:03 +08:00
23696420a5 Add show logs menu item. 2016-06-18 11:06:49 +08:00
7e184d5a1b Add "Enable verbose mode" to adv preferences panel. 2016-06-18 10:44:09 +08:00
3e11995462 Translations. 2016-06-14 10:32:34 +08:00
6c9bcba9fa Fix translations. 2016-06-12 01:36:40 +08:00
0b3d3a1320 Better english 2016-06-12 01:19:06 +08:00
5077e880a8 Add feedback menuitem 2016-06-11 18:02:57 +08:00
7590cf2b71 Add menu item "Manual Mode" 2016-06-11 17:47:18 +08:00
df0beab836 Translation. 2016-06-11 06:12:27 +08:00
e5e2680aa3 Localize *.swift files. 2016-06-10 19:44:49 +08:00
7735d6e0de Localize xib files. 2016-06-10 18:41:55 +08:00