5620 Commits

Author SHA1 Message Date
Flavio Copes
8cda9a08da Improve Assets class code style 2016-01-22 13:10:33 +01:00
Flavio Copes
684503245c Call addCss & addJs instead of add(), as otherwise it will lose group and loading information 2016-01-22 12:59:22 +01:00
Matias Griese
7760f541fb Blueprint refactor: Fix page blueprints 2016-01-22 13:04:32 +02:00
Matias Griese
4f73fd62c9 Blueprint refactor: Fix missing dynamic properties 2016-01-22 12:49:19 +02:00
Flavio Copes
77c8458fbf 🐛 Fix addJs and addCSS problem
Changes supported by tests in
https://github.com/getgrav/grav/commit/27af9432e0fa9a7abb2b6a2e3f3a6f6d1
55a37e9
2016-01-22 10:43:41 +01:00
Matias Griese
80d0c2a405 Blueprint refactor: fix theme thumbnails 2016-01-22 10:07:40 +02:00
Flavio Copes
774cf2d6d0 Recreated an issue in calling with an array of values {% do assets.addJs('jquery', {'loading':'async'}) %} introduced in d5bd99b363 2016-01-22 00:09:14 +01:00
Flavio Copes
8270edbc78 Fix loading js and css from collections
Calling add() lose information on

- CSS: $group
- JS: $loading, $group
2016-01-21 21:24:26 +01:00
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
a9ec2af342 Remove any URL extension for the home link 2016-01-21 12:31:20 +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
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
Matias Griese
9a4830808d Refactor Blueprints class 2016-01-21 10:11:57 +02:00
Flavio Copes
1616fadfe9 Started testing assets 2016-01-20 10:55:31 +01:00
Andy Miller
e801c8f44e Added support for absolute_urls: true and page level ssl 2016-01-19 15:48:18 -07:00
Andy Miller
4fa04f6eec added scheme to URI 2016-01-19 15:46:09 -07:00
Andy Miller
f308587624 add SSL page variable and also force include_host if absolute_urls: true 2016-01-19 15:45:51 -07:00
Flavio Copes
235b7e5ff3 Document Browser 2016-01-19 13:49:39 +01:00
Flavio Copes
68c582a02a Use unused $locator var 2016-01-19 13:38:03 +01:00
Flavio Copes
d0ef86c9a8 Remove unused variables 2016-01-19 13:37:56 +01:00
Flavio Copes
0349169097 Add utility method 2016-01-19 13:15:55 +01:00
Flavio Copes
09e1c844f4 Ensure consistency in port handling, always set as string and not as integer 2016-01-19 11:38:06 +01:00
Flavio Copes
90568da797 Fix setting port 2016-01-18 13:30:06 +01:00
Flavio Copes
d29bc41ae7 Formatting 2016-01-18 11:17:12 +01:00
Flavio Copes
25637defa8 Set default port if not set 2016-01-18 11:17:04 +01:00
Flavio Copes
82616b9891 Return self instance in initializeWithUrl() to allow chaining method calls 2016-01-18 11:16:49 +01:00
Flavio Copes
067f75389b Fix reset after recent merge 2016-01-18 10:09:01 +01:00
Flavio Copes
0e6132800e Merge branch 'develop' into feature/introduce-testing 2016-01-18 09:59:52 +01:00
Andy Miller
77d4925f38 Added shortcode square brackets to grav trait 2016-01-16 17:54:43 -07:00
Flavio Copes
092989cdd0 Some internal rework of the Uri class
- Reworked constructor in methods
- Aded a Uri::initializeWithUrl() method that takes care of
initializing the internal state based on the passed URL
- Ensure Uri::query() does not crash if the internal variable is not an
array but `null`
2016-01-15 21:46:18 +01: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
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
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
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