Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-01 10:01:26 +01:00
Code Issues Packages Projects Releases Activity
6,514 Commits 9 Branches 318 Tags
2923658bb9eb1885f4da84809b773e93fe67cb02
Commit Graph

6514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matias Griese
2923658bb9 Use PHP 7.4 serialization 2020-12-22 15:12:09 +02:00
Matias Griese
c333da60d6 Fixed unserialize Framework\File classes 2020-12-22 15:10:33 +02:00
Matias Griese
cf62db1329 Fixed unserialize in MarkdownFormatter class 2020-12-22 13:53:19 +02:00
Matias Griese
625a39a892 Merge remote-tracking branch 'origin/1.7' into 1.7 2020-12-18 20:53:47 +02:00
Matias Griese
ffc93a77a9 Make it possible to use an absolute path when loading a blueprint 2020-12-18 20:53:38 +02:00
Andy Miller
0cee2b6a97 hide errors with exif 2020-12-17 21:12:15 -07:00
Matias Griese
a24ec2c433 Better fix for system.custom_base_url, which does not affect other urls 2020-12-17 10:02:55 +02:00
Matias Griese
e5727462e7 Fixed port issue with system.custom_base_url 2020-12-16 20:54:56 +02:00
Matias Griese
c1cb4e192f Added support for overriding configuration by using environment variables 2020-12-16 16:38:15 +02:00
Andy Miller
b0c12063a1 should skip release of prerelease 2020-12-15 11:12:54 -07:00
Andy Miller
e4b1e87b9a prepare for rc release 1.7.0-rc.20 2020-12-15 10:57:10 -07:00
Andy Miller
6e136bf83f Try adding php8 back in to tests 2020-12-15 10:45:35 -07:00
Matias Griese
36504d7123 Merge remote-tracking branch 'origin/1.7' into 1.7 2020-12-15 19:26:21 +02:00
Matias Griese
8ac4615117 Fixed missing parenthesis in Setup.php 2020-12-15 19:25:34 +02:00
Andy Miller
7ed04ed3b0 composer update 2020-12-15 10:07:54 -07:00
Andy Miller
c5b2440488 remove composer update 2020-12-15 10:04:12 -07:00
Andy Miller
37ce236a43 try forcing token 2020-12-15 10:02:50 -07:00
Andy Miller
31ab55558c remove PHP 8 2020-12-15 09:52:42 -07:00
Matias Griese
c51830feec Fix bug in Setup.php 2020-12-15 18:30:21 +02:00
Matias Griese
291e91891a Improved multi-site customization 2020-12-15 15:53:24 +02:00
Matias Griese
307ede3183 Fix for subfolder install [#2964] 2020-12-15 08:37:07 +02:00
Matias Griese
26f4d05e87 Fixed dropped query params when ? is preceded with / [#2964] 2020-12-11 15:32:09 +02:00
Matias Griese
b6c941fc3e Fixed twig script/style tag {% script 'file.js' at 'bottom' %}, replaces broken in operator [#3084] 2020-12-11 14:29:13 +02:00
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