diff --git a/.gitignore b/.gitignore index e44912c7..45a71c17 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,10 @@ BASE.* LOCAL.* REMOTE.* build +*.DS_Store +*.py +*.rb +*.sh +node_modules +*.komodoproject diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..da2c7c75 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,24 @@ +# Contributing + +## Overview + +* Code contributions should follow the [style guide](https://github.com/scriptish/scriptish/wiki/JavaScript-Style-Guide). +* Tests may be requested, and eventually will be required. +* All code must be reviewed by a reviewer. +** Sometimes code will need additional reviews. + +## Contributing Code + +* Check that your [issue](https://github.com/scriptish/scriptish/issues) does not +already exist. +* If it does not yet exist [please create one](https://github.com/scriptish/scriptish/issues/new). +* Make your changes, preferably in a branch named `bug_number`. +* Make sure there is a test in the branch (reverse the order of this for TDD). +* Mention your `branch_name`, with a link to it, in the issue thread. +* Ask for a review from one our reviewers. + +## Reviewers + +* [@erikvold](https://github.com/erikvold) +* [@supahgreg](https://github.com/supahgreg) +* [@nmaier](https://github.com/nmaier) diff --git a/LICENSE.txt b/LICENSE.txt index 91f4f2f9..66dd06ca 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -9,14 +9,13 @@ Scriptish contains code derived from FireBug ( http://getfirebug.com/ ), reused under the terms of the BSD license; see LICENSE.bsd. Scriptish also contains code derived from Mozilla projects, including -Firefox ( http://mozilla.org/ ). This code is reused under the MPL license; -see the LICENSE.mpl file. All such code is located in the content/third-party/ -directory, and all such files contain the appropriate licensing disclaimers -and notifications. +Firefox ( http://mozilla.org/ ). This code is reused under the MPL license. -The icon used is taken from the PICOL icon library http://www.picol.org/icon_library.php -This library is released under the Creative Commons-License BY-SA -http://creativecommons.org/licenses/by-sa/3.0/ +All code located in the content/third-party/, content/js/third-party/, +modules/third-party/, and skin/third-party/ directories, contain the appropriate +licensing disclaimers and notifications. + +The icon used was created by Slowpoke for Scriptish. The uso_medium.png icon contained within Scriptish is the property of UserScripts.org http://userscripts.org and is being used with their consent diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..bc5ebede --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ + +all: + sh build.sh amo diff --git a/README.md b/README.md new file mode 100644 index 00000000..ca69d4de --- /dev/null +++ b/README.md @@ -0,0 +1,31 @@ +# Scriptish + +[![Gitter chat](https://badges.gitter.im/scriptish/scriptish.png)](https://gitter.im/scriptish/scriptish) + +## About + +Scriptish is a userscript manager for Firefox, forked from Greasemonkey. + +## Browsers Supported + +* Firefox 21+ +* Seamonkey 2.8+ + + +## Download + +* [Addons.Mozilla.Org (AMO)](https://addons.mozilla.org/firefox/addon/scriptish) +* [Source Code](https://github.com/scriptish/scriptish) + +## Help + +* [Wiki](https://github.com/scriptish/scriptish/wiki) +* [Issues](https://github.com/scriptish/scriptish/issues) +* [Blog](http://scriptish.org/blog) +* irc.mozilla.org #userscripts (for UserScript development help) +* irc.mozilla.org #scriptish (for Scriptish development) +* [StackOverflow](http://stackoverflow.com/questions/tagged/userscripts) + +## UserScripts + +* [Userscripts](http://userscripts.org) diff --git a/README.txt b/README.txt deleted file mode 100644 index e62078f3..00000000 --- a/README.txt +++ /dev/null @@ -1,22 +0,0 @@ -Scriptish is a userscript manager for Firefox, forked from Greasemonkey. - - -Requirements ----------- - -* Using Scriptish: Firefox 4.0b5pre or higher -* Building an XPI: Unix shell -* Playing w/ code: Git - - -Links ----------- - -* Addons.Mozilla.Org (AMO): https://addons.mozilla.org/en-US/firefox/addon/231203 -* Userscripts: http://userscripts.org -* Wiki: http://github.com/erikvold/scriptish/wiki -* Issues: http://github.com/erikvold/scriptish/issues -* Google Group: http://groups.google.com/group/scriptish -* IRC: irc://irc.freenode.net/scriptish -* StatusNet http://identi.ca/scriptish -* Source Code: http://github.com/erikvold/scriptish diff --git a/assets/generate.svg b/assets/generate.svg new file mode 100644 index 00000000..8566d1b9 --- /dev/null +++ b/assets/generate.svg @@ -0,0 +1,118 @@ + + + + + Generate button (hashtag) + + + + + + + + + + + + + + + + image/svg+xml + + Generate button (hashtag) + 2011/06/28 + + + Nils Maier + + + + + CC-0 (Public domain) + + + + + + + + + + + + diff --git a/assets/scriptish.png b/assets/scriptish.png new file mode 100755 index 00000000..f7752abc Binary files /dev/null and b/assets/scriptish.png differ diff --git a/assets/scriptish16.png b/assets/scriptish16.png new file mode 100755 index 00000000..cd8b9e30 Binary files /dev/null and b/assets/scriptish16.png differ diff --git a/blocklist.json b/blocklist.json index 0f4c7489..7c89b839 100644 --- a/blocklist.json +++ b/blocklist.json @@ -1,3 +1,3 @@ { - "uso": [20145, 35611, 38017, 68219] -} \ No newline at end of file + "uso": [20145, 26062, 35611, 38017, 59744, 68219, 92054, 114457, 128437, 130770, 167885, 169552] +} diff --git a/build.sh b/build.sh index 8041e53b..8782d42a 100755 --- a/build.sh +++ b/build.sh @@ -1,9 +1,11 @@ #!/bin/sh # Set up variables -if [ "amo" = "$1" ] || [ "staging" = "$1" ]; then +if [ "amo" = "$1" ]; then # For official builds, use the version in install.rdf. VER=`grep -Go 'em:version\>\(.*\)\<' extension/install.rdf | grep -Go '>\(.*\)<' | sed -e 's/[><]*//g'` +elif [ "test" = "$1" ]; then + VER=`echo test` else # For beta builds, generate a version number. VER=`date +"%Y.%m.%d.beta"` @@ -11,7 +13,9 @@ fi XPI="scriptish-$VER.xpi" # Copy base structure to a temporary build directory and change to it -echo "Creating working directory ..." +if [ "test" != "$1" ]; then + echo "Creating working directory ..." +fi rm -rf build mkdir build cp LICENSE.txt build/ @@ -33,14 +37,26 @@ fi (sed -e 's/ - - - - + + + diff --git a/extension/content/addonstab.xul b/extension/content/addonstab.xul index 62d7d897..3fc3f1c6 100644 --- a/extension/content/addonstab.xul +++ b/extension/content/addonstab.xul @@ -3,6 +3,9 @@