Matias Griese
7c19d1520d
Tweaked script/style tag formatting
2017-10-31 20:02:26 +02:00
Matias Griese
84789cbcd4
Added {% script %} and {% style %} tags for Twig templates
2017-10-31 16:50:05 +02:00
Matias Griese
586fcf42ab
Added {% try %} ... {% catch %} Error: {{ e.message }} {% endcatch %} tag to allow basic exception handling inside Twig
2017-10-30 13:33:45 +02:00
Matias Griese
18c597b3d2
Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
2017-10-27 11:49:43 +03:00
Andy Miller
e9e4106d22
Merge tag '1.3.8' into develop
...
Release v1.3.8
2017-10-26 18:37:27 -06:00
Andy Miller
acea401a3d
Merge branch 'release/1.3.8'
2017-10-26 18:37:27 -06:00
Andy Miller
0ec7158102
Prepare for release
2017-10-26 18:37:17 -06:00
Matias Griese
d00d8cb668
Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
...
# Conflicts:
# CHANGELOG.md
2017-10-25 11:07:39 +03:00
Andy Miller
d3695b2faa
Fixed missing image file not throwing 404 p#1713
2017-10-23 16:19:08 -06:00
Andy Miller
0668a47758
Fixed GPM update issue with filtered slugs #1711
2017-10-23 16:13:22 -06:00
Andy Miller
ca645ef476
updated changelog
2017-10-19 22:13:36 -04:00
Andy Miller
3ff5f79561
Added manual order capability to Page media
2017-10-19 22:10:12 -04:00
Djamil Legato
b5c8b70163
More media order changes
2017-10-19 18:01:37 -04:00
Djamil Legato
173a70c017
Updated default yaml with media order
2017-10-19 17:39:10 -04:00
Djamil Legato
ae143814fb
Updated default with new media order
2017-10-19 17:37:29 -04:00
Benoît Rouleau
eb52f670b9
fix nonsense logic ( #1709 )
2017-10-19 16:53:31 -04:00
Sam
dd166ce25c
Update CONTRIBUTING.md copywriting ( #1706 )
2017-10-19 09:19:03 -04:00
Andy Miller
ea6423226a
Merge branch 'release/1.3.7'
2017-10-18 16:35:41 -04:00
Andy Miller
85bf4406ed
Merge tag '1.3.7' into develop
...
Release v1.3.7
2017-10-18 16:35:41 -04:00
Andy Miller
0cb8e0664e
Prepare for release
2017-10-18 16:35:27 -04:00
Matias Griese
98dca95c15
Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
...
# Conflicts:
# CHANGELOG.md
2017-10-18 09:16:46 +03:00
Matias Griese
2842b8fa39
Fixed routing paths with urlencoded spaces and non-latin letters ( #1688 )
2017-10-17 14:40:30 +03:00
Matias Griese
317615854a
Uri: Prefer using REQUEST_SCHEME instead of HTTPS ( #1698 )
2017-10-17 13:34:25 +03:00
Matias Griese
a9c82710a6
Regression: base_url_absolute always has the port number ( #1690 )
2017-10-16 12:36:06 +03:00
Matias Griese
3856a2a719
Add unit test for #1688
2017-10-16 11:13:25 +03:00
Viktor
880128c339
Update Grav Console Cli InstallCommand.php ( #1692 )
...
why do I have to clone the entire history of the plugin?
2017-10-13 08:34:39 -06:00
Matias Griese
731fe500ee
Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
...
# Conflicts:
# CHANGELOG.md
2017-10-13 11:41:10 +03:00
Andy Miller
444b48f788
Merge branch 'release/1.3.6'
2017-10-12 12:26:29 -06:00
Andy Miller
cc69591799
Merge tag '1.3.6' into develop
...
Release v1.3.6
2017-10-12 12:26:29 -06:00
Andy Miller
0d6f774386
Prepare for release
2017-10-12 12:26:12 -06:00
Andy Miller
474ca513ae
Fix for nginx and _url issue
...
[admin#1244](https://github.com/getgrav/grav-plugin-admin/issues/1244 )
2017-10-12 12:23:49 -06:00
Matias Griese
f37c08f341
Regression: Ajax error in ngnix ( #1244 )
2017-10-12 21:18:34 +03:00
Matias Griese
92afba0e28
Add test case for #1244
2017-10-12 18:36:10 +03:00
Matias Griese
c7be8ebb22
Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
2017-10-12 10:50:08 +03:00
Andy Miller
974fc552c5
Added another complex test
2017-10-11 19:24:16 -06:00
Andy Miller
d39ff74dd7
Merge branch 'release/1.3.5'
2017-10-11 14:49:28 -06:00
Andy Miller
9e1170bd50
Merge tag '1.3.5' into develop
...
Release v1.3.5
2017-10-11 14:49:28 -06:00
Andy Miller
081489dc6e
Prepare for release
2017-10-11 14:49:16 -06:00
Andy Miller
710cd23bf9
updated changelog
2017-10-11 14:46:24 -06:00
Andy Miller
296a1fbc7d
Override system.media.upload_limit with PHP's post_max_size or upload_max_filesize
2017-10-11 14:23:28 -06:00
Andy Miller
68503e117e
Fix for logout nonce
2017-10-11 14:13:51 -06:00
Andy Miller
4d32b1dbbe
updated changelog
2017-10-11 11:19:35 -06:00
Andy Miller
156588a75c
Fix for bugs arising from last PR merge
2017-10-11 11:15:37 -06:00
Paul Massendari
df63a85f3e
Specify type in inlineJS ( #1683 )
...
This commit allows users to specify type to inlineJS via a 4th parameter .
This might be useful for those who would like to output encoded json microdata which require to use
<script type="application/ld+json"> to be valid.
Exemple usage: $assets->addInlineJs($outputjson, 100,'', "application/ld+json");
which will output: <script type="application/ld+json">
2017-10-11 11:05:01 -06:00
Fabien Villepinte
7ccba91792
Method Grav\Console\Gpm\InstallCommand::processPackage() invoked with 3 parameters, 1-2 required. ( #1682 )
2017-10-11 11:03:09 -06:00
Andy Miller
e23d245091
URI class improvements ( #1681 )
...
* Clean up and simplify Uri code
* Rewrite and clean up Uri class (fixes broken test cases)
* Fix some more Uri bugs based on new unit tests
* Removed double encoding
* Added html_entity_decode on params to handle UTF8 chars
* Uri: Fix protocol/host omitting URLs and default ports
* Added support for `$uri->toArray()` and `(string)$uri`
* Fixed bug in `Uri::buildParams()` causing parameters to be repeated
* Fixed double // in `Uri::addNonce()` when URL ends to slash, added tests for nonce
* Fixed nonce generation for URLs which contain query params or anchor
* Added a test for UTF-8 params
* Removed troublesome test!
2017-10-11 10:29:51 -06:00
Matias Griese
4dde506216
Add Uri tests for some more attacks
2017-10-05 20:31:06 +03:00
Matias Griese
c532cb7d45
Update Uri tests (including 11 failing tests)
2017-10-05 19:25:18 +03:00
Matias Griese
4e6738cbc5
Composer update
2017-10-04 15:24:45 +03:00
Matias Griese
0d4a5a22c8
Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
...
# Conflicts:
# CHANGELOG.md
# composer.lock
# system/src/Grav/Common/Twig/TwigExtension.php
2017-10-04 13:09:31 +03:00
