From 919c9803443d5b05623fb34e755c85e1e3c22d91 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 19 Oct 2017 18:06:07 +0200 Subject: [PATCH 01/14] documentation: update tag cloud/filtering doc Ref. https://github.com/shaarli/Shaarli/issues/959 --- doc/md/Browsing-and-searching.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/doc/md/Browsing-and-searching.md b/doc/md/Browsing-and-searching.md index 3570748..2448313 100644 --- a/doc/md/Browsing-and-searching.md +++ b/doc/md/Browsing-and-searching.md @@ -14,10 +14,24 @@ Use the `Filter by tags` field to restrict displayed links to entries tagged wit **Hidden tags:** Tags starting with a dot `.` (example `.secret`) are private. They can only be seen and searched when logged in. -Alternatively you can use the `Tag cloud` to discover all tags and click on any of them to display related links. +### Tag cloud -To search for links that are not tagged, enter `""` in the tag search field. +The `Tag cloud` page diplays a "cloud" view of all tags in your Shaarli. + + * More frequently used tags are displayed with a bigger font size. + * When sorting by `Most used` or `Alphabetical`, tags are displayed as a _list_, along with counters and edit/delete button for each tag. + * Clicking on any tag will display a list of all Shaares matching this tag. + * Clicking on the counter next to a tag `example` , will filter the tag cloud to only display tags found in Shaares tagged `example`. Repeat this any number of times to further filter the tag cloud. Click `List all links with those tags` to display Shaares matching your current tag filter. ## Filtering RSS feeds/Picture wall RSS feeds can also be restricted to only return items matching a text/tag search: see [RSS feeds](RSS feeds). + +## Filter buttons + +Filter buttons can be found at the top left of the link list. They allow you to apply different filters to the list: + + * **Private links:** When this toggle button is enabled, only shaares set to `private` will be shown. + * **Untagged links:** When the this toggle button is enabled (top left of the link list), only shaares _without any tags_ will be shown in the link list. + +Filter buttons are only available when logged in. From d0b8ffb9527feeea5a001ca9469e64a953375d63 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 9 Dec 2017 15:04:44 +0100 Subject: [PATCH 02/14] doc: note about firefox share compatibility --- doc/md/Firefox-share.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/md/Firefox-share.md b/doc/md/Firefox-share.md index 878884a..9a46b18 100644 --- a/doc/md/Firefox-share.md +++ b/doc/md/Firefox-share.md @@ -1,3 +1,6 @@ +| Note | Firefox Share is no longer available for Firefox 57 and later versions. | +|---------|---------| + ### Add Shaarli as a sharing service to Firefox - Open your Shaarli and `Login` From 288787917386d0f757bbdda66f5bee554951592e Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 9 Dec 2017 15:11:57 +0100 Subject: [PATCH 03/14] doc: add browser addons/shaarli-web-extension cleanup shaarliOs link shorten awesome-selfhosted entry --- doc/md/Community-&-Related-software.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/md/Community-&-Related-software.md b/doc/md/Community-&-Related-software.md index 2b7c659..3c55e93 100644 --- a/doc/md/Community-&-Related-software.md +++ b/doc/md/Community-&-Related-software.md @@ -48,10 +48,12 @@ See [Theming](Theming) for a list of community-contributed themes, and an instal ### Mobile Apps -- [ShaarliOS](https://github.com/mro/ShaarliOS) iOS share extension - see [#308](https://github.com/shaarli/Shaarli/issues/308#issuecomment-184592070) for some promo codes, +- [ShaarliOS](https://github.com/mro/ShaarliOS) - Apple iOS share extension. - [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider - [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli +### Browser addons + * [Shaarli Web Extension](https://github.com/ikipatang/shaarli-web-extension) - toolbar button to share your current tab with Shaarli. ### Server apps - [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content @@ -62,7 +64,5 @@ See [Theming](Theming) for a list of community-contributed themes, and an instal - [Self dead link](https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php) - Detect dead links on shaarli. This version use the database of shaarli. [Another version](https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php), can be used for other shaarli instances (but is more resource consuming). - [Bookmark Archiver](https://github.com/pirate/bookmark-archiver) - Save an archived copy of all websites starred using browser bookmarks/Shaarli/Delicious/Instapaper/Unmark.it/Pocket/Pinboard. Outputs browseable html. - ## Alternatives to Shaarli -See the [bookmarks & link sharing](https://github.com/Kickball/awesome-selfhosted/#bookmarks--link-sharing) -section on [awesome-selfhosted](https://github.com/Kickball/awesome-selfhosted/). +See [awesome-selfhosted: bookmarks & link sharing](https://github.com/Kickball/awesome-selfhosted/#bookmarks--link-sharing). From 4ada0d313a37f12ef407060d5774e9f623c4abbd Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 9 Dec 2017 15:20:14 +0100 Subject: [PATCH 04/14] move features.md info to index.md Ref https://github.com/shaarli/Shaarli/issues/598 --- doc/md/index.md | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/doc/md/index.md b/doc/md/index.md index 2b7d0f0..1ffe682 100644 --- a/doc/md/index.md +++ b/doc/md/index.md @@ -36,6 +36,23 @@ To learn more about user data and how to keep it across versions, please see [Up ## Features +Shaarli can be used: + +- to share, comment and save interesting links and news. +- to bookmark useful/frequent personal links (as private links) and share them between computers. +- as a minimal blog/microblog/writing platform (no character limit). +- as a read-it-later list (for example items tagged `readlater`). +- to draft and save articles/posts/ideas. +- to keep code snippets. +- to keep notes and documentation. +- as a shared clipboard/notepad/pastebin between machines. +- as a todo list. +- to store playlists (e.g. with the `music` or `video` tags). +- to keep extracts/comments from webpages that may disappear. +- to keep track of ongoing discussions (for example items tagged `discussion`). +- [to feed RSS aggregators](http://shaarli.chassegnouf.net/?9Efeiw) (planets) with specific tags. +- to feed other social networks, blogs... using RSS feeds and external services (dlvr.it, ifttt.com ...). + ### Interface - minimalist design (simple is beautiful) - FAST @@ -89,14 +106,12 @@ Easily extensible by any client using the REST API exposed by Shaarli. See the [API documentation](http://shaarli.github.io/api-documentation/). -### Other usages -Though Shaarli is primarily a bookmarking application, it can serve other purposes -(see [Features](Features)): - -- micro-blogging -- pastebin -- online notepad -- snippet archive +### Using Shaarli as a blog, notepad, pastebin... +- Go to your Shaarli setup and log in +- Click the `Add Link` button +- To share text only, do not enter any URL in the corresponding input field and click `Add Link` +- Pick a title and enter your article, or note, in the description field; add a few tags; optionally check `Private` then click `Save` +- Voilà! Your article is now published (privately if you selected that option) and accessible using its permalink. ## About ### Shaarli community fork From bd6de61c5291cd6e8d3d5ba36814bbaad7ae14b7 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 9 Dec 2017 15:21:10 +0100 Subject: [PATCH 05/14] remove Features.md entry in mkdocs.yml --- mkdocs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 8617ea4..59faf11 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -22,7 +22,6 @@ pages: - Reverse proxy configuration: docker/reverse-proxy-configuration.md - Docker resources: docker/resources.md - Usage: - - Features: Features.md - Bookmarklet: Bookmarklet.md - Browsing and searching: Browsing-and-searching.md - Firefox share: Firefox-share.md From 7a205fb21c698380afdf91dfacb83d6d918ce656 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 9 Dec 2017 15:28:34 +0100 Subject: [PATCH 06/14] doc: fix docker documentation link --- doc/md/Download-and-Installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md index e64d1a4..bbbfc26 100644 --- a/doc/md/Download-and-Installation.md +++ b/doc/md/Download-and-Installation.md @@ -15,7 +15,7 @@ Using one of the following methods: - by downloading full release archives including all dependencies - by downloading Github archives - by cloning the Git repository -- using Docker: [see the documentation](docker/shaarli-images) +- using Docker: [see the documentation](docker/shaarli-images.md) -------------------------------------------------------------------------------- From 32488257ee37bb484d054742f3630871a0083dbe Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 9 Dec 2017 15:31:45 +0100 Subject: [PATCH 07/14] move docker-101 reference from index.md to docker-images.md --- doc/md/docker/shaarli-images.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md index 1d19510..1769d7e 100644 --- a/doc/md/docker/shaarli-images.md +++ b/doc/md/docker/shaarli-images.md @@ -1,3 +1,6 @@ +A brief guide on getting starting using docker is given in [Docker 101](docker-101.md). +To learn more about user data and how to keep it across versions, please see [Upgrade and Migration](../Upgrade-and-migration.md). + ## Get and run a Shaarli image ### DockerHub repository From 60ca6354bd1fe4acace21029389f23fa95257526 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 9 Dec 2017 15:33:49 +0100 Subject: [PATCH 08/14] doc: move docker autobuild from index.md to shaarli-images.md --- doc/md/docker/shaarli-images.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md index 1769d7e..5491ee7 100644 --- a/doc/md/docker/shaarli-images.md +++ b/doc/md/docker/shaarli-images.md @@ -81,3 +81,14 @@ backstabbing_galileo $ docker ps -a CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES ``` + +### Automatic builds + +Docker users can start a personal instance from an [autobuild image](https://hub.docker.com/r/shaarli/shaarli/). For example to start a temporary Shaarli at ``localhost:8000``, and keep session data (config, storage): +``` +MY_SHAARLI_VOLUME=$(cd /path/to/shaarli/data/ && pwd -P) +docker run -ti --rm \ + -p 8000:80 \ + -v $MY_SHAARLI_VOLUME:/var/www/shaarli/data \ + shaarli/shaarli +``` From ebc7ec7c1cc858943427b74add6fc609f234c2bb Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 9 Dec 2017 15:34:06 +0100 Subject: [PATCH 09/14] doc: remove docker autobuild doc from index.md --- doc/md/index.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/doc/md/index.md b/doc/md/index.md index 1ffe682..e77b4d3 100644 --- a/doc/md/index.md +++ b/doc/md/index.md @@ -22,18 +22,6 @@ It runs the latest development version of Shaarli and is updated/reset daily. Login: `demo`; Password: `demo` -Docker users can start a personal instance from an [autobuild image](https://hub.docker.com/r/shaarli/shaarli/). For example to start a temporary Shaarli at ``localhost:8000``, and keep session data (config, storage): -``` -MY_SHAARLI_VOLUME=$(cd /path/to/shaarli/data/ && pwd -P) -docker run -ti --rm \ - -p 8000:80 \ - -v $MY_SHAARLI_VOLUME:/var/www/shaarli/data \ - shaarli/shaarli -``` - -A brief guide on getting starting using docker is given in [Docker 101](docker/docker-101). -To learn more about user data and how to keep it across versions, please see [Upgrade and Migration](Upgrade-and-migration) documentation. - ## Features Shaarli can be used: From f6f8b2563c36d360d0374cba7e60616693aed907 Mon Sep 17 00:00:00 2001 From: Neros Date: Sun, 17 Dec 2017 19:34:15 +0100 Subject: [PATCH 10/14] New plugin: Twemoji --- doc/md/Community-&-Related-software.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/md/Community-&-Related-software.md b/doc/md/Community-&-Related-software.md index 2b7c659..ad38ac9 100644 --- a/doc/md/Community-&-Related-software.md +++ b/doc/md/Community-&-Related-software.md @@ -29,6 +29,7 @@ See [REST API](REST-API) for a list of official and community clients. - [Code Coloration](https://github.com/ArthurHoaro/code-coloration) by [@ArthurHoaro](https://github.com/ArthurHoaro): client side code syntax highlighter. - [Disqus](https://github.com/kalvn/shaarli-plugin-disqus) by [@kalvn](https://github.com/kalvn): Adds Disqus comment system to your Shaarli. - [emojione](https://github.com/NerosTie/emojione) by [@NerosTie](https://github.com/NerosTie): Add colorful emojis to your Shaarli. +- [twemoji](https://github.com/NerosTie/twemoji) by [@NerosTie](https://github.com/NerosTie): Add colorful emojis to your Shaarli (Twemoji version) - [google analytics](https://github.com/ericjuden/Shaarli-Google-Analytics-Plugin) by [@ericjuden](http://github.com/ericjuden): Adds Google Analytics tracking support - [launch](https://github.com/ArthurHoaro/launch-plugin) - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli. - [related](https://github.com/ilesinge/shaarli-related) by [@ilesinge](https://github.com/ilesinge) - Show related links based on the number of identical tags. From 236a8e48b640140f8976c3ffb9b8d807fa6d726d Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 17 Dec 2017 23:40:52 +0100 Subject: [PATCH 11/14] minor fixes, ref #998 --- doc/md/Browsing-and-searching.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/md/Browsing-and-searching.md b/doc/md/Browsing-and-searching.md index f948bbe..16c6985 100644 --- a/doc/md/Browsing-and-searching.md +++ b/doc/md/Browsing-and-searching.md @@ -18,10 +18,10 @@ Use the `Filter by tags` field to restrict displayed links to entries tagged wit The `Tag cloud` page diplays a "cloud" view of all tags in your Shaarli. - * More frequently used tags are displayed with a bigger font size. - * When sorting by `Most used` or `Alphabetical`, tags are displayed as a _list_, along with counters and edit/delete button for each tag. + * The most frequently used tags are displayed with a bigger font size. + * When sorting by `Most used` or `Alphabetical`, tags are displayed as a _list_, along with counters and edit/delete buttons for each tag. * Clicking on any tag will display a list of all Shaares matching this tag. - * Clicking on the counter next to a tag `example` , will filter the tag cloud to only display tags found in Shaares tagged `example`. Repeat this any number of times to further filter the tag cloud. Click `List all links with those tags` to display Shaares matching your current tag filter. + * Clicking on the counter next to a tag `example`, will filter the tag cloud to only display tags found in Shaares tagged `example`. Repeat this any number of times to further filter the tag cloud. Click `List all links with those tags` to display Shaares matching your current tag filter. ## Filtering RSS feeds/Picture wall From ebee8d9372fb8c00db730524625570c4282ce60a Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 26 Dec 2017 18:39:27 +0100 Subject: [PATCH 12/14] Update Community-&-Related-software.md reorganize sections --- doc/md/Community-&-Related-software.md | 35 +++++++++++++------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/doc/md/Community-&-Related-software.md b/doc/md/Community-&-Related-software.md index 086af7c..a2c067e 100644 --- a/doc/md/Community-&-Related-software.md +++ b/doc/md/Community-&-Related-software.md @@ -1,23 +1,7 @@ _Unofficial but related work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork._ -## Community -- [Liens en vrac de sebsauvage](http://sebsauvage.net/links/) - the original Shaarli -- [A large list of Shaarlis](http://porneia.free.fr/pub/links/ou-est-shaarli.html) -- [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json) -- [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list) -- [Adieu Delicious, Diigo et StumbleUpon. Salut Shaarli ! - sebsauvage.net](http://sebsauvage.net/rhaa/index.php?2011/09/16/09/29/58-adieu-delicious-diigo-et-stumbleupon-salut-shaarli-) (fr) _16/09/2011 - the original post about Shaarli_ -- [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas) -- [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr) -- [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) -- [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni) - - -### Articles and social media discussions -- 2016-09-22 - Hacker News - https://news.ycombinator.com/item?id=12552176 -- 2015-08-15 - Reddit - [Question about migrating from WordPress to Shaarli.](https://www.reddit.com/r/selfhosted/comments/3h3zwh/question_about_migrating_from_wordpress_to_shaarli/) -- 2015-06-22 - Hacker News - https://news.ycombinator.com/item?id=9755366 -- 2015-05-12 - Reddit - [shaarli - Self hosted Bookmarking / Delicious (PHP, MySQL)](https://www.reddit.com/r/selfhosted/comments/35pkkc/shaarli_self_hosted_bookmarking_delicious_php/) +## Related software ### REST API clients @@ -67,3 +51,20 @@ See [Theming](Theming) for a list of community-contributed themes, and an instal ## Alternatives to Shaarli See [awesome-selfhosted: bookmarks & link sharing](https://github.com/Kickball/awesome-selfhosted/#bookmarks--link-sharing). + +## Community +- [Liens en vrac de sebsauvage](http://sebsauvage.net/links/) - the original Shaarli +- [A large list of Shaarlis](http://porneia.free.fr/pub/links/ou-est-shaarli.html) +- [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json) +- [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list) +- [Adieu Delicious, Diigo et StumbleUpon. Salut Shaarli ! - sebsauvage.net](http://sebsauvage.net/rhaa/index.php?2011/09/16/09/29/58-adieu-delicious-diigo-et-stumbleupon-salut-shaarli-) (fr) _16/09/2011 - the original post about Shaarli_ +- [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas) +- [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr) +- [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) +- [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni) + +### Articles and social media discussions +- 2016-09-22 - Hacker News - https://news.ycombinator.com/item?id=12552176 +- 2015-08-15 - Reddit - [Question about migrating from WordPress to Shaarli.](https://www.reddit.com/r/selfhosted/comments/3h3zwh/question_about_migrating_from_wordpress_to_shaarli/) +- 2015-06-22 - Hacker News - https://news.ycombinator.com/item?id=9755366 +- 2015-05-12 - Reddit - [shaarli - Self hosted Bookmarking / Delicious (PHP, MySQL)](https://www.reddit.com/r/selfhosted/comments/35pkkc/shaarli_self_hosted_bookmarking_delicious_php/) From 31cefb9ac144c7a62001a015f9d122076c94d5ec Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 26 Dec 2017 18:41:38 +0100 Subject: [PATCH 13/14] fix heading level --- doc/md/Community-&-Related-software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/md/Community-&-Related-software.md b/doc/md/Community-&-Related-software.md index a2c067e..f2271c7 100644 --- a/doc/md/Community-&-Related-software.md +++ b/doc/md/Community-&-Related-software.md @@ -26,7 +26,7 @@ See [REST API](REST-API) for a list of official and community clients. See [Theming](Theming) for a list of community-contributed themes, and an installation guide. -## Integration with other platforms +### Integration with other platforms - [tt-rss-shaarli](https://github.com/jcsaaddupuy/tt-rss-shaarli) - [Tiny-Tiny RSS](http://tt-rss.org/) plugin that adds support for sharing articles with Shaarli - [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - Octopress plugin to retrieve Shaarli links on the sidebar - [Scuttle to Shaarli](https://github.com/q2apro/scuttle-to-shaarli) - Import bookmarks from Scuttle From e2a2dc35c21de87a37778860e7f6a3a4d1c96412 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 26 Dec 2017 18:44:14 +0100 Subject: [PATCH 14/14] mkdocs.yml: move FAQ to top level, reorder, Move Community/related software to Usage --- mkdocs.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 59faf11..443c3a0 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -27,10 +27,10 @@ pages: - Firefox share: Firefox-share.md - RSS feeds: RSS-feeds.md - REST API: REST-API.md + - Community & Related software: Community-&-Related-software.md - How To: - Backup, restore, import and export: Backup,-restore,-import-and-export.md - Various hacks: Various-hacks.md -- Troubleshooting: Troubleshooting.md - Development: - Development guidelines: Development-guidelines.md - Continuous integration tools: Continuous-integration-tools.md @@ -46,6 +46,5 @@ pages: - Theming: Theming.md - Unit tests: Unit-tests.md - Unit tests inside Docker: Unit-tests-Docker.md -- About: - - FAQ: FAQ.md - - Community & Related software: Community-&-Related-software.md +- FAQ: FAQ.md +- Troubleshooting: Troubleshooting.md