diff options
author | nodiscc <nodiscc@gmail.com> | 2014-08-27 22:52:45 +0200 |
---|---|---|
committer | nodiscc <nodiscc@gmail.com> | 2014-08-28 00:09:48 +0200 |
commit | 509b080847323905c2bfac3c3e0732fb38755847 (patch) | |
tree | 7bfc54dd4bbaf726068fac16d6a0f9cb5922c64f | |
parent | e0cbb078723ad521496c53ff84a9cd29d9dd327a (diff) | |
download | Shaarli-509b080847323905c2bfac3c3e0732fb38755847.tar.gz Shaarli-509b080847323905c2bfac3c3e0732fb38755847.tar.zst Shaarli-509b080847323905c2bfac3c3e0732fb38755847.zip |
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
-rw-r--r-- | COPYING | 50 | ||||
-rw-r--r-- | images/calendar.png | bin | 675 -> 650 bytes | |||
-rw-r--r-- | images/delete_icon.png | bin | 150 -> 302 bytes | |||
-rw-r--r-- | images/edit_icon.png | bin | 394 -> 1548 bytes | |||
-rw-r--r-- | images/feed-icon-14x14.png | bin | 689 -> 658 bytes | |||
-rw-r--r-- | images/floral_left.png | bin | 2468 -> 1284 bytes | |||
-rw-r--r-- | images/floral_right.png | bin | 2447 -> 1309 bytes | |||
-rw-r--r-- | images/private.png | bin | 650 -> 2636 bytes | |||
-rw-r--r-- | images/private_16x16.png | bin | 439 -> 679 bytes | |||
-rw-r--r-- | images/private_16x16_active.png | bin | 475 -> 648 bytes | |||
-rw-r--r-- | images/qrcode.png | bin | 218 -> 321 bytes | |||
-rw-r--r-- | images/squiggle.png | bin | 950 -> 684 bytes | |||
-rw-r--r-- | images/squiggle2.png | bin | 898 -> 720 bytes | |||
-rw-r--r-- | images/squiggle_closing.png | bin | 2878 -> 1244 bytes | |||
-rw-r--r-- | images/tag_blue.png | bin | 586 -> 714 bytes |
15 files changed, 47 insertions, 3 deletions
@@ -1,6 +1,50 @@ | |||
1 | Shaarli is distributed under the zlib/libpng License: | 1 | Files: * |
2 | License: zlib/libpng | ||
3 | Copyright: (c) 2011-2014 SĂ©bastien SAUVAGE <sebsauvage@sebsauvage.net> | ||
4 | (c) 2011-2014 Alexandre Alapetite <alexandre@alapetite.fr> | ||
5 | (c) 2011-2014 David Sferruzza <david.sferruzza@gmail.com> | ||
6 | (c) 2011-2014 Christophe HENRY <christophe.henry@sbgodin.fr> | ||
7 | (c) 2011-2014 Mathieu Chabanon <git@matchab.fr> | ||
8 | (c) 2011-2014 BoboTiG <bobotig@gmail.com> | ||
9 | (c) 2011-2014 Bronco <bronco@warriordudimanche.net> | ||
10 | (c) 2011-2014 Emilien Klein <emilien@klein.st> | ||
11 | (c) 2011-2014 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org> | ||
12 | (c) 2011-2014 Lionel Martin <renarddesmers@gmail.com> | ||
13 | (c) 2011-2014 lehollandaisvolant <levoltigeurhollandais@gmail.com> | ||
14 | (c) 2011-2014 timo van neerden <fire@lehollandaisvolant.net> | ||
15 | (c) 2011-2014 nodiscc <nodiscc@gmail.com> | ||
16 | |||
17 | |||
18 | |||
19 | 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 | ||
20 | License: CC-BY (http://creativecommons.org/licenses/by/3.0/) | ||
21 | Copyright: (c) 2014 Yusuke Kamiyamane | ||
22 | Source: http://p.yusukekamiyamane.com/ | ||
23 | |||
24 | Files: images/delete_icon.png | ||
25 | License: CC-BY (http://creativecommons.org/licenses/by/3.0/) | ||
26 | Copyright: (c) 2014 Designmodo | ||
27 | Source: http://designmodo.com/linecons-free/ | ||
28 | |||
29 | |||
30 | Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle2.png, images/squiggle_closing.png | ||
31 | Licence: Public Domain | ||
32 | Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg | ||
33 | |||
34 | |||
35 | Files: images/Paper_texture_v5_by_bashcorpo_w1000.jpg | ||
36 | Licence: Public Domain | ||
37 | Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 | ||
38 | |||
39 | Files: images/logo.png | ||
40 | License: zlib/libpng | ||
41 | Copyright: (c) 2011-2014 idleman idleman@idleman.fr | ||
42 | |||
43 | |||
44 | |||
45 | -------------------------------------------------------- | ||
46 | ZLIB/LIBPNG LICENSE | ||
2 | 47 | ||
3 | Copyright (c) 2011 Sébastien SAUVAGE (sebsauvage.net) | ||
4 | 48 | ||
5 | This software is provided 'as-is', without any express or implied warranty. | 49 | This software is provided 'as-is', without any express or implied warranty. |
6 | In no event will the authors be held liable for any damages arising from | 50 | In no event will the authors be held liable for any damages arising from |
@@ -18,4 +62,4 @@ freely, subject to the following restrictions: | |||
18 | 2. Altered source versions must be plainly marked as such, and must | 62 | 2. Altered source versions must be plainly marked as such, and must |
19 | not be misrepresented as being the original software. | 63 | not be misrepresented as being the original software. |
20 | 64 | ||
21 | 3. This notice may not be removed or altered from any source distribution. | 65 | 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 --- a/images/calendar.png +++ b/images/calendar.png | |||
Binary files differ | |||
diff --git a/images/delete_icon.png b/images/delete_icon.png index 55e388b4..810b94d8 100644 --- a/images/delete_icon.png +++ b/images/delete_icon.png | |||
Binary files differ | |||
diff --git a/images/edit_icon.png b/images/edit_icon.png index 5cff5743..16c440c8 100644 --- a/images/edit_icon.png +++ b/images/edit_icon.png | |||
Binary files differ | |||
diff --git a/images/feed-icon-14x14.png b/images/feed-icon-14x14.png index b3c949d2..10161702 100644 --- a/images/feed-icon-14x14.png +++ b/images/feed-icon-14x14.png | |||
Binary files differ | |||
diff --git a/images/floral_left.png b/images/floral_left.png index 5a4ad89b..f09a861d 100644 --- a/images/floral_left.png +++ b/images/floral_left.png | |||
Binary files differ | |||
diff --git a/images/floral_right.png b/images/floral_right.png index cb7b201f..0dfb6112 100644 --- a/images/floral_right.png +++ b/images/floral_right.png | |||
Binary files differ | |||
diff --git a/images/private.png b/images/private.png index 5cea272a..1364b355 100644 --- a/images/private.png +++ b/images/private.png | |||
Binary files differ | |||
diff --git a/images/private_16x16.png b/images/private_16x16.png index d58c4823..8bb34d7d 100644 --- a/images/private_16x16.png +++ b/images/private_16x16.png | |||
Binary files differ | |||
diff --git a/images/private_16x16_active.png b/images/private_16x16_active.png index dd43baf2..af990d2c 100644 --- a/images/private_16x16_active.png +++ b/images/private_16x16_active.png | |||
Binary files differ | |||
diff --git a/images/qrcode.png b/images/qrcode.png index 99f25267..c2cfa476 100644 --- a/images/qrcode.png +++ b/images/qrcode.png | |||
Binary files differ | |||
diff --git a/images/squiggle.png b/images/squiggle.png index 9fd2129d..a6ce218c 100644 --- a/images/squiggle.png +++ b/images/squiggle.png | |||
Binary files differ | |||
diff --git a/images/squiggle2.png b/images/squiggle2.png index 23409ce3..c795f0a3 100644 --- a/images/squiggle2.png +++ b/images/squiggle2.png | |||
Binary files differ | |||
diff --git a/images/squiggle_closing.png b/images/squiggle_closing.png index 901fff5f..3f9d02b1 100644 --- a/images/squiggle_closing.png +++ b/images/squiggle_closing.png | |||
Binary files differ | |||
diff --git a/images/tag_blue.png b/images/tag_blue.png index 9757fc6e..7ec902fc 100644 --- a/images/tag_blue.png +++ b/images/tag_blue.png | |||
Binary files differ | |||