aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1176 from shaarli/fix-broken-doc-linksnodiscc2018-07-162-2/+2
|\
| * tpl: default/vintage: pluginsadmin: fix link to documentationnodiscc2018-07-122-2/+2
* | Merge pull request #1180 from virtualtam/docker/updatenodiscc2018-07-161-1/+1
|\ \ | |/ |/|
| * Bump the base Docker image to alpine:3.8VirtualTam2018-07-151-1/+1
|/
* Merge pull request #1178 from pips-/patch-2nodiscc2018-07-121-2/+2
|\
| * Upgrade-and-migration.md: install link typopips2018-07-101-1/+1
| * Upgrade-and-migration.md: typo installation linkpips2018-07-101-1/+1
* | Merge pull request #1175 from ArthurHoaro/docs/apache-proxy-preserve-hostArthurHoaro2018-07-101-2/+5
|\ \
| * | doc: reverse proxy config: proxypreservehost: wording, link to apache documen...nodiscc2018-07-081-2/+2
| * | Include ProxyPreserveHost directive in Apache's proxy docArthurHoaro2018-07-051-1/+4
| |/
* | Merge pull request #1141 from ArthurHoaro/api/tagsArthurHoaro2018-07-1017-4/+937
|\ \ | |/ |/|
| * API - Apache - Specify allowed HTTP method in .htaccessArthurHoaro2018-07-051-0/+7
| * GetTagsTest - Update to alpha sort for equal occurencesArthurHoaro2018-07-053-8/+8
| * Implements Tags endpoints for Shaarli's REST APIArthurHoaro2018-06-0416-4/+930
* | Merge pull request #1173 from virtualtam/docker/cache-volumeVirtualTam2018-07-052-6/+30
|\ \
| * | Docker: expose a volume for the thumbnail cacheVirtualTam2018-07-052-6/+30
|/ /
* | Merge pull request #1171 from virtualtam/docker/alpine-3.7VirtualTam2018-07-011-1/+1
|\ \
| * | Bump the base Docker image to alpine:3.7VirtualTam2018-07-011-1/+1
|/ /
* | Merge pull request #1167 from virtualtam/mkdocsVirtualTam2018-06-289-25/+47
|\ \
| * | Fix broken documentation links and list formattingVirtualTam2018-06-265-22/+34
| * | Run MkDocs in strict modeVirtualTam2018-06-261-1/+2
| * | Let MkDocs clean previously generated HTML pagesVirtualTam2018-06-262-2/+2
| * | Add a Travis environment for MkDocsVirtualTam2018-06-261-0/+9
|/ /
* | Merge pull request #1165 from fbartels/patch-1VirtualTam2018-06-261-0/+1
|\ \
| * \ Merge branch 'master' into patch-1VirtualTam2018-06-261-0/+1
| |\ \ | |/ / |/| |
* | | Merge pull request #1164 from lapineige/patch-2VirtualTam2018-06-261-1/+1
|\ \ \
| * | | Other platform integration: add Yunohost install badge lapineige2018-06-251-1/+1
|/ / /
| * / add Cloudron to related softwareFelix Bartels2018-06-251-1/+1
|/ /
* | Merge pull request #1155 from shaarli/doc-improvementsnodiscc2018-06-216-173/+178
|\ \
| * | Improve documentation (#598, #1105)nodiscc2018-06-176-173/+178
* | | Merge pull request #1154 from virtualtam/changelogVirtualTam2018-06-204-11/+78
|\ \ \
| * | | Update version badges and installation instructionsVirtualTam2018-06-202-6/+6
| * | | Update AUTHORS and CHANGELOGVirtualTam2018-06-202-5/+72
| |/ /
* | | Merge pull request #1158 from virtualtam/master-dockerfileVirtualTam2018-06-2023-261/+87
|\ \ \ | |/ / |/| |
| * | docker: update image and usage documentationVirtualTam2018-06-172-7/+13
| * | docker: build the images from the local sourcesVirtualTam2018-06-1713-127/+74
| * | docker: remove 'stable' resourcesVirtualTam2018-06-164-127/+0
| * | docker: move testing resources to tests/dockerVirtualTam2018-06-164-0/+0
|/ /
* | Merge pull request #1152 from ArthurHoaro/hotfix/install-errorArthurHoaro2018-06-071-2/+3
|\ \
| * | Fixes an error during the installArthurHoaro2018-06-071-2/+3
|/ /
* | Merge pull request #1151 from kramred/masterArthurHoaro2018-06-071-0/+1
|\ \ | |/ |/|
| * remove environment specific .gitignore entriesMark Schmitz2018-06-071-5/+0
| * Merge remote-tracking branch 'upstream/master'Mark Schmitz2018-06-0759-1610/+4212
| |\ | |/ |/|
* | Merge pull request #1143 from ArthurHoaro/sort-equal-tagsArthurHoaro2018-06-042-8/+121
|\ \
| * | Tag sort - UT + comment + fix filter and visibilityArthurHoaro2018-05-292-7/+118
| * | Fix order of tags with the same number of occurrencesArthurHoaro2018-05-191-2/+4
* | | Merge pull request #1086 from virtualtam/refactor/loginVirtualTam2018-06-0323-563/+1116
|\ \ \
| * | | SessionManager+LoginManager: fix checkLoginState logicVirtualTam2018-06-023-7/+15
| * | | Add test coverage for LoginManager methodsVirtualTam2018-06-024-11/+161
| * | | SessionManager: remove unused UID tokenVirtualTam2018-06-022-19/+0