aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Remove the 2nd green 'sort by' row in link listArthurHoaro2017-08-191-2/+0
| | | | It isn't really useful and doesn't look good if there isn't enough tags
* Merge pull request #920 from virtualtam/documentation/rest-3rdVirtualTam2017-08-082-18/+30
|\ | | | | documentation: update 3rd-party resources
| * documentation: update 3rd-party resourcesVirtualTam2017-08-082-18/+30
|/ | | | | | Relates to https://github.com/shaarli/Shaarli/issues/915 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #918 from Lucas-C/masterVirtualTam2017-08-071-1/+1
|\ | | | | Adding missing empty() as spotted in #889 code review
| * Adding missing empty() as spotted in #889 code reviewLucas Cimon2017-08-061-1/+1
|/
* Merge pull request #917 from virtualtam/documentation/fixes+improvementsVirtualTam2017-08-0630-378/+445
|\ | | | | Documentation fixes, improvements and additions
| * documentation: elaborate on REST API server & client prerequisitesVirtualTam2017-08-052-4/+19
| | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/903 Relates to https://github.com/shaarli/Shaarli/issues/905 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: remove obsolete doc release instructionsVirtualTam2017-08-051-20/+1
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: add links to example REST API clientsVirtualTam2017-08-051-1/+14
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: rewrite the REST API PHP client exampleVirtualTam2017-08-051-20/+37
| | | | | | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/905 Relates to https://github.com/shaarli/Shaarli/pull/751 See https://shaarli.github.io/api-documentation/ Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: update release download and usage informationVirtualTam2017-08-052-6/+4
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: remove duplicate "Coding guidelines" pageVirtualTam2017-08-052-7/+0
| | | | | | | | | | | | The information is already present under "Static analysis" Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: fix rendering and internal referencesVirtualTam2017-08-0529-323/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mainly cleanup after switching from Github-flavoured Markdown rendered by Github Pages, to standard Markdown rendered by MkDocs. Changed: - rephrase some section titles Fixed: - list rendering (items, sub-items)) - code rendering - quotes - dead links Removed: - extraneous navigational elements Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #916 from ArthurHoaro/hotfix/fix-composer-php-versionArthurHoaro2017-08-052-94/+119
|\ \ | |/ |/| Fix PHP version configuration in composer.json
| * Fix PHP version configuration in composer.jsonArthurHoaro2017-08-052-94/+119
| | | | | | | | | | Without this setting, composer would download dependencies depending on the PHP version installed on the system. E.G. I was getting doctrine/instantiator 1.1, which requires at least PHP 7.1.
* | Merge pull request #910 from virtualtam/documentation/improvementsVirtualTam2017-08-0571-19938/+10
|\ \ | | | | | | Include generated doc in release archives, remove HTML from SCM
| * | documentation: include generated HTML in release archivesVirtualTam2017-08-021-4/+6
| | | | | | | | | | | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/908 Relates to https://github.com/shaarli/Shaarli/pull/772 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | documentation: set edit_uriVirtualTam2017-08-021-0/+1
| | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | documentation: remove uneeded resourcesVirtualTam2017-08-023-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 SCMVirtualTam2017-08-0266-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-renameArthurHoaro2017-08-053-40/+106
|\ \ \ | | | | | | | | Make sure that the tag exists before altering/removing it
| * | | Move tag renaming code to LinkDB and unit test itArthurHoaro2017-08-053-36/+102
| | | |
| * | | Refactoring of CHANGETAG part to avoid duplicated codeArthurHoaro2017-05-311-34/+27
| | | |
| * | | Make sure that the tag exists before altering/removing itArthurHoaro2017-05-311-10/+17
| | | | | | | | | | | | | | | | Fixes #886
* | | | Merge pull request #889 from Lucas-C/masterVirtualTam2017-08-039-102/+111
|\ \ \ \ | | | | | | | | | | Using only one form in linklist.html - fix #885
| * | | | Using only one form in linklist.html + adding untaggedonly filter - fix #885Lucas Cimon2017-07-309-102/+111
| | | | |
* | | | | Merge pull request #913 from virtualtam/fix/readmeVirtualTam2017-08-021-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | readme: fix logo uri
| * | | | readme: fix logo uriVirtualTam2017-08-021-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | | Merge pull request #911 from virtualtam/fix/release/composerVirtualTam2017-08-021-1/+1
|\ \ \ \ | | | | | | | | | | fix: use pinned dependency revisions when generating release archives
| * | | | fix: use pinned dependency revisions when generating release archivesVirtualTam2017-08-021-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | | Merge pull request #912 from virtualtam/travis/preciseVirtualTam2017-08-021-0/+1
|\ \ \ \ | |_|_|/ |/| | | travis: explicitly set the build dist to `precise`
| * | | travis: explicitly set the build dist to `precise`VirtualTam2017-08-011-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/cleanupVirtualTam2017-07-2953-970/+463
|\ \ \ | | | | | | | | docker: remove `dev` image, update documentation
| * | | Generate HTML documentationVirtualTam2017-07-2940-446/+459
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | docker: remove `dev` image, update documentationVirtualTam2017-07-2913-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-subdirVirtualTam2017-07-231-2/+2
|\ \ \ | | | | | | | | Fix Firefox Social button in the default theme
| * | | Fix Firefox Social button in the default themeArthurHoaro2017-06-111-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 formattingnodiscc2017-07-201-0/+2
| | | | | | | | | | | | https://shaarli.readthedocs.io/en/master/Shaarli-configuration/
* | | | Merge pull request #901 from shaarli/fix-900nodiscc2017-07-191-11/+1
|\ \ \ \ | | | | | | | | | | Remove merge conflict leftover
| * | | | Remove merge conflict leftovernodiscc2017-07-111-11/+1
| | | | | | | | | | | | | | | Fixes #900
* | | | | Merge pull request #899 from smuth4/masterArthurHoaro2017-07-132-1/+41
|\ \ \ \ \ | |/ / / / |/| | | | Respect HTTP_X_FORWARDED_HOST
| * | | | Add tests to cover new server_url behaviorStephen Muth2017-07-121-0/+28
| | | | |
| * | | | Respect HTTP_X_FORWARDED_HOSTStephen Muth2017-07-081-1/+13
|/ / / / | | | | | | | | | | | | | | | | alongside _PORT and _PROTO Fixes #879
* | | | doc: contributing: remove leftover link to wikinodiscc2017-07-041-1/+1
| | | |
* | | | Merge pull request #772 from nodiscc/rtfdnodiscc2017-07-04161-7647/+20558
|\ \ \ \ | |_|/ / |/| | | Generate HTML documentation using MkDocs
| * | | makefile: remove [[link]] -> [link](url) conversion logicnodiscc2017-07-041-6/+0
| | | | | | | | | | | | | | | | all links in documentation have been converted to standard markdown link syntax
| * | | make htmlpagesnodiscc2017-07-044-47/+236
| | | |
| * | | makefile: remove obsolete 'doc' targetnodiscc2017-07-041-8/+2
| | | | | | | | | | | | | | | | official documentation can now be found in doc/md/
| * | | doc: release: update doc generation instructionsnodiscc2017-07-041-2/+2
| | | |
| * | | CONTRIBUTING.md: define new workflow for documentation edition and contributionsnodiscc2017-07-041-6/+2
| | | |