Commit Graph

2583 Commits

Author SHA1 Message Date
Matias Griese
16d532bb2e Blueprints: Fix empty values in admin fields 2016-02-29 14:17:00 +02:00
Matias Griese
7e4619e0a3 Merge branch 'develop' of https://github.com/getgrav/grav into feature/blueprints-update
# Conflicts:
#	system/src/Grav/Common/Data/Blueprint.php
#	system/src/Grav/Common/Data/Blueprints.php
#	system/src/Grav/Common/Data/Validation.php
#	system/src/Grav/Common/Plugins.php
2016-02-29 13:46:08 +02:00
Matias Griese
8f5a30cc50 Blueprints: Fix for page blueprints 2016-02-29 13:14:16 +02:00
Matias Griese
2be8de4283 BlueprintForm: Add support for dynamic fields 2016-02-26 11:32:14 +02:00
Djamil Legato
afa7d541ec Fixed notice when running through CLI 2016-02-25 17:44:17 -08:00
Djamil Legato
de8302aafa Include the current Grav version when pinging GPM server 2016-02-25 17:08:06 -08:00
Andy Miller
d43c10189b removed extraneous option 2016-02-25 11:53:34 -07:00
Flavio Copes
74e4e4d6ee Minor code improvement 2016-02-25 17:21:07 +01:00
Flavio Copes
db7da685ae Merge pull request #659 from getgrav/feature/reset-grav-every-test
Reinitialize Grav on every test
2016-02-25 17:03:06 +01:00
Flavio Copes
aa1b716469 Fix $grav property initialization in tests 2016-02-25 16:59:39 +01:00
Flavio Copes
6791244e38 Merge branch 'develop' into feature/reset-grav-every-test 2016-02-25 16:52:56 +01:00
Matias Griese
979cf2061c Redo form field reordering in BlueprintForm class 2016-02-25 17:09:50 +02:00
Andy Miller
5c2318da28 handles charset in metadata 2016-02-24 15:24:21 -07:00
Andy Miller
85c8072cec Added a couple of missing cache methods - #693 2016-02-24 14:53:50 -07:00
Andy Miller
f74562987d Fix for pure URL fragment getting Url prepended - #701 2016-02-24 14:45:57 -07:00
Matias Griese
5c4c7402fa Restructure blueprint classes (incomplete) 2016-02-24 21:36:40 +02:00
Andy Miller
89fbd4c2bf Added a regex_replace twig filter/function 2016-02-24 12:07:21 -07:00
Andy Miller
f93dc7d8ae Merge pull request #699 from getgrav/feature/add-x-ua-compatible-to-http_equiv
Add x-ua-compatible to http_equiv processing
2016-02-23 09:01:06 -07:00
Flavio Copes
396a694005 Add x-ua-compatible to http_equiv processing 2016-02-23 15:06:33 +01:00
Matias Griese
02d2b05a47 Context is no more needed in Blueprint class 2016-02-22 19:58:43 +02:00
Matias Griese
024ae68782 Blueprints: Move duplicated extends@ logic into BlueprintForm class 2016-02-22 19:57:42 +02:00
Matias Griese
30b7aaf2b1 Merge branch 'develop' of https://github.com/getgrav/grav into feature/blueprints-update 2016-02-22 11:33:59 +02:00
Matias Griese
86be0b3f34 Remove deprecated import@ from Blueprint class 2016-02-22 11:33:28 +02:00
Andy Miller
f3a44e39b1 Merge pull request #695 from Vivalldi/feature/tests
Adding Tests - On going
2016-02-21 21:18:45 -07:00
Tyler Cosgrove
01af9dfc46 More TwigExtension Tests 2016-02-21 22:18:26 -05:00
Tyler Cosgrove
8051debdcc Change Monthize doc
All results turn 181 to 5 and not 6.
2016-02-21 21:22:19 -05:00
Tyler Cosgrove
bd14963992 Add more TwigExtension tests 2016-02-21 21:18:59 -05:00
Tyler Cosgrove
592fc1b471 Merge remote-tracking branch 'upstream/develop' into develop 2016-02-19 14:10:33 -05:00
Tyler Cosgrove
5ee4eafd5f More Inflector Tests 2016-02-19 14:09:43 -05:00
Matias Griese
ebe46f1482 Implement import@ in BlueprintForm class 2016-02-19 20:06:41 +02:00
Andy Miller
59fc6c20e8 added a test for new Twig function 2016-02-19 10:50:54 -07:00
Andy Miller
80f9c5782a Added function to allow you to add variable key/value pairs into an array 2016-02-19 10:35:43 -07:00
Matias Griese
37799fd173 Extend blueprints by using new BlueprintForm class 2016-02-19 14:49:48 +02:00
Matias Griese
17f6a9b877 Fix context on page blueprints 2016-02-19 13:43:32 +02:00
Matias Griese
0b53d39cdb Refactor Blueprints object creation 2016-02-19 11:56:09 +02:00
Matias Griese
989f5bb129 Fix import@ in Blueprint 2016-02-18 20:45:17 +02:00
Flavio Copes
75ea201e31 Merge pull request #686 from Vivalldi/develop
Add InflectorTest
2016-02-18 16:31:13 +01:00
Matias Griese
1263a0bcab Always use the same Blueprint class 2016-02-18 17:09:27 +02:00
Matias Griese
931d08b46d Composer update 2016-02-18 15:40:09 +02:00
Matias Griese
fb32805f69 Blueprint extend: Implement better way to extend blueprint 2016-02-18 15:06:57 +02:00
Matias Griese
be297677e8 Blueprint extend: Fix extending blueprints for configuration 2016-02-18 14:16:37 +02:00
Tyler Cosgrove
1d90107a5a Fix Humanize Test 2016-02-17 18:27:40 -05:00
Tyler Cosgrove
10758eecd1 Add InflectorTest 2016-02-17 18:11:46 -05:00
Matias Griese
2ba5517d4c Merge remote-tracking branch 'origin/feature/blueprints-update' into feature/blueprints-update 2016-02-16 13:58:26 +02:00
Matias Griese
3a0a20ab97 Blueprint extend: Add blueprint special types support 2016-02-16 13:58:13 +02:00
Flavio Copes
a683f661ed Add truncate and truncateHtml tests for input type 2016-02-15 14:39:28 +01:00
Flavio Copes
1c382a1bc6 Fix assertEquals parameters order 2016-02-15 14:39:03 +01:00
Flavio Copes
1e6e9bbbb4 Merge branch 'develop' into feature/blueprints-update 2016-02-15 10:57:01 +01:00
Matias Griese
a4c817147b Merge branches 'develop' and 'feature/blueprints-update' of https://github.com/getgrav/grav into feature/blueprints-update 2016-02-15 11:20:08 +02:00
Matias Griese
ed3c1c7b3a Blueprint extend: reverse order of the multi-extend 2016-02-15 11:19:46 +02:00