Merge branch 'master' into portal-multi-U2F-registration
This commit is contained in:
commit
894271a6f8
36
COPYING
36
COPYING
@ -48,13 +48,6 @@ Files: lemonldap-ng-portal/site/htdocs/static/common/modules/CAS.png
|
|||||||
Copyright: Jasig
|
Copyright: Jasig
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
|
|
||||||
Files: lemonldap-ng-portal/site/htdocs/static/common/modules/BrowserID.png
|
|
||||||
Copyright: 2013, Xavier Guimard <x.guimard@free.fr>
|
|
||||||
License: CC-3
|
|
||||||
Comment: created using images of YellowIcon and Innerer Schweinehund
|
|
||||||
(http://findicons.com/icon/168665/firefox?id=292029 and
|
|
||||||
http://commons.wikimedia.org/wiki/File:Mail-closed.svg)
|
|
||||||
|
|
||||||
Files: lemonldap-ng-portal/site/htdocs/static/common/modules/Google.png lemonldap-ng-portal/site/htdocs/static/common/modules/Facebook.png
|
Files: lemonldap-ng-portal/site/htdocs/static/common/modules/Google.png lemonldap-ng-portal/site/htdocs/static/common/modules/Facebook.png
|
||||||
Copyright: http://tempest.deviantart.com/
|
Copyright: http://tempest.deviantart.com/
|
||||||
License: CC-3
|
License: CC-3
|
||||||
@ -148,7 +141,7 @@ License: GPL-3+
|
|||||||
|
|
||||||
Files: lemonldap-ng-portal/site/htdocs/static/common/js/u2f-api.*
|
Files: lemonldap-ng-portal/site/htdocs/static/common/js/u2f-api.*
|
||||||
Copyright: 2014-2015, Google Inc.
|
Copyright: 2014-2015, Google Inc.
|
||||||
License: Expat
|
License: BSD-3-clause
|
||||||
|
|
||||||
Files: lemonldap-ng-portal/site/htdocs/static/common/apps/*
|
Files: lemonldap-ng-portal/site/htdocs/static/common/apps/*
|
||||||
doc/pages/documentation/current/icons/*
|
doc/pages/documentation/current/icons/*
|
||||||
@ -871,3 +864,30 @@ License: Simple-Geo
|
|||||||
These images only consist of simple geometric shapes or text. It does not meet
|
These images only consist of simple geometric shapes or text. It does not meet
|
||||||
the threshold of originality needed for copyright protection, and is therefore
|
the threshold of originality needed for copyright protection, and is therefore
|
||||||
in the public domain.
|
in the public domain.
|
||||||
|
|
||||||
|
License: BSD-3-clause
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions
|
||||||
|
are met:
|
||||||
|
.
|
||||||
|
- Redistributions of source code must retain the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer.
|
||||||
|
- Redistributions in binary form must reproduce the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer in
|
||||||
|
the documentation and/or other materials provided with the
|
||||||
|
distribution.
|
||||||
|
- Neither the name of Google Inc. nor the names of its contributors
|
||||||
|
may be used to endorse or promote products derived from this software
|
||||||
|
without specific prior written permission.
|
||||||
|
.
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||||
|
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||||
|
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
|
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||||
|
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||||
|
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||||
|
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
|
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
29
debian/copyright
vendored
29
debian/copyright
vendored
@ -141,7 +141,7 @@ License: GPL-3+
|
|||||||
|
|
||||||
Files: lemonldap-ng-portal/site/htdocs/static/common/js/u2f-api.*
|
Files: lemonldap-ng-portal/site/htdocs/static/common/js/u2f-api.*
|
||||||
Copyright: 2014-2015, Google Inc.
|
Copyright: 2014-2015, Google Inc.
|
||||||
License: Expat
|
License: BSD-3-clause
|
||||||
|
|
||||||
Files: lemonldap-ng-portal/site/htdocs/static/common/apps/*
|
Files: lemonldap-ng-portal/site/htdocs/static/common/apps/*
|
||||||
doc/pages/documentation/current/icons/*
|
doc/pages/documentation/current/icons/*
|
||||||
@ -867,3 +867,30 @@ License: Simple-Geo
|
|||||||
These images only consist of simple geometric shapes or text. It does not meet
|
These images only consist of simple geometric shapes or text. It does not meet
|
||||||
the threshold of originality needed for copyright protection, and is therefore
|
the threshold of originality needed for copyright protection, and is therefore
|
||||||
in the public domain.
|
in the public domain.
|
||||||
|
|
||||||
|
License: BSD-3-clause
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions
|
||||||
|
are met:
|
||||||
|
.
|
||||||
|
- Redistributions of source code must retain the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer.
|
||||||
|
- Redistributions in binary form must reproduce the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer in
|
||||||
|
the documentation and/or other materials provided with the
|
||||||
|
distribution.
|
||||||
|
- Neither the name of Google Inc. nor the names of its contributors
|
||||||
|
may be used to endorse or promote products derived from this software
|
||||||
|
without specific prior written permission.
|
||||||
|
.
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||||
|
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||||
|
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
|
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||||
|
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||||
|
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||||
|
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
|
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
Loading…
Reference in New Issue
Block a user