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

2261 commits

This branch
This branch
All branches
Author SHA1 Message Date
ArthurHoaro
72fbbcd679 Security: fix multiple XSS vulnerabilities + fix search tags with special chars 
XSS vulnerabilities fixed in editlink, linklist, tag.cloud and tag.list.

Also fixed tag search with special characters: urlencode function needs to be applied on raw data, before espaping, otherwise the rendered URL is wrong.
 2020-10-06 17:30:18 +02:00
nodiscc
df25b28dcd
Merge pull request #1579 from sprak3000/issue-1437-tag-sort-buttons-ui 
Fix #1437 - Make tag cloud/list views buttons more obvious
 2020-10-04 11:45:24 +00:00
nodiscc
fc4d1b6796
Merge pull request #1581 from nodiscc/compose-traefik-version 
docker-compose.yml: pin traefik image to 1.7-alpine
 2020-10-04 11:33:57 +00:00
nodiscc
bb176441cb docker-compose.yml: pin traefik image to 1.7-alpine 
- fixes https://github.com/shaarli/Shaarli/issues/1493
- https://hub.docker.com/_/traefik/
 2020-10-03 14:35:06 +02:00
ArthurHoaro
7b18876361
Merge pull request #1575 from ArthurHoaro/feature/php8 2020-10-03 12:59:16 +02:00
ArthurHoaro
ee07b7283f
Merge pull request #1574 from stoeps13/hosting-fix 2020-10-03 12:59:01 +02:00
sprak3000
f4ea7cd563 Issue #1437 - Make tag cloud/list views buttons more obvious 
This work alters the markup and CSS for the tag sort UI to match the button feel filters and links per page uses.
 2020-10-02 14:06:02 -04:00
ArthurHoaro
1db2ebbd79
Merge pull request #1577 from ArthurHoaro/fix/edit-zero 
Fix a bug preventing to edit bookmark with ID #0
 2020-10-02 14:24:07 +02:00
ArthurHoaro
255b2264a1 Revert unrelated changes and add unit tests 2020-09-30 15:57:57 +02:00
ArthurHoaro
80a3efe116 Fix a bug preventing to edit bookmark with ID #0 2020-09-30 15:31:34 +02:00
Christoph Stoettner
25cb75552b Fix identation 2020-09-30 12:29:54 +02:00
Christoph Stoettner
d8ef4a893f Change to ->container->environment 2020-09-30 12:27:44 +02:00
ArthurHoaro
95158e7565
Merge pull request #1576 from ArthurHoaro/release/v0.12.0-beta-1/changelog 
Update CHANGELOG and AUTHOR
 2020-09-30 11:59:42 +02:00
ArthurHoaro
22e75f062d Update CHANGELOG and AUTHOR 2020-09-30 11:55:51 +02:00
ArthurHoaro
c3fca560b6
Merge pull request #1569 from ArthurHoaro/fix/bad-encoding 
Fix warning if the encoding retrieved from external headers is invalid
 2020-09-30 11:35:57 +02:00
ArthurHoaro
769a28833b
Merge pull request #1566 from nodiscc/makefile-composer-install 
doc/Makefile: remove references to composer update
 2020-09-30 11:12:17 +02:00
ArthurHoaro
1ea09a1b8b Fix warning if the encoding retrieved from external headers is invalid 
Also fixed the regex to support this failing header: charset="utf-8"\r\n"
 2020-09-30 11:11:19 +02:00
ArthurHoaro
d246e2c512 Use assertRegExp polyfill instead of regexMatches 2020-09-29 18:57:25 +02:00
ArthurHoaro
3a49307c3d Ignore PHP deps when removing phpunit in PHP 8.0 environment 2020-09-29 18:57:25 +02:00
ArthurHoaro
d018755b45 Update composer dependencies from PHP 7.1 2020-09-29 18:57:25 +02:00
ArthurHoaro
f447edb73b Fix missing @expectedException convertion 2020-09-29 18:57:25 +02:00
ArthurHoaro
ab58f25420 Compatibility with PHP 8 2020-09-29 18:57:22 +02:00
ArthurHoaro
a5a9cf23ac Compatibility with PHPUnit 9 2020-09-29 18:57:20 +02:00
ArthurHoaro
2b7a7bc928 Run CI against PHP 8.0 2020-09-29 18:57:17 +02:00
Christoph Stoettner
676571dab9 Workaround for hoster (ionos) 
The hoster writes the environment variable with bearer token to
REDIRECT_HTTP_AUTHORIZATION and needs to provide RewriteBase / to
.htaccess
 2020-09-29 12:15:04 +02:00
