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 d9731d27d269136a484b8b0dbca9dafe812aa32c..0ba11e48a75e14c5cb82f2132d1405dba4954cde 100644 (file)
--- 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 <sebsauvage@sebsauvage.net>
+           (c) 2011-2014 Alexandre Alapetite <alexandre@alapetite.fr>
+           (c) 2011-2014 David Sferruzza <david.sferruzza@gmail.com>
+           (c) 2011-2014 Christophe HENRY <christophe.henry@sbgodin.fr>
+           (c) 2011-2014 Mathieu Chabanon <git@matchab.fr>
+           (c) 2011-2014 BoboTiG <bobotig@gmail.com>
+           (c) 2011-2014 Bronco <bronco@warriordudimanche.net>
+           (c) 2011-2014 Emilien Klein <emilien@klein.st>
+           (c) 2011-2014 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
+           (c) 2011-2014 Lionel Martin <renarddesmers@gmail.com>
+           (c) 2011-2014 lehollandaisvolant <levoltigeurhollandais@gmail.com>
+           (c) 2011-2014 timo van neerden <fire@lehollandaisvolant.net>
+           (c) 2011-2014 nodiscc <nodiscc@gmail.com>
+
+
+
+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
 
 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.
 
   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 658913852d60fc6ca8557568d26b8e93e7d56525..81c745197952cf7da2bf2db9822a0e62a3c600a1 100644 (file)
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 55e388b4ad0e8b65d52a4706493884c9b9324df0..810b94d829fbbce0514c635c08c0649504c0e57b 100644 (file)
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 5cff57433ffb4763a7ede6b6f115b59b9d185a39..16c440c86787658b3df8c005b0d27df9c8a6a6fe 100644 (file)
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 b3c949d2244f2c0c81d65e74719af2a1b56d06a3..101617027fda16e31aab926d6a5882d7d52c8481 100644 (file)
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 5a4ad89b5c467e7ec1ed9fa7bbc888954948e6f2..f09a861df4e5243c964b211de24cf06fabfcb3ba 100644 (file)
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 cb7b201fcb4182ea60f1dcec7ae9bab02757c1cd..0dfb6112965efa469668c5f4b2807d229d5e6c3b 100644 (file)
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 5cea272ae3b391f6c769e5b501368fabc813778a..1364b355f3f32832a0a6a02b026cf2ebb453f36f 100644 (file)
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 d58c4823cea04964a2125b71b625d87c4fa40ace..8bb34d7d8b6292854f6c2f3bc9a236102f6b2b36 100644 (file)
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 dd43baf2f888becd1452f8744c8825eb8f1405ac..af990d2cb8b599e507be610d248c16ac6b9293da 100644 (file)
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 99f252673f6393c12c102d635ed978ffa917246e..c2cfa4765abf4f837d36536299b9b0715acfea4d 100644 (file)
Binary files a/images/qrcode.png and b/images/qrcode.png differ

diff --git a/images/squiggle.png b/images/squiggle.png
index 9fd2129d01b8ffdb594f84f7c14f0274ab347af6..a6ce218c71972a1f48e1e7026a8764e2b2a49c9b 100644 (file)
Binary files a/images/squiggle.png and b/images/squiggle.png differ

diff --git a/images/squiggle2.png b/images/squiggle2.png
index 23409ce371784c6a8b7f83218f48103d1c34cc09..c795f0a393cd61f81329c1c2e654c23b235f76ca 100644 (file)
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 901fff5fe30748043714389a48527a688c3447b0..3f9d02b1729f2d5b9165c075750f78222549b508 100644 (file)
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 9757fc6ed6597438eb8e5a70a1ab2402cdebd5d1..7ec902fce2c9b38e78a08dfdc21a11f714eb8c9c 100644 (file)
Binary files a/images/tag_blue.png and b/images/tag_blue.png differ