Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1525 from ArthurHoaro/feature/rest-api-bookmark-dates | ArthurHoaro | 2020-10-13 | 4 | -8/+18 |
|\ | | | | | REST API: allow override of creation and update dates | ||||
| * | REST API: allow override of creation and update dates | ArthurHoaro | 2020-08-29 | 4 | -8/+18 |
| | | | | | | | | | | | | | | Note that if they're not provided, default behaviour will apply: creation and update dates will be autogenerated, and not empty. Fixes #1223 | ||||
* | | Merge pull request #1521 from ArthurHoaro/feature/markdown-extra | ArthurHoaro | 2020-10-13 | 7 | -13/+256 |
|\ \ | | | | | | | Add Markdown Extra formatter | ||||
| * | | Add Markdown Extra formatter | ArthurHoaro | 2020-10-13 | 7 | -13/+256 |
|/ / | | | | | | | | | | | | | | | Library: [Parsedown Extra](https://github.com/erusev/parsedown-extra) Also sort dependencies alphabetically. Fixes #1169 | ||||
* | | Update badge versions | ArthurHoaro | 2020-10-13 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #1589 from ArthurHoaro/changelog/v0.12.0 | ArthurHoaro | 2020-10-13 | 2 | -6/+4 |
|\ \ | | | | | | | CHANGELOG and AUTHORS for v0.12.0 | ||||
| * | | CHANGELOG and AUTHORS for v0.12.0 | ArthurHoaro | 2020-10-13 | 2 | -6/+4 |
|/ / | |||||
* | | Merge pull request #1586 from ArthurHoaro/changelog/v0.12.0-beta-2 | ArthurHoaro | 2020-10-08 | 2 | -4/+10 |
|\ \ | | | | | | | CHANGELOG and AUTHORS for v0.12.0-beta-2 | ||||
| * | | CHANGELOG and AUTHORS for v0.12.0-beta-2 | ArthurHoaro | 2020-10-08 | 2 | -4/+10 |
|/ / | |||||
* | | Merge pull request #1585 from ArthurHoaro/fix/xss-and-tag-search | ArthurHoaro | 2020-10-08 | 11 | -27/+68 |
|\ \ | | | | | | | Security: fix multiple XSS vulnerabilities + fix search tags with special chars | ||||
| * | | Security: fix multiple XSS vulnerabilities + fix search tags with special chars | ArthurHoaro | 2020-10-06 | 11 | -27/+68 |
|/ / | | | | | | | | | | | XSS vulnerabilities fixed in editlink, linklist, tag.cloud and tag.list. Also fixed tag search with special characters: urlencode function needs to be applied on raw data, before espaping, otherwise the rendered URL is wrong. | ||||
* | | Merge pull request #1579 from sprak3000/issue-1437-tag-sort-buttons-ui | nodiscc | 2020-10-04 | 2 | -5/+5 |
|\ \ | | | | | | | Fix #1437 - Make tag cloud/list views buttons more obvious | ||||
| * | | Issue #1437 - Make tag cloud/list views buttons more obvious | sprak3000 | 2020-10-02 | 2 | -5/+5 |
| | | | | | | | | | | | | This work alters the markup and CSS for the tag sort UI to match the button feel filters and links per page uses. | ||||
* | | | Merge pull request #1581 from nodiscc/compose-traefik-version | nodiscc | 2020-10-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | docker-compose.yml: pin traefik image to 1.7-alpine | ||||
| * | | | docker-compose.yml: pin traefik image to 1.7-alpine | nodiscc | 2020-10-03 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | - fixes https://github.com/shaarli/Shaarli/issues/1493 - https://hub.docker.com/_/traefik/ | ||||
* | | | Merge pull request #1575 from ArthurHoaro/feature/php8 | ArthurHoaro | 2020-10-03 | 115 | -785/+690 |
|\ \ \ | |||||
| * | | | Use assertRegExp polyfill instead of regexMatches | ArthurHoaro | 2020-09-29 | 1 | -1/+2 |
| | | | | |||||
| * | | | Ignore PHP deps when removing phpunit in PHP 8.0 environment | ArthurHoaro | 2020-09-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update composer dependencies from PHP 7.1 | ArthurHoaro | 2020-09-29 | 1 | -494/+311 |
| | | | | |||||
| * | | | Fix missing @expectedException convertion | ArthurHoaro | 2020-09-29 | 8 | -20/+14 |
| | | | | |||||
| * | | | Compatibility with PHP 8 | ArthurHoaro | 2020-09-29 | 5 | -19/+11 |
| | | | | |||||
| * | | | Compatibility with PHPUnit 9 | ArthurHoaro | 2020-09-29 | 112 | -253/+351 |
| | | | | |||||
| * | | | Run CI against PHP 8.0 | ArthurHoaro | 2020-09-29 | 2 | -1/+4 |
| | | | | |||||
* | | | | Merge pull request #1574 from stoeps13/hosting-fix | ArthurHoaro | 2020-10-03 | 3 | -2/+59 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Revert unrelated changes and add unit tests | ArthurHoaro | 2020-09-30 | 2 | -7/+64 |
| | | | | |||||
| * | | | Fix identation | Christoph Stoettner | 2020-09-30 | 1 | -5/+5 |
| | | | | |||||
| * | | | Change to ->container->environment | Christoph Stoettner | 2020-09-30 | 1 | -18/+10 |
| | | | | |||||
| * | | | Workaround for hoster (ionos) | Christoph Stoettner | 2020-09-29 | 2 | -2/+10 |
| |/ / | | | | | | | | | | | | | | | | The hoster writes the environment variable with bearer token to REDIRECT_HTTP_AUTHORIZATION and needs to provide RewriteBase / to .htaccess | ||||
* | | | Merge pull request #1577 from ArthurHoaro/fix/edit-zero | ArthurHoaro | 2020-10-02 | 2 | -1/+25 |
|\ \ \ | | | | | | | | | Fix a bug preventing to edit bookmark with ID #0 | ||||
| * | | | Fix a bug preventing to edit bookmark with ID #0 | ArthurHoaro | 2020-09-30 | 2 | -1/+25 |
|/ / / | |||||
* | | | Merge pull request #1576 from ArthurHoaro/release/v0.12.0-beta-1/changelog | ArthurHoaro | 2020-09-30 | 3 | -10/+23 |
|\ \ \ | | | | | | | | | Update CHANGELOG and AUTHOR | ||||
| * | | | Update CHANGELOG and AUTHOR | ArthurHoaro | 2020-09-30 | 3 | -10/+23 |
|/ / / | |||||
* | | | Merge pull request #1569 from ArthurHoaro/fix/bad-encoding | ArthurHoaro | 2020-09-30 | 3 | -2/+15 |
|\ \ \ | | | | | | | | | Fix warning if the encoding retrieved from external headers is invalid | ||||
| * | | | Fix warning if the encoding retrieved from external headers is invalid | ArthurHoaro | 2020-09-30 | 3 | -2/+15 |
| | | | | | | | | | | | | | | | | Also fixed the regex to support this failing header: charset="utf-8"\r\n" | ||||
* | | | | Merge pull request #1566 from nodiscc/makefile-composer-install | ArthurHoaro | 2020-09-30 | 2 | -10/+9 |
|\ \ \ \ | |_|/ / |/| | | | doc/Makefile: remove references to composer update | ||||
| * | | | doc/Makefile: remove references to composer update | nodiscc | 2020-09-24 | 2 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | - add make composer_dependencies_dev Makefile target and use this instead - fix composer initial installation procedure - fix php-xdebug install instructions | ||||
* | | | | Merge pull request #1572 from ArthurHoaro/feature/php8 | ArthurHoaro | 2020-09-29 | 52 | -244/+258 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Convert legacy PHPUnit @expected* to new ->expect* | ArthurHoaro | 2020-09-27 | 22 | -171/+184 |
| | | | | | | | | | | | | | | | | Converted automatically using https://github.com/ArthurHoaro/convert-legacy-phpunit-expect | ||||
| * | | | Comply with PHPUnit V8: setup/teardown functions must return void | ArthurHoaro | 2020-09-26 | 47 | -72/+72 |
| | | | | |||||
| * | | | tmp | ArthurHoaro | 2020-09-26 | 1 | -1/+2 |
| | | | | |||||
| * | | | Travis CI: run composer update instead of install | ArthurHoaro | 2020-09-26 | 2 | -2/+2 |
|/ / / | | | | | | | | | | And ignore PHP 7.1 platform requirement, in order to get matching version of PHPUnit | ||||
* | | | Merge pull request #1568 from ArthurHoaro/fix/vintage-linkdate | ArthurHoaro | 2020-09-26 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Fix undefined linkdate variable in vintage theme | ||||
| * | | | Fix undefined linkdate variable in vintage theme | ArthurHoaro | 2020-09-25 | 1 | -1/+0 |
|/ / / | | | | | | | | | | Fixes #1371 | ||||
* | | | Merge pull request #1560 from ArthurHoaro/fix/redirect-wrong-path | ArthurHoaro | 2020-09-25 | 5 | -16/+54 |
|\ \ \ | | | | | | | | | Fix invalid redirection using the path of an external domain | ||||
| * | | | Fix invalid redirection using the path of an external domain | ArthurHoaro | 2020-09-22 | 5 | -16/+54 |
| | | | | | | | | | | | | | | | | Fixes #1554 | ||||
* | | | | Merge pull request #1558 from ArthurHoaro/fix/plugins-base-path | ArthurHoaro | 2020-09-25 | 7 | -27/+61 |
|\ \ \ \ | | | | | | | | | | | Fix plugin base path in core plugins | ||||
| * | | | | Fix plugin base path in core plugins | ArthurHoaro | 2020-09-22 | 7 | -27/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix note check in archiveorg plugin, and regression on vintage template. Documentation regarding relative path has been added. Fixes #1548 | ||||
* | | | | | Merge pull request #1565 from nodiscc/rm-makefile-summary | ArthurHoaro | 2020-09-25 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Makefile: remove static_analysis_summary from all: target | ||||
| * | | | | Makefile: remove static_analysis_summary from all: target | nodiscc | 2020-09-24 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | static_analysis_summary was removed in 37c9c6b#diff-b67911656ef5d18c4ae36cb6741b7965 but not from the all: target dependencies. Therefore running make all always fails. fixes https://github.com/shaarli/Shaarli/issues/1459 | ||||
* | | | | Merge pull request #1561 from ArthurHoaro/feature/front-deps-upgrade | ArthurHoaro | 2020-09-23 | 10 | -3805/+3927 |
|\ \ \ \ | |_|/ / |/| | | |