Commit Graph

7920 Commits

Author SHA1 Message Date
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
f9f8cb8b1f Merge branch 'release/1.3.10' 1.3.10 2017-12-06 06:43:37 -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
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
Matias Griese
b97ac503a1 Add filter for item-list type (removes empty items from the list) 2017-11-28 14:57:53 +02:00
Agustin Villalba
2cc34151df Fixed issue #1742 where the creation of GPM object tried to connect to Remote repositories even if only Local package was needed (#1746)
All good, thanks!
2017-11-27 21:15:09 -07:00
Iain Gillis
4c160533c2 Add additional controls to HTML5 audio attributes (#1756)
Adds support for `autoplay`, `controls`, `loop`, and `preload` attributes, with rudimentary validation for preload.

Those for `autoplay`, `controls`, and `loop` are copied directly from pfcloutier-druide/aaa3f82

See also #1442.
2017-11-27 21:12:56 -07:00
Matias Griese
59dd0d1212 Fixed CSS Pipeline failing with Google remote fonts if the file was minified (#1261) (#1763)
* Fixed CSS Pipeline failing with Google remote fonts if the file was minified (#1261)

* Assets: Make tag check ungreedy again -- inline js may have tags in the content
2017-11-27 21:12:33 -07:00
Andy Miller
3bf7e38e52 Updated changelog 2017-11-27 18:30:10 -07:00
Andy Miller
362ee4c9eb Fix for URL encoding with Multibyte folders 2017-11-27 18:27:18 -07:00
Andy Miller
2462331884 Fix for MB Markdown links #1749 2017-11-27 18:21:08 -07:00
Matias Griese
ddd451b94c Merge branch 'develop' of https://github.com/getgrav/grav into 2.0 2017-11-17 08:04:41 +02:00
Matias Griese
cb4147a4bd Fixed token creation issue with Uri params like /id:3 2017-11-17 08:03:58 +02:00
Wensheng Yan
72f3a01abf Update Cache.php (#1745)
make sure find resource return valid path.
2017-11-15 18:35:44 -07:00
Matias Griese
aa2341dfb5 Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
# Conflicts:
#	system/src/Grav/Common/User/User.php
2017-11-13 09:48:35 +02:00
Matias Griese
31e3c1c295 Remove support for config.user, it was broken and bad practise 2017-11-10 22:07:29 +02:00
Andy Miller
37891a1032 Minor optimizations 2017-11-08 05:34:42 -07:00
Andy Miller
70284e1517 Sort using folder name #1740 2017-11-07 18:38:35 -07:00
Andy Miller
0bca1dcb48 Fix for custom_base_url issues #1736 2017-11-07 17:50:06 -07:00
Andy Miller
36f9865c0b Couple of utility functions 2017-11-07 17:44:40 -07:00
Matias Griese
cd48551630 Fix changelog 2017-11-07 17:00:34 +02:00
Matias Griese
0ff130650f Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 16:57:59 +02:00
Matias Griese
9b445ac5b6 Fixed "Invalid AJAX response" When using Built-in PHP Webserver in Windows (#1258) 2017-11-07 16:57:52 +02:00