Merge pull request #1121 from virtualtam/node/packaging-metadata

Update frontend metadata and COPYING

diff --git a/.editorconfig b/.editorconfig
index ae2dd4cc49070d9c43565773ae996ef9f506ac77..8783e4cb00700f39d9927e2b8c026d5f8b2a679d 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.{htaccess,html,xml,js}]
+[*.{htaccess,html,js,json,xml}]
 indent_size = 2
 
 [*.php]

diff --git a/COPYING b/COPYING
index 0520215247e0c49e9d0e9e0dfcb17b227240a6c5..af139752c96fe1050106f639469cdb2ee2684d14 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,55 +1,57 @@
 Files: *
 License: zlib/libpng
 Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
-           (c) 2011-2017 The Shaarli Community, see AUTHORS
+           (c) 2011-2018 The Shaarli Community, see AUTHORS
 
-Files: inc/reset.css
+Files: assets/vintage/css/reset.css
 License: BSD (http://opensource.org/licenses/BSD-3-Clause)
 Copyright: (c) 2010, Yahoo! Inc.
 
-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
+Files: assets/vintage/img/calendar.png
+       assets/vintage/img/edit_icon.png
+       assets/vintage/img/feed-icon-14x14.png
+       assets/vintage/img/private.png
+       assets/vintage/img/private_16x16.png
+       assets/vintage/img/private_16x16_active.png
+       assets/vintage/img/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
+Files: assets/vintage/img/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/squiggle_closing.png
+Files: assets/vintage/img/floral_left.png
+       assets/vintage/img/floral_right.png
+       assets/vintage/img/squiggle.png
+       assets/vintage/img/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
+Files: assets/vintage/img/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
+Files: assets/vintage/img/logo.png
+       assets/vintage/img/logo.png
 License: zlib/libpng
 Copyright: (c) 2011-2014 idleman idleman@idleman.fr
 
-Files: inc/blazy*.js
+Files: assets/default/img/sad_star.png
 License: MIT License (http://opensource.org/licenses/MIT)
-Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy
+Copyright: (C) 2015 kalvn - https://github.com/kalvn/Shaarli-Material
 
 Files: inc/rain.tpl.class.php
+License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt)
 Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com>
            2011-2012, The Rain Team <hello@raintm.com>
-License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt)
-
-Files: inc/awesomplete*
-License: MIT License (http://opensource.org/licenses/MIT)
-Copyright: (C) 2015 Lea Verou - https://github.com/LeaVerou/awesomplete
 
 Files: plugins/wallabag/wallabag.png
 License: MIT License (http://opensource.org/licenses/MIT)
 Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag
 
-Files: tpl/default/sad_star.png
-License: MIT License (http://opensource.org/licenses/MIT)
-Copyright: (C) 2015 kalvn - https://github.com/kalvn/Shaarli-Material
-
 ----------------------------------------------------
 ZLIB/LIBPNG LICENSE
 

diff --git a/Doxyfile b/Doxyfile
index 30f9556428457678228b9bde10a53e89cce6806e..a7f6e04f9698ce7538a477aea3d52a23d698b6e4 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "The personal, minimalist, super-fast, no-database deli
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           = images/logo.png
+PROJECT_LOGO           = doc/md/images/logo.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is

diff --git a/doc/md/Bookmarklet.md b/doc/md/Bookmarklet.md
index c899e3cf6a8fc41c340a119d2b361774b1b8531a..6c7f1c6ac0b0911f5047b3b63da00283892c12c1 100644 (file)
--- a/doc/md/Bookmarklet.md
+++ b/doc/md/Bookmarklet.md
@@ -13,8 +13,8 @@ _This bookmarklet button is compatible with Firefox, Opera, Chrome and Safari. U
 - When you are visiting a webpage you would like to share with Shaarli, click the _bookmarklet_ you just added.
 - A window opens.
     - You can freely edit title, description, tags... to find it later using the text search or tag filtering.
-    - You will be able to edit this link later using the ![](https://raw.githubusercontent.com/shaarli/Shaarli/master/images/edit_icon.png) edit button.
-    - You can also check the “Private” box so that the link is saved but only visible to you. 
+    - You will be able to edit this link later using the ![](images/edit_icon.png) edit button.
+    - You can also check the “Private” box so that the link is saved but only visible to you.
 - Click `Save`.**Voilà! Your link is now shared.**
 
 ## Troubleshooting: The bookmarklet doesn't work with a few websites (e.g. Github.com)

diff --git a/images/edit_icon.png b/doc/md/images/edit_icon.png
similarity index 100%
rename from images/edit_icon.png
rename to doc/md/images/edit_icon.png

diff --git a/images/logo.png b/doc/md/images/logo.png
similarity index 100%
rename from images/logo.png
rename to doc/md/images/logo.png

diff --git a/images/delete_icon.png b/images/delete_icon.png
deleted file mode 100644 (file)
index 810b94d..0000000
Binary files a/images/delete_icon.png and /dev/null differ

diff --git a/images/favicon.ico b/images/favicon.ico
deleted file mode 100644 (file)
index c8b043b..0000000
Binary files a/images/favicon.ico and /dev/null differ

diff --git a/images/feed-icon-14x14.png b/images/feed-icon-14x14.png
deleted file mode 100644 (file)
index 1016170..0000000
Binary files a/images/feed-icon-14x14.png and /dev/null differ

diff --git a/images/private_16x16.png b/images/private_16x16.png
deleted file mode 100644 (file)
index 8bb34d7..0000000
Binary files a/images/private_16x16.png and /dev/null differ

diff --git a/images/private_16x16_active.png b/images/private_16x16_active.png
deleted file mode 100644 (file)
index af990d2..0000000
Binary files a/images/private_16x16_active.png and /dev/null differ

diff --git a/package.json b/package.json
index 4320eb88a028794beb4889e9f28b2466861d5da3..ba997c9ae5d8356602172fe4f25c99a7d22cce54 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,4 +1,8 @@
 {
+  "name": "shaarli",
+  "description": "Shaarli frontend",
+  "author": "The Shaarli Community",
+  "license": "SEE LICENSE IN COPYING",
   "dependencies": {
     "awesomplete": "^1.1.2",
     "blazy": "^1.8.2",