aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYING
diff options
context:
space:
mode:
authorfeula <mr.pikzen@gmail.com>2015-01-09 12:41:52 +0100
committerFlorian Eula <mr.pikzen@gmail.com>2015-01-21 11:46:50 +0100
commit8e0ad1d9208be864b33e2ebc3dc1ea2ff988a627 (patch)
tree1f48101c3fa28ffbc49bb4298411a81dd880bf36 /COPYING
parentcdd870b72efbb24fbf4e247f529121d2e04ed86e (diff)
downloadShaarli-8e0ad1d9208be864b33e2ebc3dc1ea2ff988a627.tar.gz
Shaarli-8e0ad1d9208be864b33e2ebc3dc1ea2ff988a627.tar.zst
Shaarli-8e0ad1d9208be864b33e2ebc3dc1ea2ff988a627.zip
Versioned JS files & centralized licenses
Updated libraries Updated copyright dates and the list of contributors. Added unminified sources for GPL compliance
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING74
1 files changed, 51 insertions, 23 deletions
diff --git a/COPYING b/COPYING
index 91ef0340..ea6ed40a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,20 +1,22 @@
1Files: * 1Files: *
2License: zlib/libpng 2License: zlib/libpng
3Copyright: (c) 2011-2014 Sébastien SAUVAGE <sebsauvage@sebsauvage.net> 3Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
4 (c) 2011-2014 Alexandre Alapetite <alexandre@alapetite.fr> 4 (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr>
5 (c) 2011-2014 David Sferruzza <david.sferruzza@gmail.com> 5 (c) 2011-2015 David Sferruzza <david.sferruzza@gmail.com>
6 (c) 2011-2014 Christophe HENRY <christophe.henry@sbgodin.fr> 6 (c) 2011-2015 Christophe HENRY <christophe.henry@sbgodin.fr>
7 (c) 2011-2014 Mathieu Chabanon <git@matchab.fr> 7 (c) 2011-2015 Mathieu Chabanon <git@matchab.fr>
8 (c) 2011-2014 BoboTiG <bobotig@gmail.com> 8 (c) 2011-2015 BoboTiG <bobotig@gmail.com>
9 (c) 2011-2014 Bronco <bronco@warriordudimanche.net> 9 (c) 2011-2015 Bronco <bronco@warriordudimanche.net>
10 (c) 2011-2014 Emilien Klein <emilien@klein.st> 10 (c) 2011-2015 Emilien Klein <emilien@klein.st>
11 (c) 2011-2014 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org> 11 (c) 2011-2015 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
12 (c) 2011-2014 Lionel Martin <renarddesmers@gmail.com> 12 (c) 2011-2015 Lionel Martin <renarddesmers@gmail.com>
13 (c) 2011-2014 lehollandaisvolant <levoltigeurhollandais@gmail.com> 13 (c) 2011-2015 lehollandaisvolant <levoltigeurhollandais@gmail.com>
14 (c) 2011-2014 timo van neerden <fire@lehollandaisvolant.net> 14 (c) 2011-2015 timo van neerden <fire@lehollandaisvolant.net>
15 (c) 2011-2014 nodiscc <nodiscc@gmail.com> 15 (c) 2011-2015 nodiscc <nodiscc@gmail.com>
16 16 (c) 2011-2015 Florian Eula <mr.pikzen@gmail.com>
17 17 (c) 2011-2015 Arthur Hoaro <arthur@hoa.ro>
18 (c) 2011-2015 virtualtam
19 (c) 2011-2015 qwertygc
18 20
19Files: images/calendar.png, images/edit_icon.png, images/feed-icon-14x14.png, images/private.png, images/private_16x16.png, images/private_16x16_active.png, images/qrcode.png, images/tag_blue.png 21Files: images/calendar.png, images/edit_icon.png, images/feed-icon-14x14.png, images/private.png, images/private_16x16.png, images/private_16x16_active.png, images/qrcode.png, images/tag_blue.png
20License: CC-BY (http://creativecommons.org/licenses/by/3.0/) 22License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
@@ -26,12 +28,10 @@ License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
26Copyright: (c) 2014 Designmodo 28Copyright: (c) 2014 Designmodo
27Source: http://designmodo.com/linecons-free/ 29Source: http://designmodo.com/linecons-free/
28 30
29
30Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle2.png, images/squiggle_closing.png 31Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle2.png, images/squiggle_closing.png
31Licence: Public Domain 32Licence: Public Domain
32Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg 33Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg
33 34
34
35Files: images/Paper_texture_v5_by_bashcorpo_w1000.jpg 35Files: images/Paper_texture_v5_by_bashcorpo_w1000.jpg
36Licence: Public Domain 36Licence: Public Domain
37Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 37Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998
@@ -40,13 +40,20 @@ Files: images/logo.png
40License: zlib/libpng 40License: zlib/libpng
41Copyright: (c) 2011-2014 idleman idleman@idleman.fr 41Copyright: (c) 2011-2014 idleman idleman@idleman.fr
42 42
43Files: ins/qr.min.js 43Files: Files: inc/jquery*.js, inc/jquery-ui*.js
44License: GPLv3 44License: MIT License (http://opensource.org/licenses/MIT)
45Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com 45Copyright: (C) jQuery Foundation and other contributors,https://jquery.com/download/
46 46
47-------------------------------------------------------- 47Files: inc/jquery-lazyload*.js
48ZLIB/LIBPNG LICENSE 48License: MIT License (http://opensource.org/licenses/MIT)
49Copyright: (C) Mika Tuupola, https://github.com/tuupola
49 50
51Files: inc/qr.js
52License: MIT License (http://opensource.org/licenses/MIT), Creative Commons
53Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js
54
55----------------------------------------------------
56ZLIB/LIBPNG LICENSE
50 57
51This software is provided 'as-is', without any express or implied warranty. 58This software is provided 'as-is', without any express or implied warranty.
52In no event will the authors be held liable for any damages arising from 59In no event will the authors be held liable for any damages arising from
@@ -80,4 +87,25 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
80GNU General Public License for more details. 87GNU General Public License for more details.
81 88
82You should have received a copy of the GNU General Public License 89You should have received a copy of the GNU General Public License
83along with this program. If not, see <http://www.gnu.org/licenses/>. \ No newline at end of file 90along with this program. If not, see <http://www.gnu.org/licenses/>.
91
92----------------------------------------------------
93MIT LICENSE
94
95Permission is hereby granted, free of charge, to any person obtaining a copy
96of this software and associated documentation files (the "Software"), to deal
97in the Software without restriction, including without limitation the rights
98to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
99copies of the Software, and to permit persons to whom the Software is
100furnished to do so, subject to the following conditions:
101
102The above copyright notice and this permission notice shall be included in
103all copies or substantial portions of the Software.
104
105THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
106IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
107FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
108AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
109LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
110OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
111THE SOFTWARE. \ No newline at end of file