aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1579 from sprak3000/issue-1437-tag-sort-buttons-uinodiscc2020-10-042-5/+5
|\ | | | | Fix #1437 - Make tag cloud/list views buttons more obvious
| * Issue #1437 - Make tag cloud/list views buttons more obvioussprak30002020-10-022-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-versionnodiscc2020-10-041-1/+1
|\ \ | | | | | | docker-compose.yml: pin traefik image to 1.7-alpine
| * | docker-compose.yml: pin traefik image to 1.7-alpinenodiscc2020-10-031-1/+1
|/ / | | | | | | | | - fixes https://github.com/shaarli/Shaarli/issues/1493 - https://hub.docker.com/_/traefik/
* | 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
| |/ | | | | | | | | | | 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-zeroArthurHoaro2020-10-022-1/+25
|\ \ | | | | | | Fix a bug preventing to edit bookmark with ID #0
| * | 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 AUTHOR
| * | 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 invalid
| * | Fix warning if the encoding retrieved from external headers is invalidArthurHoaro2020-09-303-2/+15
| | | | | | | | | | | | Also fixed the regex to support this failing header: charset="utf-8"\r\n"
* | | Merge pull request #1566 from nodiscc/makefile-composer-installArthurHoaro2020-09-302-10/+9
|\ \ \ | |_|/ |/| | doc/Makefile: remove references to composer update
| * | doc/Makefile: remove references to composer updatenodiscc2020-09-242-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/php8ArthurHoaro2020-09-2952-244/+258
|\ \ \ | |_|/ |/| |
| * | Convert legacy PHPUnit @expected* to new ->expect*ArthurHoaro2020-09-2722-171/+184
| | | | | | | | | | | | Converted automatically using https://github.com/ArthurHoaro/convert-legacy-phpunit-expect
| * | 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
|/ / | | | | | | And ignore PHP 7.1 platform requirement, in order to get matching version of PHPUnit
* | Merge pull request #1568 from ArthurHoaro/fix/vintage-linkdateArthurHoaro2020-09-261-1/+0
|\ \ | | | | | | Fix undefined linkdate variable in vintage theme
| * | Fix undefined linkdate variable in vintage themeArthurHoaro2020-09-251-1/+0
|/ / | | | | | | Fixes #1371
* | Merge pull request #1560 from ArthurHoaro/fix/redirect-wrong-pathArthurHoaro2020-09-255-16/+54
|\ \ | | | | | | Fix invalid redirection using the path of an external domain
| * | Fix invalid redirection using the path of an external domainArthurHoaro2020-09-225-16/+54
| | | | | | | | | | | | Fixes #1554
* | | Merge pull request #1558 from ArthurHoaro/fix/plugins-base-pathArthurHoaro2020-09-257-27/+61
|\ \ \ | | | | | | | | Fix plugin base path in core plugins
| * | | Fix plugin base path in core pluginsArthurHoaro2020-09-227-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-summaryArthurHoaro2020-09-251-1/+1
|\ \ \ \ | |_|_|/ |/| | | Makefile: remove static_analysis_summary from all: target
| * | | Makefile: remove static_analysis_summary from all: targetnodiscc2020-09-241-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-upgradeArthurHoaro2020-09-2310-3805/+3927
|\ \ \ | |_|/ |/| |
| * | Fix ESLint after dependency upgradeArthurHoaro2020-09-221-9/+10
| | |
| * | Bump NodeJS version on travis buildArthurHoaro2020-09-221-1/+1
| | |
| * | Upgrade front end dependenciesArthurHoaro2020-09-228-3795/+3916
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Mostly in order to get rid of deprecated deps, and upgrade vulnerable ones. - Upgrade webpack from 3.x to 4.x - Moved babel package to main repo - Replaced deprecated extract-text-webpack-plugin with extract-text-webpack-plugin - Replaced deprecated babel-minify-webpack-plugin with terser-webpack-plugin - Replaced deprecated node-sass with (dart) sass package - Replaced deprecated sass-lint with stylelint (the rules might be a bit different Related to #1531: trivy doesn't raise any more issue
* | Merge pull request #1559 from ArthurHoaro/fix/edit-redirectArthurHoaro2020-09-221-1/+1
|\ \ | | | | | | Fix redirection to referer after editing a link
| * | Fix redirection to referer after editing a linkArthurHoaro2020-09-221-1/+1
| |/ | | | | | | Fixes #1545
* | Merge pull request #1539 from ArthurHoaro/feature/manual-root-urlArthurHoaro2020-09-2214-61/+189
|\ \
| * | Fix subfolder configuration in unit testsArthurHoaro2020-09-128-20/+55
| | |
| * | Add manual configuration for root URLArthurHoaro2020-09-126-41/+134
| | | | | | | | | | | | | | | | | | This new setting under 'general.root_url' allows to override automatic discovery of Shaarli instance's URL. Fixes #1339
* | | Merge pull request #1556 from kcaran/apache_methodsArthurHoaro2020-09-221-17/+1
|\ \ \ | |_|/ |/| |
| * | Added PATCH to the allowed Apache request methods.Keith Carangelo2020-09-141-17/+1
| | |
| * | Merge branch 'links_per_page'Keith Carangelo2020-09-030-0/+0
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 12:31:41 +0000