Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | documentation: remove uneeded resources | VirtualTam | 2017-08-02 | 3 | -294/+0 | |
| | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/312 Relates to https://github.com/shaarli/Shaarli/pull/772 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
| * | | documentation: remove generated HTML from SCM | VirtualTam | 2017-08-02 | 66 | -19640/+3 | |
| | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/908 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
* | | | Merge pull request #887 from ArthurHoaro/hotfix/dash-tag-rename | ArthurHoaro | 2017-08-05 | 3 | -40/+106 | |
|\ \ \ | | | | | | | | | Make sure that the tag exists before altering/removing it | |||||
| * | | | Move tag renaming code to LinkDB and unit test it | ArthurHoaro | 2017-08-05 | 3 | -36/+102 | |
| | | | | ||||||
| * | | | Refactoring of CHANGETAG part to avoid duplicated code | ArthurHoaro | 2017-05-31 | 1 | -34/+27 | |
| | | | | ||||||
| * | | | Make sure that the tag exists before altering/removing it | ArthurHoaro | 2017-05-31 | 1 | -10/+17 | |
| | | | | | | | | | | | | | | | | Fixes #886 | |||||
* | | | | Merge pull request #889 from Lucas-C/master | VirtualTam | 2017-08-03 | 9 | -102/+111 | |
|\ \ \ \ | | | | | | | | | | | Using only one form in linklist.html - fix #885 | |||||
| * | | | | Using only one form in linklist.html + adding untaggedonly filter - fix #885 | Lucas Cimon | 2017-07-30 | 9 | -102/+111 | |
| | | | | | ||||||
* | | | | | Merge pull request #913 from virtualtam/fix/readme | VirtualTam | 2017-08-02 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | readme: fix logo uri | |||||
| * | | | | readme: fix logo uri | VirtualTam | 2017-08-02 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
* | | | | Merge pull request #911 from virtualtam/fix/release/composer | VirtualTam | 2017-08-02 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | fix: use pinned dependency revisions when generating release archives | |||||
| * | | | | fix: use pinned dependency revisions when generating release archives | VirtualTam | 2017-08-02 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
* | | | | Merge pull request #912 from virtualtam/travis/precise | VirtualTam | 2017-08-02 | 1 | -0/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | travis: explicitly set the build dist to `precise` | |||||
| * | | | travis: explicitly set the build dist to `precise` | VirtualTam | 2017-08-01 | 1 | -0/+1 | |
|/ / / | | | | | | | | | | | | | | | | See https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
* | | | Merge pull request #906 from virtualtam/docker/cleanup | VirtualTam | 2017-07-29 | 53 | -970/+463 | |
|\ \ \ | | | | | | | | | docker: remove `dev` image, update documentation | |||||
| * | | | Generate HTML documentation | VirtualTam | 2017-07-29 | 40 | -446/+459 | |
| | | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
| * | | | docker: remove `dev` image, update documentation | VirtualTam | 2017-07-29 | 13 | -524/+4 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/843 Changed: - Update Docker image list - Update Docker documentation structure Removed: - Delete Dockerfile and resources for the `dev` image - Cleanup `doc/` resources Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
* | | | Merge pull request #896 from ArthurHoaro/hotfix/firefox-social-subdir | VirtualTam | 2017-07-23 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Fix Firefox Social button in the default theme | |||||
| * | | | Fix Firefox Social button in the default theme | ArthurHoaro | 2017-06-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | is no longer required since the JS function is now in . Also, include the trailing slash in the post URL. Fixes #895 | |||||
* | | | | doc: fix bullet list formatting | nodiscc | 2017-07-20 | 1 | -0/+2 | |
| | | | | | | | | | | | | https://shaarli.readthedocs.io/en/master/Shaarli-configuration/ | |||||
* | | | | Merge pull request #901 from shaarli/fix-900 | nodiscc | 2017-07-19 | 1 | -11/+1 | |
|\ \ \ \ | | | | | | | | | | | Remove merge conflict leftover | |||||
| * | | | | Remove merge conflict leftover | nodiscc | 2017-07-11 | 1 | -11/+1 | |
| | | | | | | | | | | | | | | | Fixes #900 | |||||
* | | | | | Merge pull request #899 from smuth4/master | ArthurHoaro | 2017-07-13 | 2 | -1/+41 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Respect HTTP_X_FORWARDED_HOST | |||||
| * | | | | Add tests to cover new server_url behavior | Stephen Muth | 2017-07-12 | 1 | -0/+28 | |
| | | | | | ||||||
| * | | | | Respect HTTP_X_FORWARDED_HOST | Stephen Muth | 2017-07-08 | 1 | -1/+13 | |
|/ / / / | | | | | | | | | | | | | | | | | alongside _PORT and _PROTO Fixes #879 | |||||
* | | | | doc: contributing: remove leftover link to wiki | nodiscc | 2017-07-04 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #772 from nodiscc/rtfd | nodiscc | 2017-07-04 | 161 | -7647/+20558 | |
|\ \ \ \ | |_|/ / |/| | | | Generate HTML documentation using MkDocs | |||||
| * | | | makefile: remove [[link]] -> [link](url) conversion logic | nodiscc | 2017-07-04 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | all links in documentation have been converted to standard markdown link syntax | |||||
| * | | | make htmlpages | nodiscc | 2017-07-04 | 4 | -47/+236 | |
| | | | | ||||||
| * | | | makefile: remove obsolete 'doc' target | nodiscc | 2017-07-04 | 1 | -8/+2 | |
| | | | | | | | | | | | | | | | | official documentation can now be found in doc/md/ | |||||
| * | | | doc: release: update doc generation instructions | nodiscc | 2017-07-04 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | CONTRIBUTING.md: define new workflow for documentation edition and contributions | nodiscc | 2017-07-04 | 1 | -6/+2 | |
| | | | | ||||||
| * | | | doc: replace pandoc requirement with python3-venv | nodiscc | 2017-06-18 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | move README contents to doc/md/index.md | nodiscc | 2017-06-18 | 2 | -97/+111 | |
| | | | | ||||||
| * | | | make htmlpages | nodiscc | 2017-06-18 | 50 | -1854/+92 | |
| | | | | ||||||
| * | | | doc: rename "datastore hacks" -> "various hacks", move example scripts to ↵ | nodiscc | 2017-06-18 | 7 | -516/+10 | |
| | | | | | | | | | | | | | | | | gist.github.com, remove obsolete GH wiki _Sidebar.md | |||||
| * | | | Generate HTML documentation using MkDocs (WIP) | nodiscc | 2017-06-18 | 162 | -7136/+22127 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | Merge pull request #890 from Lucas-C/taglist-cloud_improvments | ArthurHoaro | 2017-06-11 | 3 | -3/+19 | |
|\ \ \ | |/ / |/| | | Tagcloud/list improvments | |||||
| * | | Tagcloud/list improvments | Lucas Cimon | 2017-06-09 | 3 | -3/+19 | |
|/ / | ||||||
* | | Merge pull request #894 from Lucas-C/bug893 | ArthurHoaro | 2017-06-07 | 1 | -2/+3 | |
|\ \ | |/ |/| | Fixing "Uncaught TypeError" in shaarli.js - fix #893 | |||||
| * | Fixing "Uncaught TypeError" in shaarli.js - fix #893 | Lucas Cimon | 2017-06-07 | 1 | -2/+3 | |
|/ | ||||||
* | Merge pull request #882 from ArthurHoaro/feature/edit-timestamp | ArthurHoaro | 2017-05-31 | 3 | -3/+16 | |
|\ | | | | | Add creation date when editing a link | |||||
| * | Add creation date when editing a link | ArthurHoaro | 2017-05-31 | 3 | -3/+16 | |
| | | | | | | | | | | | | Also, alter the title on edition Fixes #431 | |||||
* | | Merge pull request #880 from ArthurHoaro/hotfix/allowed-protocols | ArthurHoaro | 2017-05-31 | 8 | -16/+151 | |
|\ \ | | | | | | | Add a whitelist of protocols for URLs | |||||
| * | | Add a whitelist of protocols for URLs | ArthurHoaro | 2017-05-25 | 8 | -16/+151 | |
| | | | | | | | | | | | | | | | | | | | | | - for Shaare - for markdown description links and images Not whitelisted protocols will be replaced by `http://` | |||||
* | | | Merge pull request #884 from ArthurHoaro/hotfix/bookmarklet-url-limit | ArthurHoaro | 2017-05-31 | 1 | -2/+12 | |
|\ \ \ | | | | | | | | | Selection is now limited to 2k characters using bookmarklets | |||||
| * | | | Bookmarklet size limit: increase to 4500 chars and add an alert warning | ArthurHoaro | 2017-05-28 | 1 | -2/+12 | |
| | | | | ||||||
| * | | | Selection is now limited to 2k characters using bookmarklets | ArthurHoaro | 2017-05-25 | 1 | -2/+2 | |
| | |/ | |/| | | | | | | | | | | | | | to avoid having too large URL Fixes #528 | |||||
* | | | Merge pull request #883 from ArthurHoaro/template/visited-link | ArthurHoaro | 2017-05-28 | 1 | -2/+2 | |
|\ \ \ | |/ / |/| | | Display visited links in grey | |||||
| * | | Display visited links in grey | ArthurHoaro | 2017-05-25 | 1 | -2/+2 | |
|/ / | | | | | | | Fixes #244 |