aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2014-05-27 13:56:28 -0400
committerScott González <scott.gonzalez@gmail.com>2014-06-27 11:18:20 -0400
commit7c4c86a000d1daf8181583a9902fed7008a4190e (patch)
tree0e2e9c7314eadce9d91f4ca4d064b2e4e3487ff4
parent292248307a1df3a1161dc9aa026658205d555cca (diff)
downloadjquery-ui-7c4c86a000d1daf8181583a9902fed7008a4190e.tar.gz
jquery-ui-7c4c86a000d1daf8181583a9902fed7008a4190e.zip
Build: Update license
Closes gh-1257
-rw-r--r--LICENSE.txt (renamed from MIT-LICENSE.txt)28
-rw-r--r--package.json2
2 files changed, 24 insertions, 6 deletions
diff --git a/MIT-LICENSE.txt b/LICENSE.txt
index fc96cbd32..156f8d5ca 100644
--- a/MIT-LICENSE.txt
+++ b/LICENSE.txt
@@ -1,10 +1,14 @@
-Copyright 2014 jQuery Foundation and other contributors,
-http://jqueryui.com/
+Copyright 2007, 2014 jQuery Foundation and other contributors,
+https://jquery.org/
This software consists of voluntary contributions made by many
-individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
-contribution history, see the revision history and logs, available
-at http://jquery-ui.googlecode.com/svn/
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/jquery-ui
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -24,3 +28,17 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code contained within the demos directory.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+All files located in the node_modules and external directories are
+externally maintained libraries used by this software which have their
+own licenses; we recommend you read them, as their terms may differ from
+the terms above.
diff --git a/package.json b/package.json
index 261a6fcf0..bb4313c74 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
"licenses": [
{
"type": "MIT",
- "url": "https://github.com/jquery/jquery-ui/blob/master/MIT-LICENSE.txt"
+ "url": "https://github.com/jquery/jquery-ui/blob/master/LICENSE.txt"
}
],
"scripts": {