Commit Graph

5744 Commits

Author SHA1 Message Date
Matias Griese
b31490e52d Merge branch 'develop' of https://github.com/getgrav/grav into 2.0 2017-11-06 10:28:10 +02:00
Matias Griese
0fd22ad933 Uri: Encode user and password to prevent issues in browsers 2017-11-06 10:26:17 +02:00
Matias Griese
980b2b67cd Code readability improvements 2017-11-06 10:18:22 +02:00
Andy Miller
fef6bdde5f Revert "Added system option to enable case insensitive urls. (#1638)"
This reverts commit 481fe1903e.
2017-11-02 14:48:42 -06:00
Viktor
2cd469cd7c Update CompiledFile.php (#1693)
const CACHE_DIR already defined with trailing slash

```php
define('CACHE_DIR', ROOT_DIR . 'cache/');
```
2017-11-01 17:20:38 -06:00
Matias Griese
cd15055280 Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
# Conflicts:
#	CHANGELOG.md
2017-11-01 07:48:45 +02:00
Matias Griese
3380577e40 Improved script/style tag parameter handling 2017-11-01 07:45:59 +02:00
Andy Miller
d9062b60d6 Merge branch 'develop' of https://github.com/getgrav/grav into develop 2017-10-31 16:36:47 -06:00
Andy Miller
3f4049031d use Event object in Page/Pages events 2017-10-31 16:36:43 -06:00
Andy Miller
c81ce71074 Fix active() + activeChild() to work with UTF-8 #1727 2017-10-31 16:36:13 -06:00
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
cofunin
f84ffd235b Fix ignoring media in modular.yaml (#1725) 2017-10-30 18:15:39 -06:00
Andy Miller
1ca6181856 Added onPageProcessed for dynamic addPage() calls 2017-10-30 16:19:13 -06:00
Andy Miller
f17954a5db Added a copy method to Medium object 2017-10-30 15:36:52 -06: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
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
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
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
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
0d6f774386 Prepare for release 2017-10-12 12:26:12 -06:00
Matias Griese
f37c08f341 Regression: Ajax error in ngnix (#1244) 2017-10-12 21:18:34 +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
081489dc6e Prepare for release 2017-10-11 14:49:16 -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
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
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
Andy Miller
15ec8fe303 Slight optimization to clean path 2017-10-03 21:05:32 -06:00
Andy Miller
2fb77bb4ad Also clean path with extra slashes and backslashes 2017-10-03 21:00:22 -06:00
Andy Miller
b8a0903b88 Deter XSS attacks via URI 2017-10-03 17:44:10 -06:00
Andy Miller
680a6c8983 Added a new http_status_code Twig function 2017-10-02 17:33:43 -06:00
Andy Miller
28b8628438 Updated clean command to remove extraneous files 2017-09-30 11:07:08 -06:00
Andy Miller
25b5becd1a prepare for release 2017-09-29 16:55:44 -06:00