Matias Griese 2cf90cc60b Merge branch 'develop' of github.com:getgrav/grav into 1.7 ...

 Conflicts:

	CHANGELOG.md

	composer.json

	composer.lock

	system/blueprints/config/system.yaml

	system/defines.php

	system/src/Grav/Common/Page/Pages.php

2020-12-09 15:33:37 +02:00

..

assets

updated jquery 3.x

2020-10-18 15:08:59 -06:00

blueprints

Revert "Allow to set SameSite from system.yaml (#3063)"

2020-12-04 03:34:26 -07:00

config

Merge branch 'develop' of github.com:getgrav/grav into 1.7

2020-12-09 15:33:37 +02:00

images/media

Missing thumbnail throwing error when adding .json file via media

2017-09-25 13:21:15 -06:00

languages

Added XSS detection to all forms (use check_xss: false to disable it per field)

2020-11-17 18:54:03 +02:00

pages

Do not cache 404 [#3025]

2020-10-05 11:16:17 +03:00

src/Grav

Merge branch 'develop' of github.com:getgrav/grav into 1.7

2020-12-09 15:33:37 +02:00

templates

Added default templates in Grav itself

2020-09-18 12:49:10 -06:00

defines.php

prepare for release

2020-12-04 03:42:02 -07:00

install.php

Updated copyright dates to 2020

2020-01-02 16:54:14 -07:00

router.php

Updated copyright dates to 2020

2020-01-02 16:54:14 -07:00