Merge pull request #1121 from virtualtam/node/packaging-metadata
Update frontend metadata and COPYING
|
@ -10,7 +10,7 @@ trim_trailing_whitespace = true
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
|
|
||||||
[*.{htaccess,html,xml,js}]
|
[*.{htaccess,html,js,json,xml}]
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
||||||
[*.php]
|
[*.php]
|
||||||
|
|
38
COPYING
|
@ -1,55 +1,57 @@
|
||||||
Files: *
|
Files: *
|
||||||
License: zlib/libpng
|
License: zlib/libpng
|
||||||
Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
|
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)
|
License: BSD (http://opensource.org/licenses/BSD-3-Clause)
|
||||||
Copyright: (c) 2010, Yahoo! Inc.
|
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/)
|
License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
|
||||||
Copyright: (c) 2014 Yusuke Kamiyamane
|
Copyright: (c) 2014 Yusuke Kamiyamane
|
||||||
Source: http://p.yusukekamiyamane.com/
|
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/)
|
License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
|
||||||
Copyright: (c) 2014 Designmodo
|
Copyright: (c) 2014 Designmodo
|
||||||
Source: http://designmodo.com/linecons-free/
|
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
|
Licence: Public Domain
|
||||||
Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg
|
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
|
Licence: Public Domain
|
||||||
Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998
|
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
|
License: zlib/libpng
|
||||||
Copyright: (c) 2011-2014 idleman idleman@idleman.fr
|
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)
|
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
|
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>
|
Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com>
|
||||||
2011-2012, The Rain Team <hello@raintm.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
|
Files: plugins/wallabag/wallabag.png
|
||||||
License: MIT License (http://opensource.org/licenses/MIT)
|
License: MIT License (http://opensource.org/licenses/MIT)
|
||||||
Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag
|
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
|
ZLIB/LIBPNG LICENSE
|
||||||
|
|
||||||
|
|
2
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
|
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
|
||||||
# the logo to the output directory.
|
# 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
|
# 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
|
# into which the generated documentation will be written. If a relative path is
|
||||||
|
|
|
@ -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.
|
- When you are visiting a webpage you would like to share with Shaarli, click the _bookmarklet_ you just added.
|
||||||
- A window opens.
|
- A window opens.
|
||||||
- You can freely edit title, description, tags... to find it later using the text search or tag filtering.
|
- 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 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.
|
- 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.**
|
- Click `Save`.**Voilà! Your link is now shared.**
|
||||||
|
|
||||||
## Troubleshooting: The bookmarklet doesn't work with a few websites (e.g. Github.com)
|
## Troubleshooting: The bookmarklet doesn't work with a few websites (e.g. Github.com)
|
||||||
|
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 302 B |
Before Width: | Height: | Size: 75 KiB |
Before Width: | Height: | Size: 658 B |
Before Width: | Height: | Size: 679 B |
Before Width: | Height: | Size: 648 B |
|
@ -1,4 +1,8 @@
|
||||||
{
|
{
|
||||||
|
"name": "shaarli",
|
||||||
|
"description": "Shaarli frontend",
|
||||||
|
"author": "The Shaarli Community",
|
||||||
|
"license": "SEE LICENSE IN COPYING",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"awesomplete": "^1.1.2",
|
"awesomplete": "^1.1.2",
|
||||||
"blazy": "^1.8.2",
|
"blazy": "^1.8.2",
|
||||||
|
|