Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1312 commits 8 branches 1 tag 12 MiB
Commit graph

1312 commits

This branch
This branch
All branches
Author SHA1 Message Date
ArthurHoaro
14dd77ad7e
Merge pull request #1126 from kramred/master 
load user css at last, after plugin css to enable changing plugin styles
 2018-04-14 13:32:34 +02:00
Mark Schmitz
66d37a4fb4 add loading user css at last to vintage tpl 2018-04-13 14:06:27 +01:00
Mark Schmitz
d811e4fda6 load user css at last, after plugin css to enable changing plugin styles 2018-04-13 13:21:58 +01:00
VirtualTam
237e7836c0
Merge pull request #1121 from virtualtam/node/packaging-metadata 
Update frontend metadata and COPYING
 2018-04-08 18:22:47 +02:00
VirtualTam
aec5a76b67 Cleanup unused asset resources 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2018-04-05 20:54:55 +02:00
VirtualTam
d66b5acb24 Update documentation and Doxygen icon location 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2018-04-05 20:54:23 +02:00
VirtualTam
7cf23badeb Update COPYING 
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>
 2018-04-05 20:30:00 +02:00
VirtualTam
e42031e037 Update NPM frontend metadata 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2018-04-04 23:13:49 +02:00
VirtualTam
9fb22af6b3 Update EditorConfig for frontend resources 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2018-04-03 23:33:20 +02:00
ArthurHoaro
80ec7b234c
Merge pull request #1115 from ArthurHoaro/parsedown-version 
Update parsedown to its latest version instead of fixed 1.6
 2018-03-31 13:55:08 +02:00
ArthurHoaro
c5ee13181e Update parsedown to its latest version instead of fixed 1.6 2018-03-31 13:00:13 +02:00
ArthurHoaro
b66769fec5 Remove minified JS libs 2018-03-31 12:02:13 +02:00
ArthurHoaro
ed6d1a7b80
Merge pull request #1113 from ArthurHoaro/docker/node-yarn-webpack 
Docker: build frontend dependencies with node and yarn
 2018-03-28 19:08:32 +02:00
ArthurHoaro
c81f1afc0a
Merge pull request #1072 from ArthurHoaro/feature/modern-front-end 
Manage frontend dependencies with npm/yarn and webpack
 2018-03-28 19:08:06 +02:00
ArthurHoaro
d7eb06bd7c Webpack / Documentation update 2018-03-28 19:04:40 +02:00
ArthurHoaro
47978e8772 Webpack / Configure webpack, ESLint, Travis, Makefile, npm/yarn and git 2018-03-28 19:04:40 +02:00
ArthurHoaro
7e9bd977ee Webpack / Update front paths in template files 2018-03-28 19:01:17 +02:00
ArthurHoaro
a33c565365 Webpack / Rewrite all JS to ES6 Syntax 2018-03-28 19:01:17 +02:00
ArthurHoaro
b3375c7f86 Webpack / Remove frontend dependencies from tpl/ & inc/ and move them to assets/ 2018-03-28 19:01:17 +02:00
ArthurHoaro
94abe0a653 Docker: build frontend dependencies with node and yarn 2018-03-27 19:05:19 +02:00
ArthurHoaro
9b2bd66fb6
Merge pull request #1093 from ArthurHoaro/feature/theme-translation 
Load theme translations files automatically
 2018-03-26 20:26:10 +02:00
ArthurHoaro
a1a15ac37b Webpack / Documentation update 2018-03-26 19:29:44 +02:00
ArthurHoaro
7ff458bc43 Webpack / Configure webpack, ESLint, Travis, Makefile, npm/yarn and git 2018-03-26 19:29:44 +02:00
ArthurHoaro
758fe7201e Webpack / Update front paths in template files 2018-03-26 19:29:20 +02:00
ArthurHoaro
d42da54350 Webpack / Rewrite all JS to ES6 Syntax 2018-03-26 19:29:20 +02:00
ArthurHoaro
d78c23e00d Webpack / Remove frontend dependencies from tpl/ & inc/ and move them to assets/ 2018-03-26 19:29:20 +02:00
ArthurHoaro
68c6afc56f Load theme translations files automatically 
Fixes #1077

