Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-06 04:17:09 +02:00
Code Issues Packages Projects Releases Activity
6,491 Commits 10 Branches 319 Tags
cedcc845d50b57e433d35e37cd2309c2e6408a04
Commit Graph

6491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matias Griese
cedcc845d5 Fixed uppercase Assets\*::Class (should be in lower case) 2020-12-11 11:34:52 +02:00
Matias Griese
02a3ed2e0e Fixed missing return value in TwigExtension::svgImageFunction(), some code cleanup 2020-12-11 11:32:43 +02:00
Matias Griese
a729daa3d3 Use return types in Twig node and token classes 2020-12-11 11:30:34 +02:00
Matias Griese
ba23cceae7 Fixed StaticResizeTrait::resize() bad image height/width attributes if null values are passed to the method 2020-12-11 11:25:37 +02:00
Matias Griese
d3e9083869 Fixed deprecated method call for Whoops 2020-12-11 11:16:22 +02:00
Matias Griese
09d92ebab6 Fixed wrong (but working) method call for Whoops 2020-12-11 11:04:41 +02:00
Matias Griese
2777bedb51 Updated a lot of docblocks 2020-12-10 23:15:02 +02:00
Matias Griese
f181e1d237 Merge remote-tracking branch 'origin/1.7' into 1.7 2020-12-10 21:47:06 +02:00
Matias Griese
8f7dc43e1f Changelog update [#3101] 2020-12-10 21:46:57 +02:00
Djamil Legato
249c2f1e69 Update composer first thing 2020-12-10 11:24:28 -08:00
Andy Miller
3529943bb0 Merge branch 'develop' into 1.7 
# Conflicts:
#	system/src/Grav/Common/Twig/TwigExtension.php
 2020-12-10 10:55:54 -07:00
Andy Miller
1c63f4bf46 Fix Twig svg_image() issue with classes applied to all elements #3068 2020-12-10 10:54:38 -07:00
Andy Miller
380177b777 Merge branch 'develop' into 1.7 2020-12-10 10:41:57 -07:00
Andy Miller
bc22c8d2b1 Allow all css and js to be seached via robots.txt by default 2020-12-10 10:41:42 -07:00
Matias Griese
c5cdeaef07 Changelog update [#3101] 2020-12-10 15:09:15 +02:00
Matias Griese
a1fb4a2487 Merge remote-tracking branch 'origin/1.7' into 1.7 2020-12-10 15:07:57 +02:00
Matias Griese
d34593928d Fixed Argument 1 passed to Grav\Common\User\DataUser\User::filterUsername() must be of the type string [#1992] 2020-12-10 15:07:38 +02:00
Andy Miller
5184f8e6a3 automated testing for Grav 1.7 commits/prs 2020-12-09 12:08:47 -07:00
Matias Griese
ea358c239f Restored samesite cookies after merge from develop 2020-12-09 15:42:46 +02:00
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
Matias Griese
db24d3e53e Fixed pages field escaping issues, needs admin update, too 2020-12-09 15:28:48 +02:00
Matias Griese
6a0caebe2e Fixed unimplemented PageObject::getOriginal() call [#3098] 2020-12-09 14:02:33 +02:00
Matias Griese
ac85946e0f Added support for setting GRAV_ENVIRONMENT by using environment variable or a constant 2020-12-08 13:41:05 +02:00
Matias Griese
fc55a8e49b Added support for setting GRAV_SETUP_PATH by using environment variable 2020-12-08 13:27:53 +02:00
Matias Griese
b093aa9fa6 Fix symfony bug (part 2) 2020-12-08 12:13:08 +02:00
Matias Griese
e60e9fa3dd Fix symfony bug 2020-12-08 11:59:09 +02:00
Andy Miller
29bcbf042f Added slack on failure 2020-12-07 16:19:34 -07:00
Andy Miller
19719ecac1 Added slack to tests 2020-12-07 16:14:16 -07:00
Matias Griese
4d288ad2ee CLI command cleanup 2020-12-07 19:40:10 +02:00
Matias Griese
eccaf4acff CLI command cleanup 2020-12-07 13:36:51 +02:00
Matias Griese
c2a2ef212e Fixed broken list in bin/gpm index, CLI/GPM command failures returning success [#3092, #3017] 2020-12-07 12:56:47 +02:00
Djamil Legato
47ab76c7e3 🎉 Moved Travis releases builds to Github Actions 🎉 2020-12-05 16:53:14 -08:00
Andy Miller
dd30b96210 auto-escape change 2020-12-05 11:34:40 -07:00
Andy Miller
3e053784c2 ignore versions.yaml 2020-12-04 14:26:42 -07:00
Andy Miller
7b97cd0cf1 ignore versions.yaml 2020-12-04 12:21:42 -07:00
Djamil Legato
809767883b Disable develop branch from triggering travis 
Temporary, while we move to GitHub Actions.
 2020-12-04 10:07:48 -08:00
Matias Griese
d8e38665f1 Changelog update 2020-12-04 20:06:57 +02:00
Matias Griese
f25ea8f056 Updated unit tests 2020-12-04 20:01:28 +02:00
Matias Griese
7c0ba80530 Fixed potential error when upgrading Grav 2020-12-04 19:29:07 +02:00
Andy Miller
6eb083bebe Merge tag '1.6.30' into develop 
Release v1.6.30
 2020-12-04 05:30:11 -07:00
Andy Miller
3a822f7bc4 Merge branch 'release/1.6.30' 1.6.30 2020-12-04 05:30:10 -07:00
Andy Miller
9a2268a54e prepare for release 2020-12-04 05:29:56 -07:00
Andy Miller
611171371b fix for travis build 2020-12-04 05:26:29 -07:00
Andy Miller
e1d4fe36f4 Merge branch 'release/1.6.30' 2020-12-04 03:42:37 -07:00
Andy Miller
079d8c19a4 Merge tag '1.6.30' into develop 
Release v1.6.30
 2020-12-04 03:42:37 -07:00
Andy Miller
418c6dd7f8 prepare for release 2020-12-04 03:42:02 -07:00
Andy Miller
08304d5064 Revert "Allow to set SameSite from system.yaml (#3063)" 
This reverts commit 0b41eea2bb.
 2020-12-04 03:34:26 -07:00
Andy Miller
5cdeb28e6b Revert "better handle cookie_samesite if null" 
This reverts commit fd0c9823fa.
 2020-12-04 03:33:59 -07:00
Andy Miller
c5efd17a9c GA Slack WIP 2020-12-03 22:16:56 -07:00
Andy Miller
6276ead820 removed deprecated values 2020-12-03 22:10:36 -07:00