aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1294 from virtualtam/changelog/v0.10.4nodiscc2019-04-164-9/+17
|\ | | | | Update README, CHANGELOG and AUTHORS for v0.10.4
| * Update README, CHANGELOG and AUTHORS for v0.10.4VirtualTam2019-04-164-9/+17
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1293 from ArthurHoaro/hotfix/history-renameArthurHoaro2019-04-151-1/+1
|\ | | | | Hotfix: History controller for the REST API has been renamed in a previous commit
| * Hotfix: History controller for the REST API has been renamed in a previous ↵ArthurHoaro2019-04-151-1/+1
|/ | | | | | commit but the class name hasn't been updated in index.php
* Merge pull request #1288 from shaarli/fix-mkdocsnodiscc2019-03-311-0/+15
|\ | | | | docs: add readthedocs configuration file
| * docs: add readthedocs configuration filenodiscc2019-03-301-0/+15
| | | | | | | | | | workaround for mkdocs incompatibility with python 3.7 https://github.com/rtfd/readthedocs.org/issues/5250
* | Merge pull request #1283 from llune/patch-1ArthurHoaro2019-03-251-0/+3
|\ \ | | | | | | add "Select all" string and French translation
| * | add "Select all" string and French translationLuce Carević2019-03-021-0/+3
| |/
* | Merge pull request #1281 from llune/masterArthurHoaro2019-03-255-37/+37
|\ \ | |/ |/| accessibility fixes
| * Merge pull request #1 from llune/pr2Luce Carević2019-03-021-3/+3
| |\ | | | | | | delete useless titles
| | * delete useless titlesLuce Carević2019-03-021-3/+3
| |/
| * fix empty links and hide <i> for screenreadersLuce Carević2019-03-023-32/+32
| |
| * footer and contentinfoLuce Carević2019-03-021-2/+2
|/
* Merge pull request #1272 from ArthurHoaro/feature/html-langArthurHoaro2019-03-0220-19/+20
|\ | | | | Accessibility: specify the HTML lang attribute
| * Accessibility: specify the HTML lang attributeArthurHoaro2019-02-0920-19/+20
| | | | | | | | | | | | The lang is based on the user defined one. If the language is automatic, no language will be specified. Fixes #1216
* | Merge pull request #1271 from ArthurHoaro/hotfix/thumb-note-retrieveArthurHoaro2019-03-026-7/+42
|\ \ | | | | | | Do not try to retrieve thumbnails for internal link
| * | Do not try to retrieve thumbnails for internal linkArthurHoaro2019-02-246-7/+42
| |/ | | | | | | Also adds a helper function to determine if a link is a note and apply it across multiple files.
* | Merge pull request #1279 from virtualtam/changelog/v0.10.3Aurélien Tamisier2019-02-243-7/+37
|\ \ | | | | | | Update badges, changelog and documentation for v0.10.3
| * | Update badges, changelog and documentation for v0.10.3VirtualTam2019-02-243-7/+37
| | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #1275 from ArthurHoaro/doc/drop-php70ArthurHoaro2019-02-241-1/+1
|\ \ \ | | | | | | | | Documentation: drop PHP 7.0 compatibility in Shaarli 11.x
| * | | Documentation: drop PHP 7.0 compatibility in Shaarli 11.xArthurHoaro2019-02-091-1/+1
| | |/ | |/| | | | | | | related to #1249
* | | Merge pull request #1270 from ArthurHoaro/hotfix/sticky-warningArthurHoaro2019-02-242-1/+7
|\ \ \ | | | | | | | | Fix a warning if links sticky status isn't set
| * | | Fix a warning if links sticky status isn't setArthurHoaro2019-02-092-1/+7
| |/ / | | | | | | | | | | | | - initiate its status to false when the link is created - if not defined, initiate its status to false (can happen if the updater hasn't run)
* | | Merge pull request #1269 from ArthurHoaro/feature/remove-redirectorArthurHoaro2019-02-2412-168/+50
|\ \ \ | | | | | | | | Remove the redirector setting
| * | | Remove the redirector settingArthurHoaro2019-02-0912-168/+50
| |/ / | | | | | | | | | Fixes #1239
* | | Merge pull request #1274 from ArthurHoaro/hotfix/css-buttons-mobileArthurHoaro2019-02-241-0/+3
|\ \ \ | | | | | | | | Fix button overlapping on mobile in linklist
| * | | Fix button overlapping on mobile in linklistArthurHoaro2019-02-091-0/+3
| |/ /
* | | Merge pull request #1268 from ArthurHoaro/hotfix/thumb-gd-disableArthurHoaro2019-02-241-1/+1
|\ \ \ | |_|/ |/| | Fix thumbnails disabling if PHP GD is not installed
| * | Fix thumbnails disabling if PHP GD is not installedArthurHoaro2019-02-091-1/+1
| |/
* | Merge pull request #1264 from shaarli/doc-fix-mkdocs-warningsnodiscc2019-02-091-3/+3
|\ \ | |/ |/| doc: fix invalid links
| * doc: fix invalid linksdoc-fix-mkdocs-warningsnodiscc2019-01-311-3/+3
| | | | | | Fixes warnings from https://travis-ci.org/shaarli/Shaarli/jobs/486928133
* | Merge pull request #1182 from ArthurHoaro/feature/session-protection-stay-loginArthurHoaro2019-02-092-0/+17
|\ \ | | | | | | Do not check the IP address with session protection disabled
| * | Do not check the IP address with session protection disabledArthurHoaro2018-07-172-0/+17
| | | | | | | | | | | | | | | | | | This allows the user to stay logged in if his IP changes. Fixes #1106
* | | Merge pull request #1229 from ArthurHoaro/travis/php-7.3ArthurHoaro2019-02-091-0/+2
|\ \ \ | |_|/ |/| | Run Shaarli's tests against PHP 7.3 RC1 on Travis
| * | Run Shaarli's tests againt PHP 7.3 RC1 on TravisArthurHoaro2019-02-091-0/+2
|/ /
* | Merge pull request #1261 from trailjeep/patch-1nodiscc2019-01-311-0/+1
|\ \ | | | | | | Update Community-&-Related-software.md
| * \ Merge branch 'master' into patch-1nodiscc2019-01-311-1/+1
| |\ \ | |/ / |/| |
* | | Merge pull request #1262 from trailjeep/patch-2nodiscc2019-01-311-1/+1
|\ \ \ | | | | | | | | Update Community-&-Related-software.md
| * | | Update Community-&-Related-software.mdtrailjeep2019-01-261-1/+1
|/ / /
| * / Update Community-&-Related-software.mdtrailjeep2019-01-261-0/+1
|/ /
* | Merge pull request #1258 from virtualtam/refactor/phpdocAurélien Tamisier2019-01-234-2382/+26
|\ \ | | | | | | Replace Doxygen with phpDocumentor to generate reference documentation
| * | doc: remove Doxygen configurationVirtualTam2019-01-183-2383/+0
| | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | doc: add Make target to run phpDocumentor with DockerVirtualTam2019-01-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This target provides a convenient way for running phpDocumentor without cluttering the system's configuration with PHP extensions, nor the Composer dependencies. See: - https://hub.docker.com/r/phpdoc/phpdoc/dockerfile - https://github.com/phpDocumentor/phpDocumentor2#via-docker An alternative is to download the PHAR and run it locally: - https://docs.phpdoc.org/getting-started/installing.html#phar Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | doc: add phpDocumentor configurationVirtualTam2019-01-182-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | See: - https://phpdoc.org/ - https://docs.phpdoc.org/references/configuration.html - https://github.com/phpDocumentor/phpDocumentor2 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #1257 from virtualtam/security/composer-advisoriesAurélien Tamisier2019-01-232-7/+213
|\ \ \ | | | | | | | | composer: enforce PHP security advisories
| * | | composer: enforce PHP security advisoriesVirtualTam2019-01-182-7/+213
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds roave/security-advisories to prevent installing PHP packages with known vulnerabilities with Composer. See: - https://github.com/FriendsOfPHP/security-advisories - https://github.com/Roave/SecurityAdvisories Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #1259 from virtualtam/fix/render/strip-opengraph-descriptionAurélien Tamisier2019-01-212-2/+2
|\ \ \ | |/ / |/| | fix: ensure HTML tags are stripped from OpenGraph description
| * | fix: ensure HTML tags are stripped from OpenGraph descriptionVirtualTam2019-01-182-2/+2
|/ / | | | | | | | | | | | | Fixes https://github.com/shaarli/Shaarli/issues/1250 Relates to https://github.com/shaarli/Shaarli/issues/1242 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1248 from virtualtam/refactor/namespacingAurélien Tamisier2019-01-18122-855/+1079
|\ \ | | | | | | Ensure all PHP classes are properly namespaced
| * | Optimize and cleanup importsVirtualTam2019-01-1341-104/+98
| | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>