aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1093 from ArthurHoaro/feature/theme-translationArthurHoaro2018-03-266-2/+98
|\ | | | | Load theme translations files automatically
| * Load theme translations files automaticallyArthurHoaro2018-03-266-2/+98
| | | | | | | | | | | | Fixes #1077 Take a look at the docs update to see how it works
* | Merge pull request #1103 from dennisverspuij/fix-on-in-markdownArthurHoaro2018-03-261-1/+1
|\ \ | | | | | | Fix removal of on=... attributes from html (generated from markdown)
| * | Fix removal of on=... attributes from html generated from markdownDennis Verspuij2018-03-191-1/+1
| | |
* | | Merge pull request #1110 from virtualtam/doc/v0.9.6VirtualTam2018-03-253-4/+11
|\ \ \ | | | | | | | | Documentation: release v0.9.6
| * | | Documentation: release v0.9.6VirtualTam2018-03-253-4/+11
|/ / / | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #1107 from virtualtam/apache/htaccess/jwt-headerVirtualTam2018-03-251-0/+4
|\ \ \ | | | | | | | | httpd: always forward the 'Authorization' header
| * | | httpd: always forward the 'Authorization' headerVirtualTam2018-03-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Apache HTTPD setups where the CGI/FastCGI mode is used, the HTTP header containing the JWT token is not forwarded, which results in the following error when attempting to use the REST API: "401 Not authorized: JWT token not provided" This patch allows forwarding the 'Authorization' header. An alternative would be to use the `CGIPassAuth` directive to allow all authorization headers to be forwarded. See: - https://secure.php.net/manual/en/features.http-auth.php#114877 - https://stackoverflow.com/questions/26475885/authorization-header-missing-in-php-post-request - https://stackoverflow.com/questions/13387516/authorization-header-missing-in-django-rest-framework-is-apache-to-blame - https://stackoverflow.com/questions/17018586/apache-2-4-php-fpm-and-authorization-headers - https://httpd.apache.org/docs/2.4/en/mod/core.html#cgipassauth Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | | Merge pull request #1109 from ilesinge/patch-1VirtualTam2018-03-251-1/+1
|\ \ \ \ | | | | | | | | | | Documentation : Fix current version file name
| * | | | Fix current version file name in docsAlexandre G.-Raymond2018-03-251-1/+1
| |/ / /
* | | | Merge pull request #1108 from virtualtam/fix/template/vintage/check-login-banVirtualTam2018-03-251-1/+1
|\ \ \ \ | |/ / / |/| | | fix: IP ban check for the Vintage theme
| * | | fix: IP ban check for the Vintage themeVirtualTam2018-03-241-1/+1
|/ / / | | | | | | | | | | | | | | | Introduced by https://github.com/shaarli/Shaarli/pull/1008 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #1100 from Angristan/docker-logsVirtualTam2018-03-194-4/+14
|\ \ \ | |/ / |/| | Nginx logs to stdout for Docker images
| * | Nginx logs to stdout for Docker Alpine imagesAngristan2018-03-114-4/+14
| | |
* | | Merge pull request #1102 from ArthurHoaro/fix/settings-warningArthurHoaro2018-03-141-2/+0
|\ \ \ | | | | | | | | Fix warning when trying to save redictor setting from the configure page
| * | | Fix warning when trying to save redictor setting from the configure pageArthurHoaro2018-03-131-2/+0
|/ / / | | | | | | | | | | | | | | | It has been removed from the web page. Fixes #1099
* | | Merge pull request #1096 from ArthurHoaro/feature/download-paramsArthurHoaro2018-03-133-1/+96
|\ \ \ | |/ / |/| | Make max download size and timeout configurable
| * | Make max download size and timeout configurableArthurHoaro2018-03-073-1/+96
| | | | | | | | | | | | Fixes #1061
* | | Merge pull request #1097 from ArthurHoaro/fix/psr-elseifArthurHoaro2018-03-078-15/+15
|\ \ \ | | | | | | | | PSR: use elseif instead of else if
| * | | PSR: use elseif instead of else ifArthurHoaro2018-02-288-15/+15
| |/ / | | | | | | | | | See https://www.php-fig.org/psr/psr-2/\#51-if-elseif-else
* | | Merge pull request #1098 from josqu4red/perms-docker-alpine-latestVirtualTam2018-03-021-0/+2
|\ \ \ | |/ / |/| | Fix permission issue introduced with multi-stage build
| * | Fix permission issue introduced with multi-stage buildJonathan Amiez2018-03-021-0/+2
|/ /
* | Merge pull request #1090 from virtualtam/fix/doxygenVirtualTam2018-02-262-2/+3
|\ \ | |/ |/| Doxygen: ignore data/, simplify Make target
| * Doxygen: ignore data/, simplify Make targetVirtualTam2018-02-232-2/+3
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1085 from virtualtam/docker/multi-stageVirtualTam2018-02-242-23/+29
|\ \ | | | | | | docker: introduce multi-stage image build (master, latest)
| * | docker: introduce multi-stage image build (master, latest)VirtualTam2018-02-142-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/755 Relates to https://github.com/shaarli/Shaarli/pull/1072 See: - https://docs.docker.com/develop/develop-images/multistage-build/ - https://hub.docker.com/r/library/composer/ - https://github.com/composer/docker - https://github.com/docker-library/docs/tree/master/composer Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #1092 from ArthurHoaro/fix/scuttle-doctype-caseArthurHoaro2018-02-243-2/+25
|\ \ \ | | | | | | | | Ignore the case while checking DOCTYPE during the file import
| * | | Ignore the case while checking DOCTYPE during the file importArthurHoaro2018-02-233-2/+25
| | |/ | |/| | | | | | | Fixes #1091
* | | Merge pull request #1062 from ArthurHoaro/feature/pages-titleArthurHoaro2018-02-243-105/+158
|\ \ \ | |/ / |/| | Use a specific page title in all pages
| * | Use a specific page title in all pagesArthurHoaro2018-02-243-105/+158
|/ / | | | | | | | | | | Also fixed a few French translation issues Fixes #954 #955
* | Merge pull request #1089 from virtualtam/readme/badgesVirtualTam2018-02-221-1/+1
|\ \ | | | | | | Update badges for 'stable'
| * | Update badges for 'stable'VirtualTam2018-02-221-1/+1
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1084 from virtualtam/doc/updatesVirtualTam2018-02-164-25/+31
|\ \ | |/ |/| Documentation: cleanup, update references to config(.json)?.php
| * doc: update references to config(.json)?.phpVirtualTam2018-02-143-17/+16
| | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/1082 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * doc: update Directory StructureVirtualTam2018-02-141-8/+15
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1059 from virtualtam/fix/htaccess-gitVirtualTam2018-02-051-0/+8
|\ | | | | htaccess: prevent accessing resources not managed by SCM
| * htaccess: prevent accessing resources not managed by SCMVirtualTam2018-02-051-0/+8
|/ | | | | | | | | See: - https://en.internetwache.org/dont-publicly-expose-git-or-how-we-downloaded-your-websites-sourcecode-an-analysis-of-alexas-1m-28-07-2015/ - https://stackoverflow.com/questions/2530372/how-do-i-disable-directory-browsing - https://httpd.apache.org/docs/current/mod/mod_rewrite.html Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1008 from virtualtam/refactor/authenticationVirtualTam2018-02-056-103/+385
|\ | | | | Refactor login / ban management
| * Refactor login / ban authentication stepsVirtualTam2018-02-056-103/+385
|/ | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/324 Added: - Add the `LoginManager` class to manage logins and bans Changed: - Refactor IP ban management - Simplify logic - Avoid using globals, inject dependencies Fixed: - Use `ban_duration` instead of `ban_after` when setting a new ban Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1074 from kalvn/feature/dailymarkdownArthurHoaro2018-02-024-50/+42
|\ | | | | Executes daily hooks before creating columns.
| * Executes daily hooks before creating columns.kalvn2018-02-014-50/+42
| |
* | Merge pull request #1038 from ArthurHoaro/feature/public-only-filterArthurHoaro2018-02-027-54/+94
|\ \ | | | | | | Add a filter to only display public links
| * | Public/private filter: use two separate buttonsArthurHoaro2018-01-245-57/+54
| | | | | | | | | | | | #1038
| * | Add a filter to only display public linksArthurHoaro2017-12-167-53/+96
| | | | | | | | | | | | | | | | | | When the key filter is clicked once, it only displays private link. When it is clicked on again, it becomes red and only public links are displayed. Another click and all links are displayed. The current visibility status is shown in the search banner Fixes #1030
* | | Merge pull request #1003 from ArthurHoaro/ci/php7.2ArthurHoaro2018-02-025-163/+375
|\ \ \ | | | | | | | | Drop PHP 5.5 compatibility and run Travis UT against PHP 7.2
| * | | INTL_IDNA_VARIANT_2003 is deprecatedArthurHoaro2018-02-021-1/+1
| | | | | | | | | | | | | | | | See https://wiki.php.net/rfc/deprecate-and-remove-intl_idna_variant_2003
| * | | Drop PHP 5.5 compatibility and upgrade PHPUnit to v5.xArthurHoaro2018-02-024-162/+373
| | | | | | | | | | | | | | | | PHPUnit 4.x contains deprecated PHP functions in PHP 7.2.
| * | | CI: run UT against PHP 7.2 (currently in Release Candidate)ArthurHoaro2018-02-021-0/+1
|/ / /
* | | BadgeArthurHoaro2018-02-021-1/+1
| | |
* | | Merge pull request #1076 from ArthurHoaro/changelog-v0.9.5ArthurHoaro2018-02-022-1/+6
|\ \ \ | | | | | | | | CHANGELOG + AUTHORS (v0.9.5)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:26:46 +0000