Permalink
Browse files

Dual licensed vis.js (see #285)

  • Loading branch information...
1 parent 8d83372 commit 191bb159eae06f482e849747e7b739eaa0bf5df8 @josdejong josdejong committed Oct 24, 2014
Showing with 98 additions and 51 deletions.
  1. +2 −1 HISTORY.md
  2. 0 LICENSE → LICENSE-APACHE-2.0
  3. +22 −0 LICENSE-MIT
  4. +28 −9 NOTICE
  5. +10 −10 dist/vis.js
  6. +10 −10 dist/vis.min.js
  7. +17 −12 docs/index.html
  8. +9 −9 lib/header.js
View
@@ -2,8 +2,9 @@
http://visjs.org
-## not yet released, version 3.6.2
+## 2014-10-24, version 3.6.2
+- Vis.js is now dual licensed under both Apache 2.0 and MIT.
## 2014-10-22, version 3.6.1
File renamed without changes.
View
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Almende B.V.
+
+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.
+
View
@@ -1,14 +1,33 @@
Vis.js
Copyright 2010-2014 Almende B.V.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Vis.js is dual licensed under both
- http://www.apache.org/licenses/LICENSE-2.0
+ * The Apache 2.0 License
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ and
+
+ * The MIT License
+ http://opensource.org/licenses/MIT
+
+Vis.js may be distributed under either license.
+
+
+Vis.js uses and redistributes the following third-party libraries:
+
+- component-emitter
+ https://github.com/component/emitter
+ The MIT License
+
+- hammer.js
+ http://hammerjs.github.io/
+ The MIT License
+
+- moment.js
+ http://momentjs.com/
+ The MIT License
+
+- mousetrap
+ http://craig.is/killing/mice
+ The Apache 2.0 License
View
@@ -5,22 +5,22 @@
* A dynamic, browser-based visualization library.
*
* @version 3.6.2-SNAPSHOT
- * @date 2014-10-22
+ * @date 2014-10-24
*
* @license
* Copyright (C) 2011-2014 Almende B.V, http://almende.com
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
+ * Vis.js is dual licensed under both
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * * The Apache 2.0 License
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * and
+ *
+ * * The MIT License
+ * http://opensource.org/licenses/MIT
+ *
+ * Vis.js may be distributed under either license.
*/
(function webpackUniversalModuleDefinition(root, factory) {
View
Oops, something went wrong.
View
@@ -193,28 +193,33 @@ <h2 id="Use">Use</h2>
<h2 id="license">License</h2>
<p>
- Copyright (C) 2010-2014 Almende B.V.
+ Copyright 2010-2014 Almende B.V.
</p>
<p>
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Vis.js is dual licensed under both
</p>
-
+ <ul>
+ <li>
+ The Apache 2.0 License<br>
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
+ </li>
+ </ul>
<p>
- <a href="http://www.apache.org/licenses/LICENSE-2.0"
- target="_blank">http://www.apache.org/licenses/LICENSE-2.0</a>
+ and
</p>
+ <ul>
+ <li>
+ The MIT License<br>
+ <a href="http://opensource.org/licenses/MIT">http://opensource.org/licenses/MIT</a>
+ </li>
+ </ul>
<p>
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Vis.js may be distributed under either license.
</p>
+
</div>
</body>
</html>
View
@@ -10,15 +10,15 @@
* @license
* Copyright (C) 2011-2014 Almende B.V, http://almende.com
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
+ * Vis.js is dual licensed under both
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * * The Apache 2.0 License
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * and
+ *
+ * * The MIT License
+ * http://opensource.org/licenses/MIT
+ *
+ * Vis.js may be distributed under either license.
*/

0 comments on commit 191bb15

Please sign in to comment.