Commit Graph

3939 Commits

Author SHA1 Message Date
Andy Miller
e9b7c8dad2 Merge branch '1.4' of https://github.com/getgrav/grav into 1.4
# Conflicts:
#	CHANGELOG.md
2017-12-15 15:13:29 -07:00
Andy Miller
b6e5bfa7f3 Fixed BadMethodException in GPM updates #1784 2017-12-15 15:12:26 -07:00
Matias Griese
fb106b1106 Removed constructor from ObjectInterface 2017-12-15 21:31:40 +02:00
Matias Griese
34e3be710f Merge branch 'develop' of https://github.com/getgrav/grav into 1.4
# Conflicts:
#	composer.lock
2017-12-15 21:28:51 +02:00
Andy Miller
21674194e0 Updated changelog 2017-12-13 22:19:43 -07:00
Andy Miller
aadb8bb2ea Added some new theme twig functions 2017-12-13 21:51:06 -07:00
Andy Miller
af1465278d Updated vendor libraries to latest 2017-12-12 11:55:10 -07:00
Andy Miller
a8f5468f6a Updated vendor libs 2017-12-12 11:54:01 -07:00
Andy Miller
592c3ea5e2 Merge branch '1.4' of https://github.com/getgrav/grav into 1.4 2017-12-12 11:29:51 -07:00
Andy Miller
97b088b959 Updated welcome page 2017-12-12 11:29:02 -07:00
Matias Griese
3fec18e5e5 Composer update 2017-12-12 12:47:12 +02:00
Matias Griese
b15c5d7888 Merge branch 'develop' of https://github.com/getgrav/grav into 1.4 2017-12-12 12:45:14 +02:00
Matias Griese
24898de2ba Force composer to use PHP 5.5.9 compatible libraries, add composer security advisories check 2017-12-12 12:44:01 +02:00
Andy Miller
d629391ad9 updated changelog 2017-12-11 15:08:20 -07:00
Andy Miller
7ec66b2bf2 Transferred copyright 2017-12-11 15:08:05 -07:00
Andy Miller
b5f75acf50 Fix array casting with DOM elements 1.4.0-beta.1 2017-12-11 13:17:03 -07:00
Djamil Legato
255f2f1db6 Changed GPM channel to testing 2017-12-11 11:56:07 -08:00
Djamil Legato
d34fad65b5 Removed Page interfaces 2017-12-11 11:49:19 -08:00
Djamil Legato
8d82fce89f Updated version to 1.4.0-beta.1 2017-12-11 11:46:30 -08:00
Matias Griese
bfd8a087bf Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
# Conflicts:
#	CHANGELOG.md
#	system/defines.php
2017-12-11 20:54:33 +02:00
Djamil Legato
cc648b885c Updated grav version for 2.0 branch 2017-12-08 18:14:04 -08:00
Andy Miller
6628bbbe2f Fix for illegal offset scheme errors 2017-12-08 11:52:48 -07:00
Andy Miller
70f6529e32 Merge tag '1.3.10' into develop
Release v1.3.10
2017-12-06 06:43:37 -07:00
Andy Miller
f9f8cb8b1f Merge branch 'release/1.3.10' 1.3.10 2017-12-06 06:43:37 -07:00
Andy Miller
671e0d47ea Prepare for release 2017-12-06 06:43:28 -07:00
Andy Miller
e9f493096b Updated changelog 2017-12-06 06:43:03 -07:00
Andy Miller
ee2f5663c4 Revert "Fixed issue #1742 where the creation of GPM object tried to connect to Remote repositories even if only Local package was needed (#1746)"
This reverts commit 2cc34151df.
2017-12-06 06:41:47 -07:00
Andy Miller
d4204f13f8 Merge branch 'release/1.3.9' 1.3.9 2017-12-05 17:16:13 -07:00
Andy Miller
1a477609be Merge tag '1.3.9' into develop
Release v1.3.9
2017-12-05 17:16:13 -07:00
Andy Miller
0554b25c78 Prepare for release 2017-12-05 17:16:05 -07:00
Andy Miller
f4e7cbaa6e updated changelog 2017-12-05 17:15:28 -07:00
Andy Miller
83bfc1fd0f Added support for intl_enabled option 2017-12-05 17:03:05 -07:00
Andy Miller
30439b864d Added a quick type test for #1764 2017-12-05 11:04:59 -07:00
Andy Miller
80999121a9 Potential fix for #1764 2017-12-05 10:51:44 -07:00
Andy Miller
ca0d0bb373 Added a comment 2017-12-05 10:50:39 -07:00
Andy Miller
345578a05d Force field.multiple: true for checkboxes to use min/max rules 2017-12-04 22:32:26 -07:00
Andy Miller
1f0537124a Merge branch 'develop' of https://github.com/getgrav/grav into develop 2017-12-04 18:14:25 -07:00
Andy Miller
2a2b9a12a7 Fix for checkbox validation form#216 2017-12-04 18:14:20 -07:00
Iain Gillis
5a19e05931 Fix typo (#1770) 2017-12-02 22:08:55 -07:00
Matias Griese
acbc85773c Merge remote-tracking branch 'origin/2.0' into 2.0 2017-12-01 20:41:25 +02:00
Djamil Legato
b2fc101078 Merge branch 'develop' into 2.0 2017-12-01 10:41:06 -08:00
Matias Griese
d943c559e2 Merge branch 'develop' of https://github.com/getgrav/grav into 2.0 2017-12-01 20:40:36 +02:00
Andy Miller
6ae4680fcb Move system twig templates to last 2017-12-01 11:38:38 -07:00
Matias Griese
0524bd2083 Merge branch 'develop' of https://github.com/getgrav/grav into 2.0 2017-12-01 14:49:26 +02:00
Andy Miller
b4cf7899bb cleanup 2017-12-01 00:01:23 -07:00
Andy Miller
eac16911d0 Added new core twig templates 2017-11-30 18:31:13 -07:00
Andy Miller
21bef62b82 Added get and set FlashCookieObject() methods 2017-11-30 18:28:25 -07:00
Matias Griese
66d8269a1b Merge branch 'develop' of https://github.com/getgrav/grav into 2.0 2017-11-29 10:46:46 +02:00
Andy Miller
a1eccfdb61 Updated changelog 2017-11-28 12:58:04 -07:00
Matias Griese
90e05694d3 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 14:58:07 +02:00