Commit Graph

3832 Commits

Author SHA1 Message Date
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
cc69591799 Merge tag '1.3.6' into develop
Release v1.3.6
2017-10-12 12:26:29 -06:00
Andy Miller
444b48f788 Merge branch 'release/1.3.6' 1.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' 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
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
a7c2505f36 Merge branch 'release/1.3.4' 1.3.4 2017-09-29 16:55:54 -06:00
Andy Miller
017e4373fb Merge tag '1.3.4' into develop
Release v1.3.4
2017-09-29 16:55:54 -06:00
Andy Miller
25b5becd1a prepare for release 2017-09-29 16:55:44 -06:00
Andy Miller
49013a0ed0 updated changelog 2017-09-29 16:55:02 -06:00
Newb I the Newbd
a861d57763 Fixed insecure session cookie initialization (#1656) 2017-09-28 17:57:14 -06:00
Andy Miller
a4ab5d9106 Fixed an issue where fallback was not supporting dynamic page generation 2017-09-28 16:00:57 -06:00
Andy Miller
442cb01adb cleanup 2017-09-28 15:57:25 -06:00
Andy Miller
c6793c1dee Updated vendor libs 2017-09-27 17:12:22 -06:00
Matias Griese
8b3949b7d9 Fixed nested object access by Object::getNestedProperty() 2017-09-27 10:13:26 +03:00
Matias Griese
a535e8547a Fix bug 2017-09-26 19:02:51 +03:00
Matias Griese
0fd6fda4d8 Add method ObjectCollection::collectionGroup() 2017-09-26 18:26:39 +03:00
Andy Miller
3b7a7d09a0 Missing thumbnail throwing error when adding .json file via media
https://github.com/getgrav/grav-plugin-admin/issues/1156
2017-09-25 13:21:15 -06:00
Matias Griese
71b11366bb Add support to serialize Object properties 2017-09-25 14:17:14 +03:00
Andy Miller
80901cecdb rebuilt composer.lock for PHP 5.5+ 2017-09-23 07:34:36 -06:00
Andy Miller
7f23828ece Revert "Removed markdowndocs from require-dev due to PHP 7 requirements"
This reverts commit 8e1dca4360.
2017-09-23 07:33:12 -06:00