Commit Graph

7920 Commits

Author SHA1 Message Date
Andy Miller
cc8a20537e Added support for redis password option #1620 2017-08-24 09:17:25 -06:00
Andy Miller
04690ce206 Use multilevel field to handle Asset Collections #1201 2017-08-24 07:57:56 -06:00
iusvar
7a7ffd3492 fix Twig dynamic translation (#1618)
* fix Twig dynamic translation

* fix Twig dynamic translation
2017-08-23 14:30:39 -06:00
Eihrister
667c4340d8 Changing back the default redirect code from 301 to 302. (#1619) 2017-08-23 14:29:18 -06:00
圈爷
39af36977e Quick Fix Summary issues (#1554)
* Quick Fix Summary issues

1. Calculate the string size without any html tags, so now you can get exactly what you wanted length;
2. Support utf8 2 character widths characters, like Chinese, Japanese;
3. This is a quick dirty mod, some associated functions should be rethinked;

* fix: Add an option to compatibel with old version

Now, you can use page.summary(10) as normal, or page.summary(10, true) to ignore all html tags and medias

* fit PS2R coding style

* psr-2 reformated without assignment align
2017-08-22 13:17:56 -06:00
Andy Miller
4cf5f00441 Added natsort on plugin load #1614 2017-08-22 11:22:13 -06:00
Matias Griese
96ee41a3dd Follow PSR-2 in Grav\Framework 2017-08-18 12:28:13 +03:00
Matias Griese
d15eb0e6ad Composer update 2017-08-17 10:01:42 +03:00
Matias Griese
c3066cd491 Merge branch 'develop' of https://github.com/getgrav/grav into 2.0 2017-08-17 09:59:29 +03:00
Andy Miller
85d1ed7255 Merge branch 'release/1.3.2' 1.3.2 2017-08-16 11:05:26 -06:00
Andy Miller
cafd371475 Merge tag '1.3.2' into develop
Release v1.3.2
2017-08-16 11:05:26 -06:00
Andy Miller
ebce5ecd31 Prepare for release 2017-08-16 11:05:12 -06:00
Matias Griese
557a3b80dd Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
# Conflicts:
#	composer.lock
2017-08-16 09:30:09 +03:00
Andy Miller
51c3b6d105 vendor updates 2017-08-15 16:26:12 -06:00
Matias Griese
f02b7a6028 Merge remote-tracking branch 'origin/develop' into develop 2017-08-15 14:55:48 +03:00
Matias Griese
828e1a54f1 Fixed parent theme auto-loading in child themes of Gantry 5 2017-08-15 14:55:40 +03:00
Djamil Legato
f89fe0ea1b Merge branch 'develop' into 2.0 2017-08-14 15:17:58 -07:00
Andy Miller
04d7945f10 Pushing default namespace 2017-08-14 16:17:27 -06:00
Matias Griese
ad5cddf222 Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
# Conflicts:
#	CHANGELOG.md
2017-08-14 20:15:43 +03:00
Andy Miller
4b948e2cbb Added a new Collection::intersect() method #1605 2017-08-11 13:41:46 -06:00
Andy Miller
122ded671c Merge branch 'develop' of https://github.com/getgrav/grav into develop 2017-08-11 11:17:11 -06:00
Andy Miller
c7c234d04a Added array_key_exists wrapper function 2017-08-11 11:17:05 -06:00
Andy Miller
a37582eb4c Added new events and paths to support namespacing #1604 2017-08-11 11:16:09 -06:00
Matias Griese
fb0e086f57 Composer: Force doctrine/cache to use v1.6 (with PHP 5.5 support) 2017-08-10 21:13:14 +03:00
Matias Griese
53611c8627 Composer: Use develop version of rockettheme/toolbox 2017-08-10 21:08:42 +03:00
Matias Griese
4776b0e6b5 Fixed Data::exists() and Data::raw() functions breaking if Data::file() hasn't been called with non-null value 2017-08-10 11:44:34 +03:00
Matias Griese
dbebd14391 Because of B/C issues, login/logout code needed to be moved into the Login plugin 2017-08-10 11:40:42 +03:00
Matias Griese
6e511d0b20 Improve login/logout logic 2017-08-08 17:50:26 +03:00
Matias Griese
9685ab4a18 Added $grav->login() and $grav->logout() functions with event hooks for plugins
Added events `onUserLoginAuthenticate`, `onUserLoginAuthorize`, `onUserLoginFailure`, `onUserLogin`, `onUserLogout`
2017-08-08 14:31:53 +03:00
Andy Miller
926d78d9cb updated changelog 2017-08-02 17:19:03 -06:00
naucon
7bfb316d6b Allow system.session.timeout field to be 0 (#1598) 2017-08-02 17:01:21 -06:00
Andy Miller
9168b192ff Added missing method access 2017-07-26 20:55:27 -06:00
Andy Miller
c2d22694f3 Updated with comparisons 2017-07-26 20:52:54 -06:00
Andy Miller
633a2a750f option to configure image cache clearing #1481 2017-07-26 12:53:16 -06:00
Andy Miller
13341c323d Added cache-control property #1591 2017-07-26 12:33:35 -06:00
mahagr
670f0ce1d9 Merge branch 'develop' of https://github.com/getgrav/grav into 2.0 2017-07-19 15:35:05 -06:00
Andy Miller
6fadaa0789 Added nicenumber twig filter 2017-07-19 14:28:57 -06:00
Andy Miller
1bfbb71767 Merge tag '1.3.1' into develop
Release v1.3.1
2017-07-19 12:15:39 -06:00
Andy Miller
66fc3ae8c5 Merge branch 'release/1.3.1' 1.3.1 2017-07-19 12:15:38 -06:00
Andy Miller
f6667077f3 Prepare for release 2017-07-19 12:15:30 -06:00
mahagr
039d2286fb Add Object::getKey() function 2017-07-18 15:37:04 -06:00
mahagr
0cde375953 Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
# Conflicts:
#	CHANGELOG.md
2017-07-18 15:34:41 -06:00
Tim Robbings
bbc4a23c86 Fix default sort order (#1575)
This appears to have broken page ordering.

Test-information:

Did a quick test on a personal project, clearing cache and reloading
the page fixed the default sort order of the navbar (i.e. it displayed
according to numeric folder prefixes).
2017-07-17 15:47:53 -06:00
Flavio Copes
c178b22c10 Check if medium thumbnail exists before resetting 2017-07-17 18:10:06 +02:00
Flavio Copes
cd081b22a4 Fix ordering in linux+intl environments (#1571)
Added for next point release
2017-07-17 10:08:03 -06:00
Djamil Legato
3dc0a2994b Updated Access Token 2017-07-16 17:17:57 -06:00
Andy Miller
34d4cd9ab1 Merge tag '1.3.0' into develop
Release v1.3.0
2017-07-16 17:00:29 -06:00
Andy Miller
442d6a41ad Merge branch 'release/1.3.0' 1.3.0 2017-07-16 17:00:28 -06:00
Andy Miller
5f2542c1c7 Prepare for release 2017-07-16 17:00:13 -06:00
Andy Miller
e0d29c5ca2 Updated changelog 2017-07-11 19:13:30 -06:00