Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix ESLint after dependency upgrade | ArthurHoaro | 2020-09-22 | 1 | -9/+10 |
| | | | |||||
| * | | Bump NodeJS version on travis build | ArthurHoaro | 2020-09-22 | 1 | -1/+1 |
| | | | |||||
| * | | Upgrade front end dependencies | ArthurHoaro | 2020-09-22 | 8 | -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-redirect | ArthurHoaro | 2020-09-22 | 1 | -1/+1 |
|\ \ | | | | | | | Fix redirection to referer after editing a link | ||||
| * | | Fix redirection to referer after editing a link | ArthurHoaro | 2020-09-22 | 1 | -1/+1 |
| |/ | | | | | | | Fixes #1545 | ||||
* | | Merge pull request #1539 from ArthurHoaro/feature/manual-root-url | ArthurHoaro | 2020-09-22 | 14 | -61/+189 |
|\ \ | |||||
| * | | Fix subfolder configuration in unit tests | ArthurHoaro | 2020-09-12 | 8 | -20/+55 |
| | | | |||||
| * | | Add manual configuration for root URL | ArthurHoaro | 2020-09-12 | 6 | -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_methods | ArthurHoaro | 2020-09-22 | 1 | -17/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Added PATCH to the allowed Apache request methods. | Keith Carangelo | 2020-09-14 | 1 | -17/+1 |
| | | | |||||
| * | | Merge branch 'links_per_page' | Keith Carangelo | 2020-09-03 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of https://github.com/shaarli/Shaarli into links_per_page | Keith Carangelo | 2020-09-02 | 5 | -42/+49 |
| | |\ \ | |||||
* | | \ \ | Merge pull request #1553 from ArthurHoaro/fix/404-page | ArthurHoaro | 2020-09-12 | 6 | -5/+121 |
|\ \ \ \ \ | | | | | | | | | | | | | Properly handle 404 errors | ||||
| * | | | | | Properly handle 404 errors | ArthurHoaro | 2020-09-12 | 6 | -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-metadata | ArthurHoaro | 2020-09-12 | 5 | -31/+51 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Plugins: do not save metadata along plugin parameters | ||||
| * | | | | | Plugins: do not save metadata along plugin parameters | ArthurHoaro | 2020-09-12 | 5 | -31/+51 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Also prevent the token to be saved. Fixes #1550 | ||||
* | | | | | Merge pull request #1389 from shaarli/doc-rework-setup | nodiscc | 2020-09-12 | 58 | -2487/+1940 |
|\ \ \ \ \ | | | | | | | | | | | | | doc: rework installation/setup guides, general refactoring | ||||
| * | | | | | doc: Docker minor improvements | ArthurHoaro | 2020-09-12 | 1 | -19/+40 |
| | | | | | | |||||
| * | | | | | Add 2 plugins to the 3rd party plugin list | Immánuel! | 2020-09-12 | 1 | -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 directives | nodiscc | 2020-09-12 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | doc: apache config: remove useless documentroot directive in HTTP-only ↵ | nodiscc | 2020-09-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | virtualhost (only used for redirects) | ||||
| * | | | | | doc: serve configuration/reverse proxy: fix apache mod_md configuration, ↵ | nodiscc | 2020-09-12 | 2 | -47/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | move reference links to their respective sections, shorten | ||||
| * | | | | | doc: server configuration: fix apache restart command | nodiscc | 2020-09-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | doc: server configuration: enable mod_headers | nodiscc | 2020-09-12 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | doc: server configuration: fix apache site config file name | nodiscc | 2020-09-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | doc: server configuration: add reminder to change the example domain name | nodiscc | 2020-09-12 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | doc: server configuration: add asciicast of server configuration procedure ↵ | nodiscc | 2020-09-12 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | (asciinema) | ||||
| * | | | | | doc: updagrde/migration: simplify permissions setup | nodiscc | 2020-09-12 | 1 | -4/+2 |
| | | | | | | |||||
| * | | | | | doc: installation: simplify permissions setup | nodiscc | 2020-09-12 | 1 | -7/+1 |
| | | | | | | |||||
| * | | | | | doc: docker: update docker-compose to 1.26.2 | nodiscc | 2020-09-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | doc: installation: bump version to 0.11.1 | nodiscc | 2020-09-12 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | doc: reverse proxy: update HTTP->HTTPS redirect configuration, remove ↵ | nodiscc | 2020-09-12 | 2 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | logging options | ||||
| * | | | | | doc: fail2Ban: add note about restarting fail2ban | nodiscc | 2020-09-12 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | doc: apache: add example configuration for mod_md | nodiscc | 2020-09-12 | 1 | -4/+9 |
| | | | | | | |||||
| * | | | | | doc: server configuration: apache: add note about mod_md | nodiscc | 2020-09-12 | 1 | -1/+7 |
| | | | | | | |||||
| * | | | | | doc: server configuration: update apache configuration 2.2 -> 2.4 | nodiscc | 2020-09-12 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | https://httpd.apache.org/docs/current/upgrading.html |