Commit Graph

1065 Commits

Author SHA1 Message Date
nodiscc 96f70777f7 Merge pull request #901 from shaarli/fix-900
Remove merge conflict leftover
2017-07-19 18:54:00 +02:00
ArthurHoaro 2fee2f425d Merge pull request #899 from smuth4/master
Respect HTTP_X_FORWARDED_HOST
2017-07-13 14:15:06 +02:00
Stephen Muth 0b51ea7251 Add tests to cover new server_url behavior 2017-07-12 17:57:47 +00:00
nodiscc a5fbc689f8 Remove merge conflict leftover
Fixes #900
2017-07-11 14:30:14 +02:00
Stephen Muth b80315e238 Respect HTTP_X_FORWARDED_HOST
alongside _PORT and _PROTO
Fixes #879
2017-07-08 00:01:03 +00:00
nodiscc 70cb883547 doc: contributing: remove leftover link to wiki 2017-07-04 21:43:40 +02:00
nodiscc 5b25a9635f Merge pull request #772 from nodiscc/rtfd
Generate HTML documentation using MkDocs
2017-07-04 21:37:30 +02:00
nodiscc 8bf94136e1 makefile: remove [[link]] -> [link](url) conversion logic
all links in documentation have been converted to standard markdown link syntax
2017-07-04 21:30:50 +02:00
nodiscc 366247c84c make htmlpages 2017-07-04 21:30:31 +02:00
nodiscc f47aa40c12 makefile: remove obsolete 'doc' target
official documentation can now be found in doc/md/
2017-07-04 21:26:27 +02:00
nodiscc 2f9c1ecf88 doc: release: update doc generation instructions 2017-07-04 21:26:01 +02:00
nodiscc a6192bdd52 CONTRIBUTING.md: define new workflow for documentation edition and contributions 2017-07-04 21:24:44 +02:00
nodiscc 081a73486f doc: replace pandoc requirement with python3-venv 2017-06-18 22:22:34 +02:00
nodiscc 12e1877917 move README contents to doc/md/index.md 2017-06-18 22:15:50 +02:00
nodiscc 0433c688b9 make htmlpages 2017-06-18 06:32:30 +02:00
nodiscc 460ce50115 doc: rename "datastore hacks" -> "various hacks", move example scripts to gist.github.com, remove obsolete GH wiki _Sidebar.md 2017-06-18 06:29:15 +02:00
nodiscc 53ed6d7d1e Generate HTML documentation using MkDocs (WIP)
MkDocs is a static site generator geared towards building project documentation.
Documentation source files are written in Markdown, and configured with a single YAML file.

 * http://www.mkdocs.org/
 * http://www.mkdocs.org/user-guide/configuration/

Ref. #312

* remove pandoc-generated HTML documentation
* move markdown doc to doc/md/,
* mkdocs.yml:
  * generate HTML doc in doc/html
  * add pages TOC/ordering
  * use index.md as index page
* Makefile: remove execute permissions from generated files
* Makefile: rewrite htmlpages GFM to markdown conversion using sed:
   awk expression aslo matched '][' which causes invalid output on complex links with images or code blocks
* Add mkdocs.yml to .gitattributes, exclude this file from release archives
* Makefile: rename: htmldoc -> doc_html target
* run make doc: pull latest markdown documentation from wiki
* run make htmlpages: update html documentation
2017-06-18 00:19:49 +02:00
ArthurHoaro d5d22a6d07 Merge pull request #890 from Lucas-C/taglist-cloud_improvments
Tagcloud/list improvments
2017-06-11 14:14:59 +02:00
ArthurHoaro 8eb6bac137 Fix Firefox Social button in the default theme
is no longer required since the JS function is now in .
Also, include the trailing slash in the post URL.

Fixes #895
2017-06-11 14:09:42 +02:00
Lucas Cimon 49cc8e5d74 Tagcloud/list improvments 2017-06-09 10:58:12 +02:00
ArthurHoaro 88535f20a9 Merge pull request #894 from Lucas-C/bug893
Fixing "Uncaught TypeError" in shaarli.js - fix #893
2017-06-07 22:37:01 +02:00
Lucas Cimon 9bf82f4fa1 Fixing "Uncaught TypeError" in shaarli.js - fix #893 2017-06-07 16:10:24 +02:00
ArthurHoaro d99aef535f Refactoring of CHANGETAG part to avoid duplicated code 2017-05-31 18:36:35 +02:00
ArthurHoaro 4c970f099f Make sure that the tag exists before altering/removing it
Fixes #886
2017-05-31 18:24:21 +02:00
ArthurHoaro 5c6fac0bfc Merge pull request #882 from ArthurHoaro/feature/edit-timestamp
Add creation date when editing a link
2017-05-31 17:54:46 +02:00
ArthurHoaro ac94db1e36 Merge pull request #880 from ArthurHoaro/hotfix/allowed-protocols
Add a whitelist of protocols for URLs
2017-05-31 17:52:19 +02:00
ArthurHoaro 807cade64c Add creation date when editing a link
Also, alter the title on edition

