Commit Graph

2241 Commits

Author SHA1 Message Date
Matias Griese
b791e8efda Blueprint refactor: fix site blueprint 2016-01-21 15:38:12 +02:00
Matias Griese
130d039101 Merge branch 'feature/plugin-early' of https://github.com/getgrav/grav into feature/blueprints-update 2016-01-21 14:11:09 +02:00
Matias Griese
ebee88dd39 Update blueprints object version 2016-01-21 14:00:54 +02:00
Matias Griese
ad25462bd5 Merge branches 'develop' and 'feature/plugin-early' of https://github.com/getgrav/grav into feature/plugin-early
# Conflicts:
#	composer.lock
2016-01-21 13:58:48 +02:00
Flavio Copes
563a990f0d Also continue to handle Whoops 2.0.0-alpha if installed 2016-01-21 12:51:26 +01:00
Flavio Copes
1fdc34b43c PHPdoc 2016-01-21 12:07:28 +01:00
Flavio Copes
11dc04262b Fix Whoops APIs after updating Whoops to 2.0 2016-01-21 11:01:44 +01:00
Matias Griese
5e4070188b Merge branch 'feature/plugin-early' of https://github.com/getgrav/grav into feature/blueprints-update 2016-01-21 11:18:11 +02:00
Matias Griese
5c08439633 Update composer requirement for toolbox 2016-01-21 11:17:31 +02:00
Matias Griese
e686472eeb Merge branches 'develop' and 'feature/plugin-early' of https://github.com/getgrav/grav into feature/plugin-early 2016-01-21 11:15:22 +02:00
Matias Griese
152a3c4943 Merge branch 'develop' of https://github.com/getgrav/grav into feature/blueprints-update 2016-01-21 10:53:45 +02:00
Flavio Copes
82a4176816 Merge pull request #616 from Vivalldi/patch-2
Update Whoops to latest
2016-01-21 09:49:28 +01:00
Matias Griese
9a4830808d Refactor Blueprints class 2016-01-21 10:11:57 +02:00
Tyler Cosgrove
8406802a05 Change to next significant release 2016-01-19 14:46:30 -05:00
Tyler Cosgrove
778ae8aced Update Whoops to latest
Should have line highlights.
2016-01-19 14:15:12 -05:00
Andy Miller
00aefa50ed Merge pull request #609 from getgrav/feature/drop-password-compat
Remove ircmaxell/password-compat as it's intended to provide forward compatibility for PHP 5.4
2016-01-18 21:51:50 -07:00
Flavio Copes
0a76e46d8f Remove ircmaxell/password-compat as it's intended to provide backward compatibility for PHP 5.4
However, it will still be installed in `vendor` as required by
`rockettheme/toolbox`
2016-01-17 20:40:45 +01:00
Andy Miller
77d4925f38 Added shortcode square brackets to grav trait 2016-01-16 17:54:43 -07:00
Flavio Copes
e80a17540c Merge pull request #605 from getgrav/feature/modular-page-modified-date
The date for the last update of a page that is modular is the update time of the module that was last modified
2016-01-15 13:19:51 +01:00
Flavio Copes
72fb77894e Merge pull request #608 from hacklab01/patch-1
Update hr.yaml
2016-01-15 13:00:11 +01:00
Flavio Copes
70f8707b04 Blueprint for New Folder modal 2016-01-15 12:54:28 +01:00
v3d
0d33a1d479 Update hr.yaml
Update MONTHS_OF_THE_YEAR and DAYS_OF_THE_WEEK
2016-01-15 12:40:58 +01:00
Andy Miller
5d38e60076 Enhanced the bin/gpm info CLI command with CHANGELOG support - #559 2016-01-14 17:21:54 -07:00
Matias Griese
431f538536 Fix bug in Data:extra() 2016-01-14 12:59:48 +02:00
Andy Miller
fc08cb8e52 Updated Twig library 2016-01-13 17:43:19 -07:00
Andy Miller
d65ec29408 Moved logic into page recurse where pages are already recursed and use collection() 2016-01-13 17:42:56 -07:00
Andy Miller
758ef2313a Merge branch 'feature/fix-hide-home-in-urls-second-level-childs' into develop 2016-01-13 17:09:03 -07:00
Matias Griese
a118824cf5 Allow plugins to have their own blueprints 2016-01-13 11:00:53 +02:00
Andy Miller
479e73e950 Some optimizations/cleanup on CLI commands 2016-01-12 10:04:27 -07:00
Matias Griese
af6e352083 Fix stream override ordering 2016-01-12 11:59:45 +01:00
Matias Griese
5786530cda Fix stream override ordering 2016-01-12 12:53:54 +02:00
Flavio Copes
7e5b60917b Add ext-* to composer 2016-01-12 11:19:23 +01:00
Andy Miller
be2af197c3 Allow twig_vars to be exposed earlier and merged later 2016-01-11 16:18:57 -07:00
Matias Griese
9d983e7486 Feature: Load plugins early 2016-01-11 19:56:18 +02:00
Matias Griese
6087e786f5 Merge remote-tracking branch 'origin/develop' into develop 2016-01-10 17:19:30 +02:00
Matias Griese
9fa5681a4f Split configuration setup into 2 stages 2016-01-10 17:19:18 +02:00
Flavio Copes
182b6977bd The date for the last update of a page that is modular is the update time of the module that was last modified 2016-01-10 15:03:50 +01:00
Flavio Copes
3da7079777 Fix default generator metadata 2016-01-10 13:23:35 +01:00
Flavio Copes
992f99190b Merge pull request #604 from getgrav/feature/avoid-setting-empty-metadata
Avoid setting empty metadata
2016-01-09 23:40:42 +01:00
Flavio Copes
dfee5fdea9 Avoid setting empty metadata 2016-01-09 23:34:31 +01:00
Flavio Copes
aa9b735a50 Return the parent routes in the route options.
Added a Pages::parentsRawRoutes() method, uses the same internal method
as Pages::parents().

Refactored Pages::getList() to accept an optional $rawRoutes bool and
if set, return the raw routes
2016-01-09 20:45:06 +01:00
Andy Miller
9a3005e3c5 Added a reverse_proxy config option and use it to skip setting ports when enabled 2016-01-08 16:35:33 -07:00
Andy Miller
92ea756d91 fixed changelog typo 2016-01-08 16:34:19 -07:00
Andy Miller
5e84ca35f2 Merge branch 'release/1.0.8' into develop 2016-01-08 15:31:33 -07:00
Andy Miller
ee20bf70e0 version update 2016-01-08 15:31:23 -07:00
Andy Miller
8cb098c6e0 Removed IP stuff from nonce.. just too many scenarios where it causes problems. going to rely on session_id() for the uniqueness. 2016-01-08 15:28:03 -07:00
Andy Miller
3054a67078 Added rotate, flip and fixOrientation to available image methods 2016-01-07 18:49:09 -07:00
Andy Miller
6e2d9ca3cc Merge branch 'release/1.0.7' into develop 2016-01-07 14:21:56 -07:00
Andy Miller
eff72b73ab version update 2016-01-07 14:21:48 -07:00
Andy Miller
eb29d68958 Safety check for array of nonces 2016-01-07 14:10:58 -07:00