ArthurHoaro
6cdca9562c
Merge pull request #1572 from ArthurHoaro/feature/php8 2020-09-29 11:36:27 +02:00
ArthurHoaro
b1baca99f2 Convert legacy PHPUnit @expected* to new ->expect* 
Converted automatically using https://github.com/ArthurHoaro/convert-legacy-phpunit-expect
 2020-09-27 14:09:55 +02:00
ArthurHoaro
8f60e1206e Comply with PHPUnit V8: setup/teardown functions must return void 2020-09-26 15:08:39 +02:00
ArthurHoaro
24225f6332 tmp 2020-09-26 14:43:21 +02:00
ArthurHoaro
e011be0170 Travis CI: run composer update instead of install 
And ignore PHP 7.1 platform requirement, in order to get matching version of PHPUnit
 2020-09-26 14:33:27 +02:00
ArthurHoaro
d0ae1ba273
Merge pull request #1568 from ArthurHoaro/fix/vintage-linkdate 
Fix undefined linkdate variable in vintage theme
 2020-09-26 11:58:32 +02:00
ArthurHoaro
1cb5be5d0c Fix undefined linkdate variable in vintage theme 
Fixes #1371
 2020-09-25 18:24:53 +02:00
ArthurHoaro
585fc700fa
Merge pull request #1560 from ArthurHoaro/fix/redirect-wrong-path 
Fix invalid redirection using the path of an external domain
 2020-09-25 10:59:51 +02:00
ArthurHoaro
85b972baf6
Merge pull request #1558 from ArthurHoaro/fix/plugins-base-path 
Fix plugin base path in core plugins
 2020-09-25 10:59:40 +02:00
ArthurHoaro
71eb87353c
Merge pull request #1565 from nodiscc/rm-makefile-summary 
Makefile: remove static_analysis_summary from all: target
 2020-09-25 10:57:25 +02:00
nodiscc
0f686afe11 doc/Makefile: remove references to composer update 
- add make composer_dependencies_dev Makefile target and use this instead
- fix composer initial installation procedure
- fix php-xdebug install instructions
 2020-09-24 21:51:28 +02:00
nodiscc
6ec24b3605 Makefile: remove static_analysis_summary from all: target 
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
 2020-09-24 21:45:17 +02:00
ArthurHoaro
cdb96276c1
Merge pull request #1561 from ArthurHoaro/feature/front-deps-upgrade 2020-09-23 15:50:23 +02:00
ArthurHoaro
9192a48be3 Fix ESLint after dependency upgrade 2020-09-22 18:14:18 +02:00
ArthurHoaro
98325d646e Bump NodeJS version on travis build 2020-09-22 17:57:54 +02:00
ArthurHoaro
96746d7165 Upgrade front end dependencies 
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
 2020-09-22 17:51:42 +02:00
ArthurHoaro
abe033be85 Fix invalid redirection using the path of an external domain 
Fixes #1554
 2020-09-22 15:37:26 +02:00
ArthurHoaro
5baafe5001
Merge pull request #1559 from ArthurHoaro/fix/edit-redirect 
Fix redirection to referer after editing a link
 2020-09-22 14:15:13 +02:00
ArthurHoaro
98e7a59ca2
Merge pull request #1539 from ArthurHoaro/feature/manual-root-url 2020-09-22 14:08:54 +02:00
ArthurHoaro
2785d85e0a Fix redirection to referer after editing a link 
Fixes #1545
 2020-09-22 14:04:10 +02:00
ArthurHoaro
76fe68d924 Fix plugin base path in core plugins 
Also fix note check in archiveorg plugin, and regression on vintage template.
Documentation regarding relative path has been added.

Fixes #1548
 2020-09-22 13:50:19 +02:00
ArthurHoaro
6f199ee489
Merge pull request #1556 from kcaran/apache_methods 2020-09-22 11:45:58 +02:00
Keith Carangelo
4488ea4bb9 Added PATCH to the allowed Apache request methods. 2020-09-14 15:32:51 -04:00
ArthurHoaro
0d930454a2
Merge pull request #1553 from ArthurHoaro/fix/404-page 
Properly handle 404 errors
 2020-09-12 21:41:58 +02:00
ArthurHoaro
4af591ff3c
Merge pull request #1551 from ArthurHoaro/fix/plugin-save-metadata 
Plugins: do not save metadata along plugin parameters
 2020-09-12 21:41:24 +02:00