aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1113 from ArthurHoaro/docker/node-yarn-webpackArthurHoaro2018-03-281-1/+10
|\ | | | | Docker: build frontend dependencies with node and yarn
| * Docker: build frontend dependencies with node and yarnArthurHoaro2018-03-271-1/+10
| |
| * Webpack / Documentation updateArthurHoaro2018-03-265-11/+47
| |
| * Webpack / Configure webpack, ESLint, Travis, Makefile, npm/yarn and gitArthurHoaro2018-03-269-18/+4849
| |
| * Webpack / Update front paths in template filesArthurHoaro2018-03-2615-50/+97
| |
| * Webpack / Rewrite all JS to ES6 SyntaxArthurHoaro2018-03-265-724/+656
| |
| * Webpack / Remove frontend dependencies from tpl/ & inc/ and move them to assets/ArthurHoaro2018-03-2648-8228/+19
| |
* | Merge pull request #1072 from ArthurHoaro/feature/modern-front-endArthurHoaro2018-03-2881-9118/+5755
|\ \ | | | | | | Manage frontend dependencies with npm/yarn and webpack
| * | Webpack / Documentation updateArthurHoaro2018-03-285-11/+47
| | |
| * | Webpack / Configure webpack, ESLint, Travis, Makefile, npm/yarn and gitArthurHoaro2018-03-289-18/+4849
| | |
| * | Webpack / Update front paths in template filesArthurHoaro2018-03-2815-50/+97
| | |
| * | Webpack / Rewrite all JS to ES6 SyntaxArthurHoaro2018-03-285-724/+656
| | |
| * | Webpack / Remove frontend dependencies from tpl/ & inc/ and move them to assets/ArthurHoaro2018-03-2848-8228/+19
|/ /
* | 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>