You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/11/11 08:40:31 UTC
syncope git commit: More tweaks on L&N
Repository: syncope
Updated Branches:
refs/heads/master 9da95172a -> 697c90844
More tweaks on L&N
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/697c9084
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/697c9084
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/697c9084
Branch: refs/heads/master
Commit: 697c908444638f6e1f13deb9b1a1a714e552f37a
Parents: 9da9517
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 11 08:40:23 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 11 08:40:23 2015 +0100
----------------------------------------------------------------------
deb/enduser/LICENSE | 55 ++++++++++++++++++------------------------------
deb/enduser/NOTICE | 11 ----------
standalone/LICENSE | 15 +++++++++++++
standalone/NOTICE | 13 ++++++++++++
4 files changed, 48 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/697c9084/deb/enduser/LICENSE
----------------------------------------------------------------------
diff --git a/deb/enduser/LICENSE b/deb/enduser/LICENSE
index 95380f5..cc3b6ad 100644
--- a/deb/enduser/LICENSE
+++ b/deb/enduser/LICENSE
@@ -625,40 +625,11 @@ This is licensed under the AL 2.0, see above.
==
-For CodeMirror (http://codemirror.net/):
-This is licensed under the terms of the MIT license.
-
- 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.
-
-==
-
For LMAX Disruptor (https://lmax-exchange.github.io/disruptor/):
This is licensed under the AL 2.0, see above.
==
-For javax.inject (http://code.google.com/p/atinject/):
-This is licensed under the AL 2.0, see above.
-
-==
-
For Jackson (http://wiki.fasterxml.com/JacksonHome):
This is licensed under the AL 2.0, see above.
@@ -675,16 +646,30 @@ This is licensed under the AL 2.0, see above.
==
For jQuery (http://jquery.com/):
-This is licensed under the terms of the MIT license, see above.
-
-==
+This is licensed under the terms of the MIT license.
-For jQuery UI (http://jqueryui.com/):
-This is licensed under the terms of the MIT license, see above.
+ 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.
==
-For Admin LTE (https://github.com/almasaeed2010/AdminLTE/):
+For jQuery UI (http://jqueryui.com/):
This is licensed under the terms of the MIT license, see above.
==
http://git-wip-us.apache.org/repos/asf/syncope/blob/697c9084/deb/enduser/NOTICE
----------------------------------------------------------------------
diff --git a/deb/enduser/NOTICE b/deb/enduser/NOTICE
index 1fd0db0..a8ca9cc 100644
--- a/deb/enduser/NOTICE
+++ b/deb/enduser/NOTICE
@@ -25,17 +25,6 @@ All rights reserved.
==
-This product includes the CodeMirror JavaScript component.
-Copyright (C) 2015 by Marijn Haverbeke <ma...@gmail.com> and others
-
-==
-
-This product includes software developed by the atinject Project.
-Copyright (c) 2009, http://code.google.com/p/atinject/
-All rights reserved.
-
-==
-
This product includes software developed by the Jackson project.
http://wiki.fasterxml.com/JacksonHome
http://git-wip-us.apache.org/repos/asf/syncope/blob/697c9084/standalone/LICENSE
----------------------------------------------------------------------
diff --git a/standalone/LICENSE b/standalone/LICENSE
index 145dd45..2855622 100644
--- a/standalone/LICENSE
+++ b/standalone/LICENSE
@@ -1110,3 +1110,18 @@ intellectual property laws of the United States of America. No party to this
Agreement will bring a legal action under this Agreement more than one year
after the cause of action arose. Each party waives its rights to a jury trial in
any resulting litigation.
+
+==
+
+For AngularJS (http://angularjs.org):
+This is licensed under the terms of the MIT license, see above.
+
+==
+
+For FileSaver.js (https://github.com/eligrey/FileSaver.js)
+This is licensed under the terms of the MIT license, see above.
+
+==
+
+For Select2 (https://select2.github.io/)
+This is licensed under the terms of the MIT license, see above.
http://git-wip-us.apache.org/repos/asf/syncope/blob/697c9084/standalone/NOTICE
----------------------------------------------------------------------
diff --git a/standalone/NOTICE b/standalone/NOTICE
index 4743fbd..f2ae8fc 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -169,3 +169,16 @@ This product includes software developed by the Woodstox Project (http://woodsto
This product includes software developed by Web Services Description Language for Java (http://wsdl4j.sourceforge.net/).
Copyright (c) Dice.
All Rights Reserved.
+==
+
+This product includes software developed by the AngularJS Project (http://angularjs.org).
+
+==
+
+This product includes software developed by the FileSaver.js Project (https://github.com/eligrey/FileSaver.js).
+Copyright © 2015 Eli Grey.
+
+==
+
+This product includes software developed by the Select2 Project (https://select2.github.io/).
+Copyright (c) 2012-2015 Kevin Brown, Igor Vaynberg, and Select2 contributors