aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--COPYING38
-rw-r--r--package.json2
2 files changed, 21 insertions, 19 deletions
diff --git a/COPYING b/COPYING
index 05202152..af139752 100644
--- a/COPYING
+++ b/COPYING
@@ -1,55 +1,57 @@
1Files: * 1Files: *
2License: zlib/libpng 2License: zlib/libpng
3Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net> 3Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
4 (c) 2011-2017 The Shaarli Community, see AUTHORS 4 (c) 2011-2018 The Shaarli Community, see AUTHORS
5 5
6Files: inc/reset.css 6Files: assets/vintage/css/reset.css
7License: BSD (http://opensource.org/licenses/BSD-3-Clause) 7License: BSD (http://opensource.org/licenses/BSD-3-Clause)
8Copyright: (c) 2010, Yahoo! Inc. 8Copyright: (c) 2010, Yahoo! Inc.
9 9
10Files: 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/tag_blue.png 10Files: assets/vintage/img/calendar.png
11 assets/vintage/img/edit_icon.png
12 assets/vintage/img/feed-icon-14x14.png
13 assets/vintage/img/private.png
14 assets/vintage/img/private_16x16.png
15 assets/vintage/img/private_16x16_active.png
16 assets/vintage/img/tag_blue.png
11License: CC-BY (http://creativecommons.org/licenses/by/3.0/) 17License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
12Copyright: (c) 2014 Yusuke Kamiyamane 18Copyright: (c) 2014 Yusuke Kamiyamane
13Source: http://p.yusukekamiyamane.com/ 19Source: http://p.yusukekamiyamane.com/
14 20
15Files: images/delete_icon.png 21Files: assets/vintage/img/delete_icon.png
16License: CC-BY (http://creativecommons.org/licenses/by/3.0/) 22License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
17Copyright: (c) 2014 Designmodo 23Copyright: (c) 2014 Designmodo
18Source: http://designmodo.com/linecons-free/ 24Source: http://designmodo.com/linecons-free/
19 25
20Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle_closing.png 26Files: assets/vintage/img/floral_left.png
27 assets/vintage/img/floral_right.png
28 assets/vintage/img/squiggle.png
29 assets/vintage/img/squiggle_closing.png
21Licence: Public Domain 30Licence: Public Domain
22Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg 31Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg
23 32
24Files: images/Paper_texture_v5_by_bashcorpo_w1000.jpg 33Files: assets/vintage/img/Paper_texture_v5_by_bashcorpo_w1000.jpg
25Licence: Public Domain 34Licence: Public Domain
26Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 35Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998
27 36
28Files: images/logo.png 37Files: assets/vintage/img/logo.png
38 assets/vintage/img/logo.png
29License: zlib/libpng 39License: zlib/libpng
30Copyright: (c) 2011-2014 idleman idleman@idleman.fr 40Copyright: (c) 2011-2014 idleman idleman@idleman.fr
31 41
32Files: inc/blazy*.js 42Files: assets/default/img/sad_star.png
33License: MIT License (http://opensource.org/licenses/MIT) 43License: MIT License (http://opensource.org/licenses/MIT)
34Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy 44Copyright: (C) 2015 kalvn - https://github.com/kalvn/Shaarli-Material
35 45
36Files: inc/rain.tpl.class.php 46Files: inc/rain.tpl.class.php
47License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt)
37Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com> 48Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com>
38 2011-2012, The Rain Team <hello@raintm.com> 49 2011-2012, The Rain Team <hello@raintm.com>
39License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt)
40
41Files: inc/awesomplete*
42License: MIT License (http://opensource.org/licenses/MIT)
43Copyright: (C) 2015 Lea Verou - https://github.com/LeaVerou/awesomplete
44 50
45Files: plugins/wallabag/wallabag.png 51Files: plugins/wallabag/wallabag.png
46License: MIT License (http://opensource.org/licenses/MIT) 52License: MIT License (http://opensource.org/licenses/MIT)
47Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag 53Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag
48 54
49Files: tpl/default/sad_star.png
50License: MIT License (http://opensource.org/licenses/MIT)
51Copyright: (C) 2015 kalvn - https://github.com/kalvn/Shaarli-Material
52
53---------------------------------------------------- 55----------------------------------------------------
54ZLIB/LIBPNG LICENSE 56ZLIB/LIBPNG LICENSE
55 57
diff --git a/package.json b/package.json
index 4e5775c4..ba997c9a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
2 "name": "shaarli", 2 "name": "shaarli",
3 "description": "Shaarli frontend", 3 "description": "Shaarli frontend",
4 "author": "The Shaarli Community", 4 "author": "The Shaarli Community",
5 "license": "Zlib", 5 "license": "SEE LICENSE IN COPYING",
6 "dependencies": { 6 "dependencies": {
7 "awesomplete": "^1.1.2", 7 "awesomplete": "^1.1.2",
8 "blazy": "^1.8.2", 8 "blazy": "^1.8.2",