From 9fb22af6b3b5d7dfd9ef3999c21df4d21be8504b Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Tue, 3 Apr 2018 23:33:20 +0200 Subject: Update EditorConfig for frontend resources Signed-off-by: VirtualTam --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index ae2dd4cc..8783e4cb 100644 --- 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] -- cgit v1.2.3 From e42031e037037cf2610ae05f9eabdb49abf167c8 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Tue, 3 Apr 2018 23:36:15 +0200 Subject: Update NPM frontend metadata Signed-off-by: VirtualTam --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index 4320eb88..4e5775c4 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,8 @@ { + "name": "shaarli", + "description": "Shaarli frontend", + "author": "The Shaarli Community", + "license": "Zlib", "dependencies": { "awesomplete": "^1.1.2", "blazy": "^1.8.2", -- cgit v1.2.3 From 7cf23badeb16b8e5081bef137e6c4da0ed54f0d0 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Wed, 4 Apr 2018 23:39:15 +0200 Subject: 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 --- COPYING | 38 ++++++++++++++++++++------------------ package.json | 2 +- 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 @@ Files: * License: zlib/libpng Copyright: (c) 2011-2015 Sébastien SAUVAGE - (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 2011-2012, The Rain Team -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/package.json b/package.json index 4e5775c4..ba997c9a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "shaarli", "description": "Shaarli frontend", "author": "The Shaarli Community", - "license": "Zlib", + "license": "SEE LICENSE IN COPYING", "dependencies": { "awesomplete": "^1.1.2", "blazy": "^1.8.2", -- cgit v1.2.3 From d66b5acb24af1049fb471bad0911939de97b91c5 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Thu, 5 Apr 2018 20:54:23 +0200 Subject: Update documentation and Doxygen icon location Signed-off-by: VirtualTam --- Doxyfile | 2 +- doc/md/Bookmarklet.md | 4 ++-- doc/md/images/edit_icon.png | Bin 0 -> 1548 bytes doc/md/images/logo.png | Bin 0 -> 5456 bytes images/edit_icon.png | Bin 1548 -> 0 bytes images/logo.png | Bin 5456 -> 0 bytes 6 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 doc/md/images/edit_icon.png create mode 100644 doc/md/images/logo.png delete mode 100644 images/edit_icon.png delete mode 100644 images/logo.png diff --git a/Doxyfile b/Doxyfile index 30f95564..a7f6e04f 100644 --- 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 c899e3cf..6c7f1c6a 100644 --- 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/doc/md/images/edit_icon.png b/doc/md/images/edit_icon.png new file mode 100644 index 00000000..16c440c8 Binary files /dev/null and b/doc/md/images/edit_icon.png differ diff --git a/doc/md/images/logo.png b/doc/md/images/logo.png new file mode 100644 index 00000000..f8b0c94f Binary files /dev/null and b/doc/md/images/logo.png differ diff --git a/images/edit_icon.png b/images/edit_icon.png deleted file mode 100644 index 16c440c8..00000000 Binary files a/images/edit_icon.png and /dev/null differ diff --git a/images/logo.png b/images/logo.png deleted file mode 100644 index f8b0c94f..00000000 Binary files a/images/logo.png and /dev/null differ -- cgit v1.2.3 From aec5a76b67a671f10db2bb3e81fa61ce16f72dd3 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Thu, 5 Apr 2018 20:54:55 +0200 Subject: Cleanup unused asset resources Signed-off-by: VirtualTam --- images/delete_icon.png | Bin 302 -> 0 bytes images/favicon.ico | Bin 76949 -> 0 bytes images/feed-icon-14x14.png | Bin 658 -> 0 bytes images/private_16x16.png | Bin 679 -> 0 bytes images/private_16x16_active.png | Bin 648 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/delete_icon.png delete mode 100644 images/favicon.ico delete mode 100644 images/feed-icon-14x14.png delete mode 100644 images/private_16x16.png delete mode 100644 images/private_16x16_active.png diff --git a/images/delete_icon.png b/images/delete_icon.png deleted file mode 100644 index 810b94d8..00000000 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 index c8b043b4..00000000 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 index 10161702..00000000 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 index 8bb34d7d..00000000 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 index af990d2c..00000000 Binary files a/images/private_16x16_active.png and /dev/null differ -- cgit v1.2.3