aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \
| | * \ Merge branch 'master' of https://github.com/shaarli/Shaarli into links_per_pageKeith Carangelo2020-09-025-42/+49
| | |\ \
* | | \ \ Merge pull request #1553 from ArthurHoaro/fix/404-pageArthurHoaro2020-09-126-5/+121
|\ \ \ \ \ | | | | | | | | | | | | Properly handle 404 errors
| * | | | | Properly handle 404 errorsArthurHoaro2020-09-126-5/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 404 template instead of default Slim error page if the route is not found. Fixes #827
* | | | | | Merge pull request #1551 from ArthurHoaro/fix/plugin-save-metadataArthurHoaro2020-09-125-31/+51
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Plugins: do not save metadata along plugin parameters
| * | | | | Plugins: do not save metadata along plugin parametersArthurHoaro2020-09-125-31/+51
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Also prevent the token to be saved. Fixes #1550
* | | | | Merge pull request #1389 from shaarli/doc-rework-setupnodiscc2020-09-1258-2487/+1940
|\ \ \ \ \ | | | | | | | | | | | | doc: rework installation/setup guides, general refactoring
| * | | | | doc: Docker minor improvementsArthurHoaro2020-09-121-19/+40
| | | | | |
| * | | | | Add 2 plugins to the 3rd party plugin listImmánuel!2020-09-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Besides adding 2 new plugins, also reordered the list by ABC and fixed some discrepancies in the details to restore balance in the force
| * | | | | doc: nginx config: document ipv4 and ipv6 listen directivesnodiscc2020-09-121-1/+4
| | | | | |
| * | | | | doc: apache config: remove useless documentroot directive in HTTP-only ↵nodiscc2020-09-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | virtualhost (only used for redirects)
| * | | | | doc: serve configuration/reverse proxy: fix apache mod_md configuration, ↵nodiscc2020-09-122-47/+66
| | | | | | | | | | | | | | | | | | | | | | | | move reference links to their respective sections, shorten
| * | | | | doc: server configuration: fix apache restart commandnodiscc2020-09-121-1/+1
| | | | | |
| * | | | | doc: server configuration: enable mod_headersnodiscc2020-09-121-0/+3
| | | | | |
| * | | | | doc: server configuration: fix apache site config file namenodiscc2020-09-121-1/+1
| | | | | |
| * | | | | doc: server configuration: add reminder to change the example domain namenodiscc2020-09-121-2/+2
| | | | | |
| * | | | | doc: server configuration: add asciicast of server configuration procedure ↵nodiscc2020-09-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | (asciinema)
| * | | | | doc: updagrde/migration: simplify permissions setupnodiscc2020-09-121-4/+2
| | | | | |
| * | | | | doc: installation: simplify permissions setupnodiscc2020-09-121-7/+1
| | | | | |
| * | | | | doc: docker: update docker-compose to 1.26.2nodiscc2020-09-121-1/+1
| | | | | |
| * | | | | doc: installation: bump version to 0.11.1nodiscc2020-09-121-2/+2
| | | | | |
| * | | | | doc: reverse proxy: update HTTP->HTTPS redirect configuration, remove ↵nodiscc2020-09-122-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | logging options
| * | | | | doc: fail2Ban: add note about restarting fail2bannodiscc2020-09-121-0/+2
| | | | | |
| * | | | | doc: apache: add example configuration for mod_mdnodiscc2020-09-121-4/+9
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 08:49:06 +0000