Charlie Qiu 5ed5789c31 Merge branch 'pr/97' into develop ...

# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift

2016-10-18 22:11:04 +08:00

..

Assets.xcassets

Fix Assets.xcassets

2016-07-07 15:56:24 +08:00

Base.lproj

Some UI fixes.

2016-10-14 23:44:14 +08:00

en.lproj

Add menu item "Manual Mode"

2016-06-11 17:47:18 +08:00

zh-Hans.lproj

Merge branch 'pr/85' into develop

2016-10-14 23:39:11 +08:00

abp.js

完成PAC生成和从GFWList更新

2016-06-09 03:05:38 +08:00

AdvPreferencesWindowController.swift

Update for swift 3.

2016-10-02 01:17:07 +08:00

AppDelegate.swift

Merge branch 'pr/97' into develop

2016-10-18 22:11:04 +08:00

gfwlist.txt

完成PAC生成和从GFWList更新

2016-06-09 03:05:38 +08:00

HTTPPreferencesWindowController.swift

add privoxy

2016-10-10 14:17:02 +08:00

Info.plist

Update version number from 1.2 to 1.3

2016-10-02 01:19:17 +08:00

install_helper.sh

Look like working now.

2016-06-10 03:59:27 +08:00

install_privoxy.sh

update recompiled privoxy

2016-10-10 23:01:13 +08:00

install_ss_local.sh

Fix spell errors. Rename all 'Shadowsocks-NE' to 'Shadowsocks-NG'

2016-06-25 15:00:03 +08:00

jquery.min.js

Show qrcode for current server.

2016-06-09 06:59:42 +08:00

LaunchAgentUtils.swift

update recompiled privoxy

2016-10-10 23:01:13 +08:00

LaunchAtLoginController.h

大量代码。

2016-06-09 00:30:08 +08:00

LaunchAtLoginController.m

大量代码。

2016-06-09 00:30:08 +08:00

libcrypto.1.0.0.dylib

Embed libcrypto.1.0.0.dylib which been depand by ss-local.

2016-06-11 00:44:52 +08:00

menu_icon_disabled.png

大量代码。

2016-06-09 00:30:08 +08:00

menu_icon_disabled@2x.png

大量代码。

2016-06-09 00:30:08 +08:00

menu_icon.png

大量代码。

2016-06-09 00:30:08 +08:00

menu_icon@2x.png

大量代码。

2016-06-09 00:30:08 +08:00

Notifications.swift

add privoxy

2016-10-10 14:17:02 +08:00

PACUtils.swift

Update for swift 3.

2016-10-02 01:17:07 +08:00

PreferencesWindowController.swift

Update for swift 3.

2016-10-02 01:17:07 +08:00

privoxy

update recompiled privoxy

2016-10-10 23:01:13 +08:00

privoxy.config.example

add privoxy

2016-10-10 14:17:02 +08:00

proxy_conf_helper_version.h

增加 HTTP代理 跟随全局设置

2016-10-10 14:17:47 +08:00

proxy.pac

解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题

2016-08-23 17:08:21 +08:00

ProxyConfHelper.h

解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题

2016-08-23 17:08:21 +08:00

ProxyConfHelper.m

增加 HTTP代理 跟随全局设置

2016-10-10 14:17:47 +08:00

ProxyConfTool.h

Advance preference for proxy.

2016-06-30 02:33:37 +08:00

ProxyConfTool.m

Advance preference for proxy.

2016-06-30 02:33:37 +08:00

ProxyPreferencesController.swift

Update for swift 3.

2016-10-02 01:17:07 +08:00

qrcode.htm

Show qrcode for current server.

2016-06-09 06:59:42 +08:00

qrcode.min.js

Show qrcode for current server.

2016-06-09 06:59:42 +08:00

reload_conf_privoxy.sh

add privoxy

2016-10-10 14:17:02 +08:00

reload_conf_ss_local.sh

Fix spell errors. Rename all 'Shadowsocks-NE' to 'Shadowsocks-NG'

2016-06-25 15:00:03 +08:00

ServerProfile.swift

Update for swift 3.

2016-10-02 01:17:07 +08:00

ServerProfileManager.swift

Update for swift 3.

2016-10-02 01:17:07 +08:00

ShadowsocksX-NG-Bridging-Header.h

Advance preference for proxy.

2016-06-30 02:33:37 +08:00

ss-local

大量代码。

2016-06-09 00:30:08 +08:00

start_privoxy.sh

add privoxy

2016-10-10 14:17:02 +08:00

start_ss_local.sh

Fix spell errors. Rename all 'Shadowsocks-NE' to 'Shadowsocks-NG'

2016-06-25 15:00:03 +08:00

stop_privoxy.sh

add privoxy

2016-10-10 14:17:02 +08:00

stop_ss_local.sh

Fix spell errors. Rename all 'Shadowsocks-NE' to 'Shadowsocks-NG'

2016-06-25 15:00:03 +08:00

SWBApplication.h

Cocoa Keyboard Shortcuts in Dialog without an Edit Menu

2016-06-23 12:10:22 +08:00

SWBApplication.m

解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题

2016-08-23 17:08:21 +08:00

SWBQRCodeWindowController.h

Show qrcode for current server.

2016-06-09 06:59:42 +08:00

SWBQRCodeWindowController.m

Show qrcode for current server.

2016-06-09 06:59:42 +08:00

SWBQRCodeWindowController.xib

add adv settings for pac server

2016-08-25 09:19:47 +08:00

user-rule.txt

完成PAC生成和从GFWList更新

2016-06-09 03:05:38 +08:00

UserRulesController.swift

Update for swift 3.

2016-10-02 01:17:07 +08:00

Utils.h

大量代码。

2016-06-09 00:30:08 +08:00

Utils.m

大量代码。

2016-06-09 00:30:08 +08:00

Utils.swift

Update for swift 3.

2016-10-02 01:17:07 +08:00