Fixes #431
2017-05-31 17:50:11 +02:00
ArthurHoaro 268309df5d Merge pull request #884 from ArthurHoaro/hotfix/bookmarklet-url-limit
Selection is now limited to 2k characters using bookmarklets
2017-05-31 17:44:19 +02:00
ArthurHoaro 96b12e55f0 Merge pull request #883 from ArthurHoaro/template/visited-link
Display visited links in grey
2017-05-28 13:17:20 +02:00
ArthurHoaro e2bcb9d915 Bookmarklet size limit: increase to 4500 chars and add an alert warning 2017-05-28 13:13:31 +02:00
ArthurHoaro d6aec9e60b Selection is now limited to 2k characters using bookmarklets
to avoid having too large URL

Fixes #528
2017-05-25 16:45:08 +02:00
ArthurHoaro acadb0801f Display visited links in grey
Fixes #244
2017-05-25 16:30:37 +02:00
ArthurHoaro 3e395a6bc6 Merge pull request #841 from ArthurHoaro/feature/search-no-tag
Empty tag search will look for not tagged links
2017-05-25 15:54:20 +02:00
ArthurHoaro b2e2aa42e2 Merge pull request #881 from ArthurHoaro/feature/note-bookmarklet
Add Note bookmarklet #580
2017-05-25 15:51:48 +02:00
ArthurHoaro 7d86f40bdb Empty tag search will look for not tagged links
Fixes #784

From now, searching for tags with an empty value will return only not tagged links,
with the search bar showing `x results [not tagged]`.

Note that using the api, the searchtags request parameter must be set to `false` to get the same result.

  - [ ] Update API doc
2017-05-25 15:51:12 +02:00
philipp-r bb8cf6d362 Add Note bookmarklet #580 2017-05-25 15:34:26 +02:00
ArthurHoaro 81a91579ba Merge pull request #835 from ArthurHoaro/feature/tag-cloud
Adds a taglist view with edit/delete buttons
2017-05-25 15:28:26 +02:00
ArthurHoaro 82e3bb5f06 Tag list: use awesomplete for tag auto completion 2017-05-25 15:25:04 +02:00
ArthurHoaro aa4797ba36 Adds a taglist view with edit/delete buttons
* The tag list can be sort alphabetically or by most used tag
  * Edit/Delete are perform using AJAX, or fallback to 'do=changetag' page
  * New features aren't backported to vintage theme
2017-05-25 15:25:04 +02:00
ArthurHoaro bc988eb042 Add a token available everywhere 2017-05-25 15:05:24 +02:00
ArthurHoaro 5893529cf4 Move tagcloud template file to tag.cloud 2017-05-25 15:05:24 +02:00
ArthurHoaro 986a521067 Add an endpoint to refresh the token
Useful for AJAX requests which burns the token
2017-05-25 15:05:23 +02:00
ArthurHoaro 8b27824338 Merge pull request #819 from ArthurHoaro/feature/multi-delete
Bulk deletion
2017-05-25 15:03:32 +02:00
ArthurHoaro 86ceea054f Add a whitelist of protocols for URLs
- for Shaare
 - for markdown description links and images

Not whitelisted protocols will be replaced by `http://`
2017-05-25 14:58:34 +02:00
ArthurHoaro 7481dd6e66 Merge pull request #878 from Lucas-C/master
Adding the ability to display subtags in the tagcloud
2017-05-25 13:39:31 +02:00
Lucas Cimon 6ccd0b218f Adding ability to display subtags in tagcloud 2017-05-24 13:09:35 +02:00
ArthurHoaro 61c15aa555 Merge pull request #868 from ArthurHoaro/theme/default-as-default
Use the new 'default' theme... as default
2017-05-10 18:25:56 +02:00
ArthurHoaro 3aa7aa0ef0 Merge pull request #869 from ArthurHoaro/cleanup/psh-dead-code
PubSubHub: remove dead code
2017-05-10 18:25:41 +02:00
ArthurHoaro 6b32719faf Merge pull request #870 from kalvn/fixusercss
Fixes file existence check for user.css
2017-05-09 19:33:11 +02:00
kalvn 105fb7a2a0 Fixes file existence check for user.css 2017-05-09 19:09:33 +02:00