Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-23 15:11:27 +01:00
Code Issues Packages Projects Releases Activity
6,151 Commits 9 Branches 318 Tags
de151c8a9df6c2238ca93efdb6002fd371840c91
Commit Graph

6151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matias Griese
de151c8a9d Fixed uploading media in non-existing flex object (part 2) 2020-06-25 18:34:31 +03:00
Matias Griese
b0a1effaf9 Fixed uploading media in non-existing object 2020-06-25 15:58:18 +03:00
Matias Griese
fd52d124dd Changelog update 2020-06-23 14:37:46 +03:00
Matias Griese
b772864f2d Merge branch 'feature/1.7-media' of github.com:getgrav/grav into 1.7 2020-06-23 14:35:46 +03:00
Matias Griese
cdb10cfc1f Removed deprecation from a few FlexMediaTrait methods to simplify logic 2020-06-23 12:57:40 +03:00
Matias Griese
da7f0b7dce Fixed MediaUploadTrait::copyUploadedFile() not adding uploaded media to the collection 2020-06-23 12:43:27 +03:00
jackthomasatl
25461f7ca8 Adjusted asset types to enable extension of assets class (#2937) 
Co-authored-by: Jack Thomas <Jack.Thomas@elavon.com>
 2020-06-22 14:26:03 -06:00
Andy Miller
da7df9f865 needed for cache clear event 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-06-22 08:57:58 -06:00
Andy Miller
f30219d85a move image loading into it’s own trait to be used in image+static images 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-06-10 09:58:06 -06:00
Andy Miller
223e75d326 handle non-text links in getExcerptFromHtml 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-06-10 09:30:20 -06:00
Andy Miller
419ebeafa8 Fix for trailing / in routes 
Signed-off-by: Andy Miller <rhuk@mac.com>
1.7.0-rc.12 		2020-06-08 16:33:55 -06:00
Andy Miller
4be7917d41 prepare for rc release 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-06-08 15:53:28 -06:00
Andy Miller
191686dffe Merge branch 'develop' into 1.7 
Signed-off-by: Andy Miller <rhuk@mac.com>

# Conflicts:
#	system/defines.php
 2020-06-08 15:51:08 -06:00
Andy Miller
e29f8a9657 Merge tag '1.6.26' into develop 
Release v1.6.26
 2020-06-08 15:50:24 -06:00
Andy Miller
fa791ed4ab Merge branch 'release/1.6.26' 1.6.26 2020-06-08 15:50:24 -06:00
Andy Miller
e66f6583b1 prepare for release 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-06-08 15:49:51 -06:00
Andy Miller
399d90e6cd Merge branch '1.7' into feature/1.7-media 2020-06-08 14:50:27 -06:00
Andy Miller
ec2eaae0d3 Merge branch 'develop' into 1.7 
Signed-off-by: Andy Miller <rhuk@mac.com>

# Conflicts:
#	system/src/Grav/Common/GPM/Response.php
 2020-06-07 19:47:58 -06:00
Andy Miller
12389b1e0d JSON Route of homepage with no ‘route’ set is valid [form#425] 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-06-07 19:46:18 -06:00
Florian Körner
ff6e5a20c3 Fix: case-insensitive search of location header (#2932) 
looks good!
 2020-06-07 15:42:29 -06:00
Andy Miller
7d6526f962 Merge branch '1.7' into feature/1.7-media 
Signed-off-by: Andy Miller <rhuk@mac.com>

# Conflicts:
#	CHANGELOG.md
 2020-06-07 15:26:10 -06:00
Andy Miller
b8fad8452b JSON route on homepage with no ‘route’ is valid grav-plugin-form#425 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-06-07 15:23:01 -06:00
Matias Griese
5e9107f376 Merge branch '1.7' of github.com:getgrav/grav into feature/1.7-media 
 Conflicts:
	system/src/Grav/Common/Page/Medium/ImageMedium.php
 2020-06-05 22:03:53 +03:00
Andy Miller
7faaff304a PSR fix 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-06-05 12:26:30 -06:00
Matias Griese
94acbf6005 Fixed saving nested file fields in Flex Objects 2020-06-05 10:11:19 +03:00
Andy Miller
a65c21acba Merge branch 'develop' into 1.7 
Signed-off-by: Andy Miller <rhuk@mac.com>

# Conflicts:
#	CHANGELOG.md
#	system/blueprints/config/system.yaml
 2020-06-04 14:46:54 -06:00
Andy Miller
bfbe4ce1b8 option to control supported attributes in markdown links 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-06-04 14:42:38 -06:00
Andy Miller
aaa636f357 cleaner handling of cropZoom 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-06-04 14:31:22 -06:00
Matias Griese
d0241ba7ee Changelog update 2020-06-04 22:33:29 +03:00
Matias Griese
b2230225cc Fixed media field saving issues in Flex Pages 2020-06-04 22:01:23 +03:00
Matias Griese
e063718e4f Add media support for Flex UserGroupObject 2020-06-04 16:43:00 +03:00
Matias Griese
03436a670f Add media support for Flex GenericObject 2020-06-04 16:26:40 +03:00
Matias Griese
8be508de5d Fixed typo in class name 2020-06-04 16:16:27 +03:00
Matias Griese
9370a86246 Moved common methods in both Media and GlobalMedia to AbstractMedia 2020-06-04 15:47:28 +03:00
Matias Griese
6c5237cdd8 Added missing methods into GlobalMedia 2020-06-04 15:45:51 +03:00
Matias Griese
2cf5ecd212 Implemented working media fields in FlexMediaTrait 2020-06-04 15:17:52 +03:00
Matias Griese
8e9125772e Add missing functionality to MediaUploadTrait 2020-06-04 12:47:48 +03:00
Matias Griese
62e863dec0 Improve Media handling in Flex 2020-06-03 18:06:37 +03:00
Matias Griese
e00098ea6a Merge branches '1.7' and 'feature/1.7-media' of github.com:getgrav/grav into feature/1.7-media 2020-06-02 13:29:17 +03:00
Matias Griese
f12bd1b51f Added support for case sensitive usernames 2020-06-02 11:57:55 +03:00
Matias Griese
93942a74cf Fixed Flex Object request cache clear when saving object 2020-06-01 13:48:58 +03:00
Matias Griese
401fd04379 Fix minor media bugs 2020-05-29 08:51:27 +03:00
Matias Griese
4fd54f1692 Added MediaUploadTrait 2020-05-28 17:31:49 +03:00
Matias Griese
9565994e5c Move image loading() method into trait 2020-05-28 15:21:03 +03:00
Matias Griese
6876e1a38a Merge branch '1.7' of github.com:getgrav/grav into feature/1.7-media 
 Conflicts:
	system/src/Grav/Common/Page/Medium/ImageMedium.php
 2020-05-28 15:16:43 +03:00
Matias Griese
7a8e737802 Minor code updates 2020-05-27 13:25:26 +03:00
Andy Miller
9f968611b1 typo 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-05-26 08:36:40 -06:00
Andy Miller
3bd4f9499a cherry picked #1925 fix from 1.7 to 1.6 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-05-26 08:35:49 -06:00
Andy Miller
069ef7b12c Fixed system.pages.hide_empty_folders #2925 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-05-26 08:32:03 -06:00
Andy Miller
9d6207f80e update changelog 
Signed-off-by: Andy Miller <rhuk@mac.com>
 2020-05-26 08:17:19 -06:00