diff options
author | VirtualTam <virtualtam@flibidi.net> | 2018-04-04 23:39:15 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2018-04-05 20:30:00 +0200 |
commit | 7cf23badeb16b8e5081bef137e6c4da0ed54f0d0 (patch) | |
tree | 4f74a1a6e754cdde6775ca1b99721f24c92ce0ff | |
parent | e42031e037037cf2610ae05f9eabdb49abf167c8 (diff) | |
download | Shaarli-7cf23badeb16b8e5081bef137e6c4da0ed54f0d0.tar.gz Shaarli-7cf23badeb16b8e5081bef137e6c4da0ed54f0d0.tar.zst Shaarli-7cf23badeb16b8e5081bef137e6c4da0ed54f0d0.zip |
Update COPYING
Relates to https://github.com/shaarli/Shaarli/pull/1072
Changed:
- update paths to resource files (assets, images)
Removed:
- references to resources now resolved through NPM
- licenses corresponding to the aforementioned resources
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
-rw-r--r-- | COPYING | 38 | ||||
-rw-r--r-- | package.json | 2 |
2 files changed, 21 insertions, 19 deletions
@@ -1,55 +1,57 @@ | |||
1 | Files: * | 1 | Files: * |
2 | License: zlib/libpng | 2 | License: zlib/libpng |
3 | Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net> | 3 | Copyright: (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 | ||
6 | Files: inc/reset.css | 6 | Files: assets/vintage/css/reset.css |
7 | License: BSD (http://opensource.org/licenses/BSD-3-Clause) | 7 | License: BSD (http://opensource.org/licenses/BSD-3-Clause) |
8 | Copyright: (c) 2010, Yahoo! Inc. | 8 | Copyright: (c) 2010, Yahoo! Inc. |
9 | 9 | ||
10 | 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/tag_blue.png | 10 | Files: 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 | ||
11 | License: CC-BY (http://creativecommons.org/licenses/by/3.0/) | 17 | License: CC-BY (http://creativecommons.org/licenses/by/3.0/) |
12 | Copyright: (c) 2014 Yusuke Kamiyamane | 18 | Copyright: (c) 2014 Yusuke Kamiyamane |
13 | Source: http://p.yusukekamiyamane.com/ | 19 | Source: http://p.yusukekamiyamane.com/ |
14 | 20 | ||
15 | Files: images/delete_icon.png | 21 | Files: assets/vintage/img/delete_icon.png |
16 | License: CC-BY (http://creativecommons.org/licenses/by/3.0/) | 22 | License: CC-BY (http://creativecommons.org/licenses/by/3.0/) |
17 | Copyright: (c) 2014 Designmodo | 23 | Copyright: (c) 2014 Designmodo |
18 | Source: http://designmodo.com/linecons-free/ | 24 | Source: http://designmodo.com/linecons-free/ |
19 | 25 | ||
20 | Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle_closing.png | 26 | Files: 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 | ||
21 | Licence: Public Domain | 30 | Licence: Public Domain |
22 | Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg | 31 | Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg |
23 | 32 | ||
24 | Files: images/Paper_texture_v5_by_bashcorpo_w1000.jpg | 33 | Files: assets/vintage/img/Paper_texture_v5_by_bashcorpo_w1000.jpg |
25 | Licence: Public Domain | 34 | Licence: Public Domain |
26 | Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 | 35 | Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 |
27 | 36 | ||
28 | Files: images/logo.png | 37 | Files: assets/vintage/img/logo.png |
38 | assets/vintage/img/logo.png | ||
29 | License: zlib/libpng | 39 | License: zlib/libpng |
30 | Copyright: (c) 2011-2014 idleman idleman@idleman.fr | 40 | Copyright: (c) 2011-2014 idleman idleman@idleman.fr |
31 | 41 | ||
32 | Files: inc/blazy*.js | 42 | Files: assets/default/img/sad_star.png |
33 | License: MIT License (http://opensource.org/licenses/MIT) | 43 | License: MIT License (http://opensource.org/licenses/MIT) |
34 | Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy | 44 | Copyright: (C) 2015 kalvn - https://github.com/kalvn/Shaarli-Material |
35 | 45 | ||
36 | Files: inc/rain.tpl.class.php | 46 | Files: inc/rain.tpl.class.php |
47 | License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt) | ||
37 | Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com> | 48 | Copyright: 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> |
39 | License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt) | ||
40 | |||
41 | Files: inc/awesomplete* | ||
42 | License: MIT License (http://opensource.org/licenses/MIT) | ||
43 | Copyright: (C) 2015 Lea Verou - https://github.com/LeaVerou/awesomplete | ||
44 | 50 | ||
45 | Files: plugins/wallabag/wallabag.png | 51 | Files: plugins/wallabag/wallabag.png |
46 | License: MIT License (http://opensource.org/licenses/MIT) | 52 | License: MIT License (http://opensource.org/licenses/MIT) |
47 | Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag | 53 | Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag |
48 | 54 | ||
49 | Files: tpl/default/sad_star.png | ||
50 | License: MIT License (http://opensource.org/licenses/MIT) | ||
51 | Copyright: (C) 2015 kalvn - https://github.com/kalvn/Shaarli-Material | ||
52 | |||
53 | ---------------------------------------------------- | 55 | ---------------------------------------------------- |
54 | ZLIB/LIBPNG LICENSE | 56 | ZLIB/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", |