Skip to content

Commit

Permalink
start to remove sogou code from the entire project
Browse files Browse the repository at this point in the history
  • Loading branch information
Bo Zhu committed Jul 8, 2014
1 parent 585ed4c commit 97e3321
Show file tree
Hide file tree
Showing 21 changed files with 90 additions and 784 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ZIP_FILENAME = crx.zip
ZIP_FILENAME = ../ubuku_crx.zip
INCLUDED_FILES = manifest.json chrome shared _locales COPYING.txt
EXCLUDED_FILES = _locales/backup*

Expand Down
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
web: node server/server.js --production
web: node server/server.js --nolog --proxy=http://proxy.uku.im:8888

9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,14 @@ This project contains four functionalities.

You can find this extension on Chrome Web Store at [http://uku.im/chrome](http://uku.im/chrome)

2. _A local proxy server_ based on the non-blocking [Node.js](http://nodejs.org) for bypassing the mainland restriction _for other browsers and mobile devices_ (but not guaranteed).
2. _A backend server_ to support the redirect mode of the Chrome extension.

For more information, please see [the instructions](http://uku.im/proxy) (in Chinese).
[![Build Status](https://secure.travis-ci.org/zhuzhuor/Unblock-Youku.png?branch=master)](https://travis-ci.org/zhuzhuor/Unblock-Youku) [![Dependency Status](https://gemnasium.com/zhuzhuor/Unblock-Youku.png)](https://gemnasium.com/zhuzhuor/Unblock-Youku)

3. _A DNS server_ combined with the local proxy server.
3. _A local DNS server_ for devices that cannot set up proxies freely.

For more information, please read [its README file](https://github.com/zhuzhuor/Unblock-Youku/tree/master/dns-reverse-proxy).

4. _A backend server_ to support the redirection mode of the Chrome extension.

[![Build Status](https://secure.travis-ci.org/zhuzhuor/Unblock-Youku.png?branch=master)](https://travis-ci.org/zhuzhuor/Unblock-Youku) [![Dependency Status](https://gemnasium.com/zhuzhuor/Unblock-Youku.png)](https://gemnasium.com/zhuzhuor/Unblock-Youku)

## Disclaimer

Expand Down
24 changes: 0 additions & 24 deletions newrelic.js

This file was deleted.

28 changes: 6 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,22 @@
{
"name": "ub.uku.js",
"preferGlobal": "true",
"version": "1.8.10",
"author": "zhuzhuor <[email protected]>",
"description": "A Backend Server for Unblock-Youku",
"keywords": ["Unblock Youku", "proxy", "server"],
"bin": {
"ub.uku.js": "server/server.js"
},
"repository": {
"type": "git",
"url": "https://github.com/zhuzhuor/Unblock-Youku.git"
},
"dependencies": {
"colors": "*",
"optimist": "0.6.x",
"validator": "3.13.x",
"uglify-js": "2.4.x",
"raven": "0.6.x",
"newrelic": "1.6.x"
"request": "2.37.x"
},
"scripts": {
"start": "node server/server.js",
"test": "python test/run-all-tests.py"
},
"engines": {
"node": "0.10.x",
"npm": "1.2.x"
"npm": "1.4.x"
},
"bugs": {
"url": "https://github.com/zhuzhuor/Unblock-Youku/issues"
},
"licenses": [{
"type": "AGPL v3",
"url": "http://www.gnu.org/licenses/agpl-3.0.html"
}]
"repository": {
"type": "git",
"url": "https://github.com/zhuzhuor/Unblock-Youku.git"
}
}
Loading

0 comments on commit 97e3321

Please sign in to comment.