aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #1180 from virtualtam/docker/updatenodiscc2018-07-161-1/+1
|\ \ \ \ | |/ / / |/| | | Bump the base Docker image to alpine:3.8
| * | | Bump the base Docker image to alpine:3.8VirtualTam2018-07-151-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Major change: - PHP 7.2 Changelog: - https://www.alpinelinux.org/posts/Alpine-3.8.0-released.html Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #1178 from pips-/patch-2nodiscc2018-07-121-2/+2
|\ \ \ | |/ / |/| | Upgrade-and-migration.md: typo installation link
| * | Upgrade-and-migration.md: install link typopips2018-07-101-1/+1
| | | | | | | | | second one
| * | Upgrade-and-migration.md: typo installation linkpips2018-07-101-1/+1
| |/ | | | | Install page is not correctly linked
* | Merge pull request #1175 from ArthurHoaro/docs/apache-proxy-preserve-hostArthurHoaro2018-07-101-2/+5
|\ \ | | | | | | Include ProxyPreserveHost directive in Apache's proxy doc
| * | doc: reverse proxy config: proxypreservehost: wording, link to apache ↵nodiscc2018-07-081-2/+2
| | | | | | | | | | | | documentation, typo
| * | Include ProxyPreserveHost directive in Apache's proxy docArthurHoaro2018-07-051-1/+4
| |/
* | Merge pull request #1141 from ArthurHoaro/api/tagsArthurHoaro2018-07-1017-4/+937
|\ \ | |/ |/| Implements Tags endpoints for Shaarli's REST API
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | Endpoints: * List All Tags [GET] * Get a tag [GET] * Update a tag [PUT] * Delete a tag [DELETE] Fixes #904 References shaarli/api-documentation#34
* | Merge pull request #1173 from virtualtam/docker/cache-volumeVirtualTam2018-07-052-6/+30
|\ \ | | | | | | Docker: expose a volume for the thumbnail cache
| * | Docker: expose a volume for the thumbnail cacheVirtualTam2018-07-052-6/+30
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1171 from virtualtam/docker/alpine-3.7VirtualTam2018-07-011-1/+1
|\ \ | | | | | | Bump the base Docker image to alpine:3.7
| * | Bump the base Docker image to alpine:3.7VirtualTam2018-07-011-1/+1
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1167 from virtualtam/mkdocsVirtualTam2018-06-289-25/+47
|\ \ | | | | | | Improve Mkdocs build process, fix formatting issues
| * | Fix broken documentation links and list formattingVirtualTam2018-06-265-22/+34
| | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | Run MkDocs in strict modeVirtualTam2018-06-261-1/+2
| | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | Let MkDocs clean previously generated HTML pagesVirtualTam2018-06-262-2/+2
| | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | Add a Travis environment for MkDocsVirtualTam2018-06-261-0/+9
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1165 from fbartels/patch-1VirtualTam2018-06-261-0/+1
|\ \ | | | | | | add Cloudron to related software
| * \ 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
| * | | Other platform integration: add Yunohost install badge lapineige2018-06-251-1/+1
|/ / / | | | | | | Add a button to install with Yunohost in a one-click way.
| * / 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)
| * | Improve documentation (#598, #1105)nodiscc2018-06-176-173/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rework/simplify server configuration/requirements pages (consolidate/simplify SSL/TLS/apache configuration) * update index.md introduction * remove external images (badges) * Fix COPYING link and documentation links * Update features list * dedpulicate information * remove server-requirements.md and move relevant doc to other files * TODO: rework nginx configuration (single configuration example, with commented out blocks for special cases) * TODO: consolidate download/install/configuration pages * remove blank lighttpd configuration section * remove Required? column for composer packages, all libraries are mandatory * php 7.2 compatibilty * clarify that certbot binary and paths may vary depending on install method
* | | Merge pull request #1154 from virtualtam/changelogVirtualTam2018-06-204-11/+78
|\ \ \ | | | | | | | | Update AUTHORS and CHANGELOG
| * | | Update version badges and installation instructionsVirtualTam2018-06-202-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Update AUTHORS and CHANGELOGVirtualTam2018-06-202-5/+72
| |/ / | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #1158 from virtualtam/master-dockerfileVirtualTam2018-06-2023-261/+87
|\ \ \ | |/ / |/| | Master: Build the Docker images from the local sources
| * | docker: update image and usage documentationVirtualTam2018-06-172-7/+13
| | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | docker: build the images from the local sourcesVirtualTam2018-06-1713-127/+74
| | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | docker: remove 'stable' resourcesVirtualTam2018-06-164-127/+0
| | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | docker: move testing resources to tests/dockerVirtualTam2018-06-164-0/+0
|/ / | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1152 from ArthurHoaro/hotfix/install-errorArthurHoaro2018-06-071-2/+3
|\ \ | | | | | | Fixes an error during the install
| * | Fixes an error during the installArthurHoaro2018-06-071-2/+3
|/ / | | | | | | was out of scope
* | Merge pull request #1151 from kramred/masterArthurHoaro2018-06-071-0/+1
|\ \ | |/ |/| Add <meta> tag for referrer same-origin also to new default tpl
| * 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
|\ \ | | | | | | Fix order of tags with the same number of occurrences
| * | Tag sort - UT + comment + fix filter and visibilityArthurHoaro2018-05-292-7/+118
| | | | | | | | | | | | Before this, linksCountPerTag call without would have ignored visibility parameter
| * | Fix order of tags with the same number of occurrencesArthurHoaro2018-05-191-2/+4
| | | | | | | | | | | | Fixes #1142
* | | Merge pull request #1086 from virtualtam/refactor/loginVirtualTam2018-06-0323-563/+1116
|\ \ \ | | | | | | | | Refactor user login and session management
| * | | SessionManager+LoginManager: fix checkLoginState logicVirtualTam2018-06-023-7/+15
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Add test coverage for LoginManager methodsVirtualTam2018-06-024-11/+161
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | SessionManager: remove unused UID tokenVirtualTam2018-06-022-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There already are dedicated tokens for: - CSRF protection - user stay-signed-in feature, via cookie This token was most likely intended as a randomly generated, server-side, secret key to be used when generating hashes. See http://sebsauvage.net/wiki/doku.php?id=php:session [FR] Relevant section: Une clé secrète unique aléatoire est générée côté serveur (et jamais envoyée). Elle peut servir pour signer les formulaires (HMAC) ou générer des token de formulaires (protection contre XSRF). Voir $_SESSION['uid']. Translation: A unique, server-side secret key is randomly generated (and never transmitted). It can be used to sign forms (HMAC) or generate form tokens (protection against XSRF). See $_SESSION['uid'] Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Refactor LoginManager stay-signed-in token managementVirtualTam2018-06-024-14/+69
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Refactor session and cookie timeout controlVirtualTam2018-06-024-57/+224
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 20:51:00 +0000