28 Commits

Include renames

Author	SHA1	Message	Date
Charlie Qiu	dc1fa683d6	Optimalize order of menu items.	2017-01-13 01:00:01 +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
Charlie Qiu	500e524d05	Merge branch 'pr/95' into develop	2017-01-10 14:21:39 +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
Julien Schmidt	e4236f21a1	Corrected Spellings	2016-10-20 01:14:47 +08:00
qinyuhang	15193a978d	fix storyboard merge problem ... 那三个按钮是灰色的大概是因为merge的时候storyboard 文件冲突	2016-10-20 00:30:33 +08:00
qinyuhang	52a32a68af	UI fix	2016-10-18 00:20:13 +08:00
qinyuhang	327609c840	批量导入导出配置文件功能 for Swift 3 ... 已解决冲突问题，请Merge	2016-10-17 23:28:22 +08:00
Charlie Qiu	91124b9e90	Merge branch 'pr/85' into develop ... # Conflicts: # ShadowsocksX-NG/AppDelegate.swift	2016-10-14 23:39:11 +08:00
王晨	2ab6f95631	add privoxy	2016-10-10 14:17:02 +08:00
bestv	20d76a0850	代理菜单内增加状态栏文本显示开关	2016-10-02 23:59:01 +08:00
bjzhou1990	fecc4a9ef5	revert unneed changes	2016-08-02 13:43:51 +08:00
bjzhou1990	995d43a41e	add edit user rule window	2016-08-01 15:28:59 +08:00
WANG Zhenhua	de8aa45b02	Move PAC & QRCode menu items to level 2 menu ... 1. Move PAC related items to *Proxy* submenu. 2. Move QR related items to *Server* submenu. 3. Remove some separators of main menu.	2016-07-10 17:52:33 +08:00
Charlie Qiu	65af97edae	Show current proxy mode on top menu item.	2016-07-07 15:51:27 +08:00
Charlie Qiu	ea4e006133	Advance preference for proxy. ... Manual spesify network services which would be configure.	2016-06-30 02:33:37 +08:00
Charlie Qiu	1380f245d5	Fix spell errors. Rename all 'Shadowsocks-NE' to 'Shadowsocks-NG'	2016-06-25 15:00:03 +08:00
Charlie Qiu	23696420a5	Add show logs menu item.	2016-06-18 11:06:49 +08:00
Charlie Qiu	a4bee86080	Add about menu item.	2016-06-12 08:25:52 +08:00
Charlie Qiu	4991c2cdc4	Add new menu item: "Apply User Rules For PAC"	2016-06-12 08:03:27 +08:00
Charlie Qiu	0b3d3a1320	Better english	2016-06-12 01:19:06 +08:00
Charlie Qiu	5077e880a8	Add feedback menuitem	2016-06-11 18:02:57 +08:00
Charlie Qiu	7590cf2b71	Add menu item "Manual Mode"	2016-06-11 17:47:18 +08:00
Charlie Qiu	69ef77f277	Add menu item "Edit User Rules For PAC..."	2016-06-11 06:21:19 +08:00
Charlie Qiu	250dfc7b38	Show qrcode for current server.	2016-06-09 06:59:42 +08:00
Charlie Qiu	2491224f7d	完成PAC生成和从GFWList更新	2016-06-09 03:05:38 +08:00
Charlie Qiu	76be94bb2c	大量代码。	2016-06-09 00:30:08 +08:00
Charlie Qiu	ae8848d4e8	Initial Commit	2016-06-05 21:29:13 +08:00