You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/02/09 21:00:43 UTC

[42/57] [abbrv] couchdb commit: updated refs/heads/developer-preview-2.0 to 849b334

Adding licence for moment.js lib


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/2b9ce006
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2b9ce006
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2b9ce006

Branch: refs/heads/developer-preview-2.0
Commit: 2b9ce006066f1e5ab8f0e0df8ad66381e15cda05
Parents: 21edce9
Author: Benjamin Keen <be...@gmail.com>
Authored: Fri Jan 9 09:18:19 2015 -0800
Committer: Benjamin Keen <be...@gmail.com>
Committed: Fri Jan 9 09:18:19 2015 -0800

----------------------------------------------------------------------
 LICENSE | 27 +++++++++++++++++++++++++++
 NOTICE  |  4 ++++
 2 files changed, 31 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/2b9ce006/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 5ac7c47..009a148 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1277,3 +1277,30 @@ For the src/fauxton/test/nightwatch_tests/custom-commands/waitForAttribute.js co
     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.
+
+For src/fauxton/assets/js/plugins/moment.js component:
+
+    The MIT License (MIT)
+
+    Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    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.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2b9ce006/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index f03be89..dca473d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -177,3 +177,7 @@ This product also includes the following third-party components:
 * src/fauxton/test/nightwatch_tests/custom-commands/waitForAttribute.js
 
    Copyright (c) 2014 Dave Koo
+
+* moment.js
+
+   Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, moment.js contributors