Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: merge all sharing methods under a single "Sharing content" page | nodiscc | 2018-04-14 | 5 | -58/+89 |
| | | | | | | | | | * formatting, wording, reordering, general improvements * move blog/pastebin/notepad item from index.md to this page * add TODOs * add the new page to mkdocs TOC Part of https://github.com/shaarli/Shaarli/issues/598 | ||||
* | Merge pull request #1126 from kramred/master | ArthurHoaro | 2018-04-14 | 2 | -4/+4 |
|\ | | | | | load user css at last, after plugin css to enable changing plugin styles | ||||
| * | add loading user css at last to vintage tpl | Mark Schmitz | 2018-04-13 | 1 | -1/+1 |
| | | |||||
| * | load user css at last, after plugin css to enable changing plugin styles | Mark Schmitz | 2018-04-13 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #1121 from virtualtam/node/packaging-metadata | VirtualTam | 2018-04-08 | 12 | -22/+28 |
|\ | | | | | Update frontend metadata and COPYING | ||||
| * | Cleanup unused asset resources | VirtualTam | 2018-04-05 | 5 | -0/+0 |
| | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | Update documentation and Doxygen icon location | VirtualTam | 2018-04-05 | 4 | -3/+3 |
| | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | Update COPYING | VirtualTam | 2018-04-05 | 2 | -19/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/pull/1072 Changed: - update paths to resource files (assets, images) Removed: - references to resources now resolved through NPM - licenses corresponding to the aforementioned resources Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | Update NPM frontend metadata | VirtualTam | 2018-04-04 | 1 | -0/+4 |
| | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | Update EditorConfig for frontend resources | VirtualTam | 2018-04-03 | 1 | -1/+1 |
|/ | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | Merge pull request #1115 from ArthurHoaro/parsedown-version | ArthurHoaro | 2018-03-31 | 3 | -60/+71 |
|\ | | | | | Update parsedown to its latest version instead of fixed 1.6 | ||||
| * | Update parsedown to its latest version instead of fixed 1.6 | ArthurHoaro | 2018-03-31 | 3 | -60/+71 |
|/ | |||||
* | Remove minified JS libs | ArthurHoaro | 2018-03-31 | 2 | -9/+0 |
| | |||||
* | Merge pull request #1113 from ArthurHoaro/docker/node-yarn-webpack | ArthurHoaro | 2018-03-28 | 1 | -1/+10 |
|\ | | | | | Docker: build frontend dependencies with node and yarn | ||||
| * | Docker: build frontend dependencies with node and yarn | ArthurHoaro | 2018-03-27 | 1 | -1/+10 |
| | | |||||
| * | Webpack / Documentation update | ArthurHoaro | 2018-03-26 | 5 | -11/+47 |
| | | |||||
| * | Webpack / Configure webpack, ESLint, Travis, Makefile, npm/yarn and git | ArthurHoaro | 2018-03-26 | 9 | -18/+4849 |
| | | |||||
| * | Webpack / Update front paths in template files | ArthurHoaro | 2018-03-26 | 15 | -50/+97 |
| | | |||||
| * | Webpack / Rewrite all JS to ES6 Syntax | ArthurHoaro | 2018-03-26 | 5 | -724/+656 |
| | | |||||
| * | Webpack / Remove frontend dependencies from tpl/ & inc/ and move them to assets/ | ArthurHoaro | 2018-03-26 | 48 | -8228/+19 |
| | | |||||
* | | Merge pull request #1072 from ArthurHoaro/feature/modern-front-end | ArthurHoaro | 2018-03-28 | 81 | -9118/+5755 |
|\ \ | | | | | | | Manage frontend dependencies with npm/yarn and webpack | ||||
| * | | Webpack / Documentation update | ArthurHoaro | 2018-03-28 | 5 | -11/+47 |
| | | | |||||
| * | | Webpack / Configure webpack, ESLint, Travis, Makefile, npm/yarn and git | ArthurHoaro | 2018-03-28 | 9 | -18/+4849 |
| | | | |||||
| * | | Webpack / Update front paths in template files | ArthurHoaro | 2018-03-28 | 15 | -50/+97 |
| | | | |||||
| * | | Webpack / Rewrite all JS to ES6 Syntax | ArthurHoaro | 2018-03-28 | 5 | -724/+656 |
| | | | |||||
| * | | Webpack / Remove frontend dependencies from tpl/ & inc/ and move them to assets/ | ArthurHoaro | 2018-03-28 | 48 | -8228/+19 |
|/ / | |||||
* | | Merge pull request #1093 from ArthurHoaro/feature/theme-translation | ArthurHoaro | 2018-03-26 | 6 | -2/+98 |
|\ \ | | | | | | | Load theme translations files automatically | ||||
| * | | Load theme translations files automatically | ArthurHoaro | 2018-03-26 | 6 | -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-markdown | ArthurHoaro | 2018-03-26 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Fix removal of on=... attributes from html (generated from markdown) | ||||
| * | | Fix removal of on=... attributes from html generated from markdown | Dennis Verspuij | 2018-03-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1110 from virtualtam/doc/v0.9.6 | VirtualTam | 2018-03-25 | 3 | -4/+11 |
|\ \ \ | | | | | | | | | Documentation: release v0.9.6 | ||||
| * | | | Documentation: release v0.9.6 | VirtualTam | 2018-03-25 | 3 | -4/+11 |
|/ / / | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | | Merge pull request #1107 from virtualtam/apache/htaccess/jwt-header | VirtualTam | 2018-03-25 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | httpd: always forward the 'Authorization' header | ||||
| * | | | httpd: always forward the 'Authorization' header | VirtualTam | 2018-03-22 | 1 | -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-1 | VirtualTam | 2018-03-25 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Documentation : Fix current version file name | ||||
| * | | | | Fix current version file name in docs | Alexandre G.-Raymond | 2018-03-25 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1108 from virtualtam/fix/template/vintage/check-login-ban | VirtualTam | 2018-03-25 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | fix: IP ban check for the Vintage theme | ||||
| * | | | fix: IP ban check for the Vintage theme | VirtualTam | 2018-03-24 | 1 | -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-logs | VirtualTam | 2018-03-19 | 4 | -4/+14 |
|\ \ \ | |/ / |/| | | Nginx logs to stdout for Docker images | ||||
| * | | Nginx logs to stdout for Docker Alpine images | Angristan | 2018-03-11 | 4 | -4/+14 |
| | | | |||||
* | | | Merge pull request #1102 from ArthurHoaro/fix/settings-warning | ArthurHoaro | 2018-03-14 | 1 | -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 page | ArthurHoaro | 2018-03-13 | 1 | -2/+0 |
|/ / / | | | | | | | | | | | | | | | | It has been removed from the web page. Fixes #1099 | ||||
* | | | Merge pull request #1096 from ArthurHoaro/feature/download-params | ArthurHoaro | 2018-03-13 | 3 | -1/+96 |
|\ \ \ | |/ / |/| | | Make max download size and timeout configurable | ||||
| * | | Make max download size and timeout configurable | ArthurHoaro | 2018-03-07 | 3 | -1/+96 |
| | | | | | | | | | | | | Fixes #1061 | ||||
* | | | Merge pull request #1097 from ArthurHoaro/fix/psr-elseif | ArthurHoaro | 2018-03-07 | 8 | -15/+15 |
|\ \ \ | | | | | | | | | PSR: use elseif instead of else if | ||||
| * | | | PSR: use elseif instead of else if | ArthurHoaro | 2018-02-28 | 8 | -15/+15 |
| |/ / | | | | | | | | | | See https://www.php-fig.org/psr/psr-2/\#51-if-elseif-else | ||||
* | | | Merge pull request #1098 from josqu4red/perms-docker-alpine-latest | VirtualTam | 2018-03-02 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Fix permission issue introduced with multi-stage build | ||||
| * | | Fix permission issue introduced with multi-stage build | Jonathan Amiez | 2018-03-02 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #1090 from virtualtam/fix/doxygen | VirtualTam | 2018-02-26 | 2 | -2/+3 |
|\ \ | |/ |/| | Doxygen: ignore data/, simplify Make target | ||||
| * | Doxygen: ignore data/, simplify Make target | VirtualTam | 2018-02-23 | 2 | -2/+3 |
| | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> |