Merge pull request #1571 from FineUploader/develop

5.9.0

.github/CONTRIBUTING.md

@@ -4,5 +4,3 @@ The issue tracker in this project is for bug reports or feature requests ONLY.
 please see http://fineuploader.com/support.html which contains instructions on where you can browse and open support 
 requests. All pull requests and issues _must_ include all required fields in the respective template. If items
 from these fields are missing, the pull request or issue report may be closed as a result.
-
-**If this is a pull request, please sign [the Contributor License Agreement](https://www.clahub.com/agreements/FineUploader/fine-uploader).**

.gitignore

@@ -3,6 +3,7 @@
 *~
 .*.sw[a-z]
 *.iml
+*.iws
 !.github
 !.gitignore
 !.jshintrc

README.md

@@ -1,12 +1,11 @@
 [![Fine Uploader](http://fineuploader.com/img/FineUploader_logo.png)](http://fineuploader.com/)
 
-Version: 5.8.0
+[![Build Status](https://travis-ci.org/FineUploader/fine-uploader.svg?branch=master)](https://travis-ci.org/FineUploader/fine-uploader)
+[![npm](https://img.shields.io/npm/v/fine-uploader.svg)](https://www.npmjs.com/package/fine-uploader)
+[![license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE)
+[![Freenode](https://img.shields.io/badge/chat-on%20freenode-brightgreen.svg)](irc://chat.freenode.net/#fineuploader)
+[![Stackoverflow](https://img.shields.io/stackexchange/stackoverflow/t/fine-uploader.svg)](http://stackoverflow.com/questions/tagged/fine-uploader)
 
-[![Build Status](https://travis-ci.org/FineUploader/fine-uploader.png?branch=master)](https://travis-ci.org/FineUploader/fine-uploader)
-
-[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?maxAge=2592000)](https://gitter.im/FineUploader?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
-
-[**Download**](http://fineuploader.com/downloads.html) |
 [**Documentation**](http://docs.fineuploader.com) |
 [**Examples**](http://fineuploader.com/demos) |
 [**Support**](http://fineuploader.com/support.html) |
@@ -15,14 +14,32 @@ Version: 5.8.0
 
 ---
 
-Fine Uploader aims to make file-uploading on the web possible in every browser and mobile device. It is **cross-browser**, **dependency-free**, and **100% Javascript**.
+Fine Uploader is:
+
+- Cross-browser
+- Dependency-free
+- 100% JavaScript
+- 100% Free Open Source Software
+
+FineUploader is also simple to use. In the simplest case, you only need to include one JavaScript file.
+There are absolutely no other required external dependencies. For more information, please see the [**documentation**](http://docs.fineuploader.com).
+
+
+## Contributing
+
+Fine Uploader and all other projects in this organization thrive thanks to donations by Widen (the project's sponsor)
+and support by developers in the community. If you'd like to help, the best way to do so is open up a pull request
+that addresses one of the open feature requests or bugs. In order to get started developing Fine Uploader, follow these
+steps to get the project up and running on your local development machine:
 
-FineUploader is simple to use. You only need to include one JavaScript file. There are absolutely no other dependencies.
-For more information, please see the [**documentation**](http://docs.fineuploader.com).
+1. Download the project repository: `git clone https://github.com/FineUploader/fine-uploader.git`.
+2. Install all project development dependencies: `npm install`.
+3. To run the tests & linter: `$(npm bin)/grunt dev test:firefox` (you'll need Firefox installed locally).
+4. Please follow the [Angular.js commit guidelines][angular-commit].
+5. Please follow the [Git Flow][git-flow] branching strategy.
 
-### License ###
-This plugin is made available under the [Widen Commercial license](LICENSE).  If you are using Fine Uploader for commercial purposes,
-you must [purchase a license](http://fineuploader.com/purchase).
 
+*Fine Uploader is a code library sponsored by [Widen Enterprises, Inc.](http://www.widen.com/)*
 
-*Fine Uploader is a code library maintained and developed by [Widen Enterprises, Inc.](http://www.widen.com/)*
+[angular-commit]: https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#commit
+[git-flow]: http://nvie.com/posts/a-successful-git-branching-model/

client/js/version.js

@@ -1,2 +1,2 @@
 /*global qq */
-qq.version = "5.8.0";
+qq.version = "5.9.0";

docs/_templates/footer.html

@@ -1,4 +1,4 @@
 <footer>
-    <p>Powered by <a href="http://www.widen.com/">Widen Enterprises, Inc.</a>. &copy; 2015</p>
+    <p>Fine Uploader - &copy; 2013-present, <a href="http://www.widen.com/">Widen Enterprises, Inc.</a>.</p>
 </footer>
 

docs/_templates/navbar.html

@@ -84,12 +84,10 @@
                     <li class="dropdown">
                         <button id="support-dropdown-trigger" class="dropdown-toggle btn btn-link" data-toggle="dropdown">Support <b class="caret"></b></button>
                         <ul class="dropdown-menu support" role="menu" aria-labelledby="support-dropdown-trigger">
-                            <li role="presentation"><a role="menuitem" href="{{ URL_ROOT }}/browser-support.html">Browser Support</a></li>
-                            <li role="presentation"><a role="menuitem" href="http://stackoverflow.com/questions/tagged/fine-uploader">Community Support</a></li>
+                            <li role="presentation"><a role="menuitem" href="{{ URL_ROOT }}/browser-support.html">Browsers</a></li>
+                            <li role="presentation"><a role="menuitem" href="http://fineuploader.com/support.html" target="_blank">Community Support</a></li>
                             <li role="presentation"><a role="menuitem" href="{{ URL_ROOT }}/faq.html">FAQ</a></li>
                             <li role="presentation"><a role="menuitem" href="{{ URL_ROOT }}/features/handling-errors.html">Handling Errors</a></li>
-                            <li role="presentation"><a role="menuitem" href="https://github.com/Widen/fine-uploader/issues">Issue/Feature Tracker</a></li>
-                            <li role="presentation"><a role="menuitem" href="http://fineuploader.com/purchase">Purchase Support</a></li>
                         </ul>
                     </li>
 

docs/index.jmd

@@ -68,8 +68,7 @@ to the API documentation section.
 ### Additional Information
 
 * [Browser Support](browser-support.html) - Matrix of support for all major features. Also contains information on how to determine features support via JavaScript at runtime using Fine Uploader's API.
-* [Build Your Own](contributing.html) - Instructions on building Fine Uploader from source and running tests.
-* [Contributing](https://github.com/Widen/fine-uploader/blob/master/CONTRIBUTING.md) - Guidelines and rules for contributing code and opening issues.
+* [Contributing](https://github.com/FineUploader/fine-uploader#contributing) - Guidelines and options for contributing back to this free open source library.
 * [Changelog](http://blog.fineuploader.com/category/changelog/) - High-level summary of all releases.
 * [FAQ](faq.html)
 
@@ -78,8 +77,7 @@ to the API documentation section.
 
 * [Official Site](http://fineuploader.com)
 * [Blog](http://blog.fineuploader.com/)
-* [Issue Tracker](https://github.com/Widen/fine-uploader/issues) - File bugs and feature requests here.
-* [Support Q&A](http://stackoverflow.com/questions/tagged/fine-uploader) - Community support for Fine Uploader with participation from Fine Uploader developers. Not for bugs or feature requests.
+* [Support](http://fineuploader.com/support)
 * [GitHub repository](https://github.com/Widen/fine-uploader)
 
 {% endmarkdown %}

lib/grunt/configs/banner.js

@@ -6,7 +6,7 @@ module.exports = function(paths) {
             src: ["" + paths.build + "/*.{js,css}"],
             options: {
                 position: "top",
-                banner: "/*!\n* <%= pkg.title %>\n*\n* Copyright 2015, <%= pkg.author %> [email protected]\n*\n* Version: <%= pkg.version %>\n*\n* Homepage: http://fineuploader.com\n*\n* Repository: <%= pkg.repository.url %>\n*\n* Licensed only under the Widen Commercial License (http://fineuploader.com/licensing).\n*/ \n\n"
+                banner: "/*!\n* <%= pkg.title %>\n*\n* Copyright 2013-present, <%= pkg.author %>\n*\n* Version: <%= pkg.version %>\n*\n* Homepage: http://fineuploader.com\n*\n* Repository: <%= pkg.repository.url %>\n*\n* Licensed only under the MIT license (http://fineuploader.com/licensing).\n*/ \n\n"
             }
         },
         allfoot: {

lib/modules.js

@@ -243,9 +243,7 @@ var //dependencies
         ],
         versioned: [
             "package.json",
-            "fineuploader.jquery.json",
-            "client/js/version.js",
-            "README.md"
+            "client/js/version.js"
         ],
         fuUnit: [
             "test/static/local/helpme.js",

package.json

@@ -2,16 +2,8 @@
   "name": "fine-uploader",
   "title": "Fine Uploader",
   "main": "lib/traditional.js",
-  "version": "5.8.0",
-  "description": "Multiple file upload component with progress-bar, drag-and-drop, support for all modern browsers.",
-  "directories": {
-    "doc": "docs",
-    "lib": "client",
-    "test": "test"
-  },
-  "scripts": {
-    "build": "grunt package"
-  },
+  "version": "5.9.0",
+  "description": "Multiple file upload plugin with progress-bar, drag-and-drop, direct-to-S3 & Azure uploading, client-side image scaling, preview generation, form support, chunking, auto-resume, and tons of other features.",
   "keywords": [
     "amazon",
     "api",
@@ -43,12 +35,7 @@
     "url": "git://github.com/FineUploader/fine-uploader.git"
   },
   "author": "Widen Enterprises, Inc.",
-  "licenses": [
-    {
-      "type": "Widen Commerical License",
-      "url": "https://raw.githubusercontent.com/FineUploader/fine-uploader/master/LICENSE"
-    }
-  ],
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/FineUploader/fine-uploader/issues"
   },
@@ -59,6 +46,7 @@
     "grunt": "^0.4.5",
     "grunt-aws-s3": "^0.10.0",
     "grunt-banner": "0.2.0",
+    "grunt-cli": "1.2.0",
     "grunt-contrib-clean": "0.4.1",
     "grunt-contrib-compress": "0.5.2",
     "grunt-contrib-concat": "0.3.0",
@@ -91,9 +79,13 @@
     "uuid": "1.4.1"
   },
   "scripts": {
+    "build": "grunt package",
     "setup-dev": "(cd test/dev/handlers; curl -sS https://getcomposer.org/installer | php; php composer.phar install)",
-    "update-dev": "(cd test/dev/handlers; php composer.phar update)",
     "start-local-dev": "(. test/dev/handlers/s3keys.sh; php -S 0.0.0.0:9090 -t . -c test/dev/handlers/php.ini)",
-    "start-c9-dev": "php -S $IP:$PORT -t . -c test/dev/handlers/php.ini"
+    "start-c9-dev": "php -S $IP:$PORT -t . -c test/dev/handlers/php.ini",
+    "update-dev": "(cd test/dev/handlers; php composer.phar update)"
+  },
+  "engines" : {
+    "node" : "0.10.33"
   }
 }