Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not check the IP address with session protection disabled | ArthurHoaro | 2018-07-17 | 2 | -0/+17 |
| | | | | | | This allows the user to stay logged in if his IP changes. Fixes #1106 | ||||
* | Merge pull request #1176 from shaarli/fix-broken-doc-links | nodiscc | 2018-07-16 | 2 | -2/+2 |
|\ | | | | | Fix broken documentation links in page footer and pluginsadmin | ||||
| * | tpl: default/vintage: pluginsadmin: fix link to documentation | nodiscc | 2018-07-12 | 2 | -2/+2 |
| | | | | | | | | Ref #930 | ||||
* | | Merge pull request #1180 from virtualtam/docker/update | nodiscc | 2018-07-16 | 1 | -1/+1 |
|\ \ | |/ |/| | Bump the base Docker image to alpine:3.8 | ||||
| * | Bump the base Docker image to alpine:3.8 | VirtualTam | 2018-07-15 | 1 | -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-2 | nodiscc | 2018-07-12 | 1 | -2/+2 |
|\ | | | | | Upgrade-and-migration.md: typo installation link | ||||
| * | Upgrade-and-migration.md: install link typo | pips | 2018-07-10 | 1 | -1/+1 |
| | | | | | | second one | ||||
| * | Upgrade-and-migration.md: typo installation link | pips | 2018-07-10 | 1 | -1/+1 |
| | | | | | | Install page is not correctly linked | ||||
* | | Merge pull request #1175 from ArthurHoaro/docs/apache-proxy-preserve-host | ArthurHoaro | 2018-07-10 | 1 | -2/+5 |
|\ \ | | | | | | | Include ProxyPreserveHost directive in Apache's proxy doc | ||||
| * | | doc: reverse proxy config: proxypreservehost: wording, link to apache ↵ | nodiscc | 2018-07-08 | 1 | -2/+2 |
| | | | | | | | | | | | | documentation, typo | ||||
| * | | Include ProxyPreserveHost directive in Apache's proxy doc | ArthurHoaro | 2018-07-05 | 1 | -1/+4 |
| |/ | |||||
* | | Merge pull request #1141 from ArthurHoaro/api/tags | ArthurHoaro | 2018-07-10 | 17 | -4/+937 |
|\ \ | |/ |/| | Implements Tags endpoints for Shaarli's REST API | ||||
| * | API - Apache - Specify allowed HTTP method in .htaccess | ArthurHoaro | 2018-07-05 | 1 | -0/+7 |
| | | |||||
| * | GetTagsTest - Update to alpha sort for equal occurences | ArthurHoaro | 2018-07-05 | 3 | -8/+8 |
| | | |||||
| * | Implements Tags endpoints for Shaarli's REST API | ArthurHoaro | 2018-06-04 | 16 | -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-volume | VirtualTam | 2018-07-05 | 2 | -6/+30 |
|\ \ | | | | | | | Docker: expose a volume for the thumbnail cache | ||||
| * | | Docker: expose a volume for the thumbnail cache | VirtualTam | 2018-07-05 | 2 | -6/+30 |
|/ / | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | Merge pull request #1171 from virtualtam/docker/alpine-3.7 | VirtualTam | 2018-07-01 | 1 | -1/+1 |
|\ \ | | | | | | | Bump the base Docker image to alpine:3.7 | ||||
| * | | Bump the base Docker image to alpine:3.7 | VirtualTam | 2018-07-01 | 1 | -1/+1 |
|/ / | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | Merge pull request #1167 from virtualtam/mkdocs | VirtualTam | 2018-06-28 | 9 | -25/+47 |
|\ \ | | | | | | | Improve Mkdocs build process, fix formatting issues | ||||
| * | | Fix broken documentation links and list formatting | VirtualTam | 2018-06-26 | 5 | -22/+34 |
| | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | | Run MkDocs in strict mode | VirtualTam | 2018-06-26 | 1 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | | Let MkDocs clean previously generated HTML pages | VirtualTam | 2018-06-26 | 2 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | | Add a Travis environment for MkDocs | VirtualTam | 2018-06-26 | 1 | -0/+9 |
|/ / | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | Merge pull request #1165 from fbartels/patch-1 | VirtualTam | 2018-06-26 | 1 | -0/+1 |
|\ \ | | | | | | | add Cloudron to related software | ||||
| * \ | Merge branch 'master' into patch-1 | VirtualTam | 2018-06-26 | 1 | -0/+1 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1164 from lapineige/patch-2 | VirtualTam | 2018-06-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Other platform integration: add Yunohost install badge | ||||
| * | | | Other platform integration: add Yunohost install badge | lapineige | 2018-06-25 | 1 | -1/+1 |
|/ / / | | | | | | | Add a button to install with Yunohost in a one-click way. | ||||
| * / | add Cloudron to related software | Felix Bartels | 2018-06-25 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1155 from shaarli/doc-improvements | nodiscc | 2018-06-21 | 6 | -173/+178 |
|\ \ | | | | | | | Improve documentation (#598, #1105) | ||||
| * | | Improve documentation (#598, #1105) | nodiscc | 2018-06-17 | 6 | -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/changelog | VirtualTam | 2018-06-20 | 4 | -11/+78 |
|\ \ \ | | | | | | | | | Update AUTHORS and CHANGELOG | ||||
| * | | | Update version badges and installation instructions | VirtualTam | 2018-06-20 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | | | Update AUTHORS and CHANGELOG | VirtualTam | 2018-06-20 | 2 | -5/+72 |
| |/ / | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | | Merge pull request #1158 from virtualtam/master-dockerfile | VirtualTam | 2018-06-20 | 23 | -261/+87 |
|\ \ \ | |/ / |/| | | Master: Build the Docker images from the local sources | ||||
| * | | docker: update image and usage documentation | VirtualTam | 2018-06-17 | 2 | -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 sources | VirtualTam | 2018-06-17 | 13 | -127/+74 |
| | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | | docker: remove 'stable' resources | VirtualTam | 2018-06-16 | 4 | -127/+0 |
| | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | | docker: move testing resources to tests/docker | VirtualTam | 2018-06-16 | 4 | -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-error | ArthurHoaro | 2018-06-07 | 1 | -2/+3 |
|\ \ | | | | | | | Fixes an error during the install | ||||
| * | | Fixes an error during the install | ArthurHoaro | 2018-06-07 | 1 | -2/+3 |
|/ / | | | | | | | was out of scope | ||||
* | | Merge pull request #1151 from kramred/master | ArthurHoaro | 2018-06-07 | 1 | -0/+1 |
|\ \ | |/ |/| | Add <meta> tag for referrer same-origin also to new default tpl | ||||
| * | remove environment specific .gitignore entries | Mark Schmitz | 2018-06-07 | 1 | -5/+0 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' | Mark Schmitz | 2018-06-07 | 59 | -1610/+4212 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1143 from ArthurHoaro/sort-equal-tags | ArthurHoaro | 2018-06-04 | 2 | -8/+121 |
|\ \ | | | | | | | Fix order of tags with the same number of occurrences | ||||
| * | | Tag sort - UT + comment + fix filter and visibility | ArthurHoaro | 2018-05-29 | 2 | -7/+118 |
| | | | | | | | | | | | | Before this, linksCountPerTag call without would have ignored visibility parameter | ||||
| * | | Fix order of tags with the same number of occurrences | ArthurHoaro | 2018-05-19 | 1 | -2/+4 |
| | | | | | | | | | | | | Fixes #1142 | ||||
* | | | Merge pull request #1086 from virtualtam/refactor/login | VirtualTam | 2018-06-03 | 23 | -563/+1116 |
|\ \ \ | | | | | | | | | Refactor user login and session management | ||||
| * | | | SessionManager+LoginManager: fix checkLoginState logic | VirtualTam | 2018-06-02 | 3 | -7/+15 |
| | | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | | | Add test coverage for LoginManager methods | VirtualTam | 2018-06-02 | 4 | -11/+161 |
| | | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> |