Take a look at the docs update to see how it works
 2018-03-26 19:20:25 +02:00
ArthurHoaro
838ef8a6ec
Merge pull request #1103 from dennisverspuij/fix-on-in-markdown 
Fix removal of on=... attributes from html (generated from markdown)
 2018-03-26 18:55:41 +02:00
VirtualTam
faa5b2ce61
Merge pull request #1110 from virtualtam/doc/v0.9.6 
Documentation: release v0.9.6
 2018-03-25 20:43:53 +02:00
VirtualTam
ee242ae321 Documentation: release v0.9.6 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2018-03-25 20:11:10 +02:00
VirtualTam
1f43529fd0
Merge pull request #1107 from virtualtam/apache/htaccess/jwt-header 
httpd: always forward the 'Authorization' header
 2018-03-25 19:04:05 +02:00
VirtualTam
cdaf414c98
Merge pull request #1109 from ilesinge/patch-1 
Documentation : Fix current version file name
 2018-03-25 14:40:39 +02:00
VirtualTam
b0f39c6654
Merge pull request #1108 from virtualtam/fix/template/vintage/check-login-ban 
fix: IP ban check for the Vintage theme
 2018-03-25 14:39:09 +02:00
Alexandre G.-Raymond
6c4cc14e00
Fix current version file name in docs 2018-03-25 14:08:07 +02:00
VirtualTam
adf409716b fix: IP ban check for the Vintage theme 
Introduced by https://github.com/shaarli/Shaarli/pull/1008

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2018-03-24 21:55:03 +01:00
VirtualTam
460cf03d67 httpd: always forward the 'Authorization' header 
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>
 2018-03-22 22:23:41 +01:00
VirtualTam
e54cb1bbe7
Merge pull request #1100 from Angristan/docker-logs 
Nginx logs to stdout for Docker images
 2018-03-19 22:22:12 +01:00
Dennis Verspuij
b525810c14 Fix removal of on=... attributes from html generated from markdown 2018-03-19 10:01:20 +00:00
ArthurHoaro
60a94dab22
Merge pull request #1102 from ArthurHoaro/fix/settings-warning 
Fix warning when trying to save redictor setting from the configure page
 2018-03-14 18:25:22 +01:00
ArthurHoaro
15410df113 Fix warning when trying to save redictor setting from the configure page 
It has been removed from the web page.

Fixes #1099
 2018-03-13 18:11:58 +01:00
ArthurHoaro
4294bc7b98
Merge pull request #1096 from ArthurHoaro/feature/download-params 
Make max download size and timeout configurable
 2018-03-13 18:02:49 +01:00
Angristan
017baf57d5 Nginx logs to stdout for Docker Alpine images 2018-03-11 21:06:14 +01:00
ArthurHoaro
4ff3ed1c47 Make max download size and timeout configurable 
Fixes #1061
 2018-03-07 23:03:21 +01:00
ArthurHoaro
39ee93925b
Merge pull request #1097 from ArthurHoaro/fix/psr-elseif 
PSR: use elseif instead of else if
 2018-03-07 21:53:53 +01:00
VirtualTam
a58a8856a8
Merge pull request #1098 from josqu4red/perms-docker-alpine-latest 
Fix permission issue introduced with multi-stage build
 2018-03-02 16:45:16 +01:00
Jonathan Amiez
ed2de76840 Fix permission issue introduced with multi-stage build 2018-03-02 15:05:48 +01:00
ArthurHoaro
d2d4f993e1 PSR: use elseif instead of else if 
See https://www.php-fig.org/psr/psr-2/\#51-if-elseif-else
 2018-02-28 22:34:40 +01:00
VirtualTam
b70436373b
Merge pull request #1090 from virtualtam/fix/doxygen 
Doxygen: ignore data/, simplify Make target
 2018-02-26 23:20:05 +01:00
VirtualTam
ddd3c19f43
Merge pull request #1085 from virtualtam/docker/multi-stage 
docker: introduce multi-stage image build (master, latest)
 2018-02-24 13:36:55 +01:00
ArthurHoaro
bc4a0a672c
Merge pull request #1092 from ArthurHoaro/fix/scuttle-doctype-case 
Ignore the case while checking DOCTYPE during the file import
 2018-02-24 13:29:11 +01:00