Commit Graph

2194 Commits

Author SHA1 Message Date
Andy Miller
6e2d9ca3cc Merge branch 'release/1.0.7' into develop 2016-01-07 14:21:56 -07:00
Andy Miller
eff72b73ab version update 2016-01-07 14:21:48 -07:00
Andy Miller
eb29d68958 Safety check for array of nonces 2016-01-07 14:10:58 -07:00
Andy Miller
e0632dee09 Merge branch 'release/1.0.7' into develop 2016-01-07 13:27:02 -07:00
Andy Miller
0866a62a1f version update 2016-01-07 13:26:53 -07:00
Andy Miller
1a7fd382a9 Merge branch 'feature/https_gpm_urls' into develop 2016-01-07 13:23:43 -07:00
Flavio Copes
cdc96ca574 Improve comment messages for temporary nonce methods 2016-01-07 11:59:40 +01:00
Andy Miller
d121aa3415 Use https for GPM rather than http 2016-01-06 21:54:43 -07:00
Djamil Legato
6aaeb9e1f1 Fixed typo 2016-01-06 16:24:11 -08:00
Andy Miller
fa39629104 changelog updates 2016-01-06 17:10:00 -07:00
Andy Miller
9e13593c11 Merge pull request #592 from getgrav/feature/fix-nonces-ips
Fix nonces for proxied IPs
2016-01-06 15:47:21 -07:00
Flavio Copes
0b3970d7c1 Restore old generateNonceString in generateNonceStringOldStyle 2016-01-06 23:43:18 +01:00
Flavio Copes
95c09f2ce5 Add HTTP_CLIENT_IP too 2016-01-06 23:34:28 +01:00
Flavio Copes
c78619aad3 Temp generation of older token for this release only 2016-01-06 23:19:00 +01:00
Flavio Copes
566da30513 Fix getting the user's IP address when proxied 2016-01-06 23:15:06 +01:00
Djamil Legato
f8c8ac4371 Response Class: Following redirects when open_basedir is set 2016-01-06 13:31:50 -08:00
Andy Miller
3c4dd26c20 Fix for media with + in the name 2016-01-05 15:45:58 -07:00
Andy Miller
f5fc509f14 Added cache driver setting to debug out 2016-01-05 14:59:24 -07:00
Andy Miller
2d00203a1f updated changelog 2016-01-05 12:08:44 -07:00
Flavio Copes
ac23ab21b8 Merge pull request #587 from jeromegamez/readme-changelog
Update README and CHANGELOG
2016-01-05 11:57:43 +01:00
Jérôme Gamez
0261df0d48 Update README and CHANGELOG 2016-01-05 11:17:22 +01:00
Andy Miller
2709938f9f Merge pull request #586 from jeromegamez/feature/composer-branch-alias
composer.json: Add branch alias - fine with this :) 👍
2016-01-04 17:37:08 -07:00
Jérôme Gamez
53e1c790d8 Add branch alias 2016-01-05 01:24:17 +01:00
Andy Miller
f2f9fc4ed6 Merge pull request #585 from jeromegamez/feature/composer-project
Allow grav to be installed as a composer project
2016-01-04 16:51:08 -07:00
Jérôme Gamez
3cbf9c7101 Allow grav to be installed as a composer project 2016-01-04 23:55:16 +01:00
Flavio Copes
c655d9e8fc Revert "Merge pull request #571 from getgrav/feature/gpm-avoid-reinstalling-already-installed-packages"
This reverts commit 418f0972a9, reversing
changes made to 9a777efd52.
2016-01-04 20:50:15 +01:00
Andy Miller
2ef7f7cf36 Merge branch 'feature/hide_home_in_urls' into develop 2016-01-04 11:14:57 -07:00
Andy Miller
418f0972a9 Merge pull request #571 from getgrav/feature/gpm-avoid-reinstalling-already-installed-packages
Command line GPM: Avoid prompting to reinstall already installed packages
2016-01-04 10:36:10 -07:00
Andy Miller
9a777efd52 Merge pull request #569 from getgrav/feature/improve-gpm-unreachable-error-message
Improve error when trying to install a plugin/theme from the command line and GPM is unreachable
2016-01-04 10:30:22 -07:00
Andy Miller
aa8a329c7b Merge pull request #557 from getgrav/feature/use-rawurldecode
Allows '+' in the URLs, such as http://localhost/grav/blog/tag:c++
2016-01-04 10:19:18 -07:00
Andy Miller
e4930a144f Merge pull request #554 from getgrav/feature/session-improvements
Add secure and httponly parameters to sessions
2016-01-04 09:54:49 -07:00
Matias Griese
194014007f Merge pull request #583 from getgrav/feature/fix-checksum
Call finalizeObject on Config from loadCompiledFile() when cache is already built
2016-01-04 15:22:24 +02:00
Matias Griese
dc8f2c1466 Fixed page blueprints and theme inheritance issue (#534) 2016-01-04 15:18:50 +02:00
Flavio Copes
6ee48c74f7 Call finalizeObject on Config from loadCompiledFile() when cache is already built
finalizeObject, which assigns the checksum to the Config object, was
never called after the cache was built
2016-01-03 19:10:17 +01:00
Flavio Copes
136a9e8218 Also check for GPM permissions. Fixes #579 2016-01-02 16:25:31 +01:00
Andy Miller
34045ea62b whitespace removal 2016-01-01 17:27:28 -07:00
Andy Miller
267edbee7d optimization 2015-12-31 16:25:27 -07:00
Andy Miller
da882ebcd2 set twig_first: false by default due to modular pages 2015-12-31 15:35:54 -07:00
Andy Miller
ed0ba1ed98 Merge pull request #577 from mholt/patch-1
Update Caddyfile
2015-12-31 12:42:11 -07:00
Matt Holt
ef9dd3aa28 Update Caddyfile
fastcgi was using php preset defaults, anyway
2015-12-31 12:40:56 -07:00
Andy Miller
73b9abd38b Added a global setting for twig_first processing, and set it to true (was false) 2015-12-31 12:25:22 -07:00
Andy Miller
6e399fe0ed maintain md5 keys during sorting process #566 2015-12-31 12:06:46 -07:00
Andy Miller
5f9ed17091 Added support for APCu and PHP 7.0 2015-12-31 11:47:50 -07:00
Flavio Copes
1f4b3913b6 Typo in changelog 2015-12-31 12:32:10 +01:00
Andy Miller
dc9b9509d7 Moved onPageContentProccessed into content building section so it's fired more reliably 2015-12-30 16:28:02 -07:00
Andy Miller
b4f34c8643 Added plugins config to debugger 2015-12-30 16:26:59 -07:00
Andy Miller
52544a8b25 Fix for not fully reprocessing content with cache_enable: false 2015-12-30 15:44:42 -07:00
Flavio Copes
017500a6b5 Add a Page::topParent() method to retrieve the topmost parent of a page
Adding to this branch as it's needed for the Admin change that handles
this branch change
2015-12-29 19:10:30 +01:00
Andy Miller
425ae30e62 fix for attributes on external urls 2015-12-29 09:56:13 -07:00
Andy Miller
1aa09d8987 Merge branch 'develop' of https://github.com/getgrav/grav into develop 2015-12-28 15:49:25 -07:00