From: nodiscc Date: Wed, 27 Aug 2014 20:52:45 +0000 (+0200) Subject: replace unlicensed icons/images, add proper credits X-Git-Tag: v0.0.43beta~41^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=509b080847323905c2bfac3c3e0732fb38755847;hp=e0cbb078723ad521496c53ff84a9cd29d9dd327a;p=github%2Fshaarli%2FShaarli.git replace unlicensed icons/images, add proper credits * fugue icons (http://p.yusukekamiyamane.com/) CC-BY-SA license * ornimental bookend (https://openclipart.org/detail/19869/ornimental-bookend---left-by-j4p4n) Public domain license * Paper_texture_v5_by_bashcorpo_w1000.jpg source found at http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 under Public Domain license * linecons (https://www.iconfinder.com/iconsets/linecons-free-vector-icons-pack) CC-BY license * add credits to COPYING, (get list of committers with git shortlog -sne, and previous contributors from the author's website) * Fixes https://github.com/shaarli/Shaarli/issues/10 * Fixes https://github.com/sebsauvage/Shaarli/issues/8 --- diff --git a/COPYING b/COPYING index d9731d27..0ba11e48 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,50 @@ -Shaarli is distributed under the zlib/libpng License: +Files: * +License: zlib/libpng +Copyright: (c) 2011-2014 Sébastien SAUVAGE + (c) 2011-2014 Alexandre Alapetite + (c) 2011-2014 David Sferruzza + (c) 2011-2014 Christophe HENRY + (c) 2011-2014 Mathieu Chabanon + (c) 2011-2014 BoboTiG + (c) 2011-2014 Bronco + (c) 2011-2014 Emilien Klein + (c) 2011-2014 Knah Tsaeb + (c) 2011-2014 Lionel Martin + (c) 2011-2014 lehollandaisvolant + (c) 2011-2014 timo van neerden + (c) 2011-2014 nodiscc + + + +Files: 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 +License: CC-BY (http://creativecommons.org/licenses/by/3.0/) +Copyright: (c) 2014 Yusuke Kamiyamane +Source: http://p.yusukekamiyamane.com/ + +Files: images/delete_icon.png +License: CC-BY (http://creativecommons.org/licenses/by/3.0/) +Copyright: (c) 2014 Designmodo +Source: http://designmodo.com/linecons-free/ + + +Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle2.png, images/squiggle_closing.png +Licence: Public Domain +Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg + + +Files: images/Paper_texture_v5_by_bashcorpo_w1000.jpg +Licence: Public Domain +Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 + +Files: images/logo.png +License: zlib/libpng +Copyright: (c) 2011-2014 idleman idleman@idleman.fr + + + +-------------------------------------------------------- +ZLIB/LIBPNG LICENSE -Copyright (c) 2011 Sébastien SAUVAGE (sebsauvage.net) This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from @@ -18,4 +62,4 @@ freely, subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. + 3. This notice may not be removed or altered from any source distribution. \ No newline at end of file diff --git a/images/calendar.png b/images/calendar.png index 65891385..81c74519 100644 Binary files a/images/calendar.png and b/images/calendar.png differ diff --git a/images/delete_icon.png b/images/delete_icon.png index 55e388b4..810b94d8 100644 Binary files a/images/delete_icon.png and b/images/delete_icon.png differ diff --git a/images/edit_icon.png b/images/edit_icon.png index 5cff5743..16c440c8 100644 Binary files a/images/edit_icon.png and b/images/edit_icon.png differ diff --git a/images/feed-icon-14x14.png b/images/feed-icon-14x14.png index b3c949d2..10161702 100644 Binary files a/images/feed-icon-14x14.png and b/images/feed-icon-14x14.png differ diff --git a/images/floral_left.png b/images/floral_left.png index 5a4ad89b..f09a861d 100644 Binary files a/images/floral_left.png and b/images/floral_left.png differ diff --git a/images/floral_right.png b/images/floral_right.png index cb7b201f..0dfb6112 100644 Binary files a/images/floral_right.png and b/images/floral_right.png differ diff --git a/images/private.png b/images/private.png index 5cea272a..1364b355 100644 Binary files a/images/private.png and b/images/private.png differ diff --git a/images/private_16x16.png b/images/private_16x16.png index d58c4823..8bb34d7d 100644 Binary files a/images/private_16x16.png and b/images/private_16x16.png differ diff --git a/images/private_16x16_active.png b/images/private_16x16_active.png index dd43baf2..af990d2c 100644 Binary files a/images/private_16x16_active.png and b/images/private_16x16_active.png differ diff --git a/images/qrcode.png b/images/qrcode.png index 99f25267..c2cfa476 100644 Binary files a/images/qrcode.png and b/images/qrcode.png differ diff --git a/images/squiggle.png b/images/squiggle.png index 9fd2129d..a6ce218c 100644 Binary files a/images/squiggle.png and b/images/squiggle.png differ diff --git a/images/squiggle2.png b/images/squiggle2.png index 23409ce3..c795f0a3 100644 Binary files a/images/squiggle2.png and b/images/squiggle2.png differ diff --git a/images/squiggle_closing.png b/images/squiggle_closing.png index 901fff5f..3f9d02b1 100644 Binary files a/images/squiggle_closing.png and b/images/squiggle_closing.png differ diff --git a/images/tag_blue.png b/images/tag_blue.png index 9757fc6e..7ec902fc 100644 Binary files a/images/tag_blue.png and b/images/tag_blue.png differ