aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v0.12' into latestArthurHoaro2020-10-13375-14736/+30892
|\
| * Bump Shaarli version to v0.12.0v0.12.0ArthurHoaro2020-10-131-1/+1
| * Merge remote-tracking branch 'parent/master' into v0.12ArthurHoaro2020-10-132-6/+4
| |\
| | * Merge pull request #1589 from ArthurHoaro/changelog/v0.12.0ArthurHoaro2020-10-132-6/+4
| | |\
| | | * CHANGELOG and AUTHORS for v0.12.0ArthurHoaro2020-10-132-6/+4
| | |/
| * | Bump Shaarli version to v0.12.0-beta-2v0.12.0-beta-2ArthurHoaro2020-10-081-1/+1
| * | Bump Shaarli version to v0.12.0-beta-1ArthurHoaro2020-10-081-1/+1
| * | Bump version to v0.12.0-betaArthurHoaro2020-10-081-1/+1
| |/
| * Merge pull request #1586 from ArthurHoaro/changelog/v0.12.0-beta-2ArthurHoaro2020-10-082-4/+10
| |\
| | * CHANGELOG and AUTHORS for v0.12.0-beta-2ArthurHoaro2020-10-082-4/+10
| |/
| * Merge pull request #1585 from ArthurHoaro/fix/xss-and-tag-searchArthurHoaro2020-10-0811-27/+68
| |\
| | * Security: fix multiple XSS vulnerabilities + fix search tags with special charsArthurHoaro2020-10-0611-27/+68
| |/
| * Merge pull request #1579 from sprak3000/issue-1437-tag-sort-buttons-uinodiscc2020-10-042-5/+5
| |\
| | * Issue #1437 - Make tag cloud/list views buttons more obvioussprak30002020-10-022-5/+5
| * | Merge pull request #1581 from nodiscc/compose-traefik-versionnodiscc2020-10-041-1/+1
| |\ \
| | * | docker-compose.yml: pin traefik image to 1.7-alpinenodiscc2020-10-031-1/+1
| |/ /
| * | Merge pull request #1575 from ArthurHoaro/feature/php8ArthurHoaro2020-10-03115-785/+690
| |\ \
| | * | Use assertRegExp polyfill instead of regexMatchesArthurHoaro2020-09-291-1/+2
| | * | Ignore PHP deps when removing phpunit in PHP 8.0 environmentArthurHoaro2020-09-291-1/+1
| | * | Update composer dependencies from PHP 7.1ArthurHoaro2020-09-291-494/+311
| | * | Fix missing @expectedException convertionArthurHoaro2020-09-298-20/+14
| | * | Compatibility with PHP 8ArthurHoaro2020-09-295-19/+11
| | * | Compatibility with PHPUnit 9ArthurHoaro2020-09-29112-253/+351
| | * | Run CI against PHP 8.0ArthurHoaro2020-09-292-1/+4
| * | | Merge pull request #1574 from stoeps13/hosting-fixArthurHoaro2020-10-033-2/+59
| |\ \ \ | | |_|/ | |/| |
| | * | Revert unrelated changes and add unit testsArthurHoaro2020-09-302-7/+64
| | * | Fix identationChristoph Stoettner2020-09-301-5/+5
| | * | Change to ->container->environmentChristoph Stoettner2020-09-301-18/+10
| | * | Workaround for hoster (ionos)Christoph Stoettner2020-09-292-2/+10
| | |/
| * | Merge pull request #1577 from ArthurHoaro/fix/edit-zeroArthurHoaro2020-10-022-1/+25
| |\ \
| | * | Fix a bug preventing to edit bookmark with ID #0ArthurHoaro2020-09-302-1/+25
| |/ /
| * | Merge pull request #1576 from ArthurHoaro/release/v0.12.0-beta-1/changelogArthurHoaro2020-09-303-10/+23
| |\ \
| | * | Update CHANGELOG and AUTHORArthurHoaro2020-09-303-10/+23
| |/ /
| * | Merge pull request #1569 from ArthurHoaro/fix/bad-encodingArthurHoaro2020-09-303-2/+15
| |\ \
| | * | Fix warning if the encoding retrieved from external headers is invalidArthurHoaro2020-09-303-2/+15
| * | | Merge pull request #1566 from nodiscc/makefile-composer-installArthurHoaro2020-09-302-10/+9
| |\ \ \ | | |_|/ | |/| |
| | * | doc/Makefile: remove references to composer updatenodiscc2020-09-242-10/+9
| * | | Merge pull request #1572 from ArthurHoaro/feature/php8ArthurHoaro2020-09-2952-244/+258
| |\ \ \ | | |_|/ | |/| |
| | * | Convert legacy PHPUnit @expected* to new ->expect*ArthurHoaro2020-09-2722-171/+184
| | * | Comply with PHPUnit V8: setup/teardown functions must return voidArthurHoaro2020-09-2647-72/+72
| | * | tmpArthurHoaro2020-09-261-1/+2
| | * | Travis CI: run composer update instead of installArthurHoaro2020-09-262-2/+2
| |/ /
| * | Merge pull request #1568 from ArthurHoaro/fix/vintage-linkdateArthurHoaro2020-09-261-1/+0
| |\ \
| | * | Fix undefined linkdate variable in vintage themeArthurHoaro2020-09-251-1/+0
| |/ /
| * | Merge pull request #1560 from ArthurHoaro/fix/redirect-wrong-pathArthurHoaro2020-09-255-16/+54
| |\ \
| | * | Fix invalid redirection using the path of an external domainArthurHoaro2020-09-225-16/+54
| * | | Merge pull request #1558 from ArthurHoaro/fix/plugins-base-pathArthurHoaro2020-09-257-27/+61
| |\ \ \
| | * | | Fix plugin base path in core pluginsArthurHoaro2020-09-227-27/+61
| * | | | Merge pull request #1565 from nodiscc/rm-makefile-summaryArthurHoaro2020-09-251-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Makefile: remove static_analysis_summary from all: targetnodiscc2020-09-241-1/+1
| |/ / /