Skip to content
This repository has been archived by the owner on Nov 20, 2018. It is now read-only.

Commit

Permalink
chore(MIT): start of switch to MIT license
Browse files Browse the repository at this point in the history
  • Loading branch information
rnicholus committed May 13, 2016
1 parent 119d223 commit 1212b83
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 348 deletions.
2 changes: 0 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).**
317 changes: 21 additions & 296 deletions LICENSE

Large diffs are not rendered by default.

27 changes: 16 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.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)
[![npm](https://img.shields.io/npm/v/fine-uploader.svg)](https://www.npmjs.com/package/fine-uploader)

[![Freenode](https://img.shields.io/badge/chat-on%20freenode-brightgreen.svg)](irc://chat.freenode.net/#fineuploader)

[**Download**](http://fineuploader.com/downloads.html) |
[**Documentation**](http://docs.fineuploader.com) |
[**Examples**](http://fineuploader.com/demos) |
[**Support**](http://fineuploader.com/support.html) |
Expand All @@ -15,14 +14,20 @@ 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).


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).
### License

### 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 made available under the [MIT license](LICENSE).


*Fine Uploader is a code library maintained and developed by [Widen Enterprises, Inc.](http://www.widen.com/)*
*Fine Uploader is a code library sponsored by [Widen Enterprises, Inc.](http://www.widen.com/)*
17 changes: 0 additions & 17 deletions bower.json

This file was deleted.

2 changes: 1 addition & 1 deletion client/js/version.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/*global qq */
qq.version = "5.8.0";
qq.version = "5.9.0";
4 changes: 1 addition & 3 deletions lib/modules.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
24 changes: 6 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -91,9 +78,10 @@
"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)"
}
}

0 comments on commit 1212b83

Please sign in to comment.