Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Grav 1.4.6/1.5.0-beta.1 causes preview error in admin editor #2066

Closed
axel-rank opened this issue Jun 20, 2018 · 2 comments
Closed

Grav 1.4.6/1.5.0-beta.1 causes preview error in admin editor #2066

axel-rank opened this issue Jun 20, 2018 · 2 comments
Labels
fixed

Comments

@axel-rank
Copy link

axel-rank commented Jun 20, 2018 •
edited
Loading

After Grav update to 1.4.6:
Go to pages in admin plugin, try to edit and click on preview tab:
Error message:

error

Preview looking for ...json.twig and not for ...html.twig template!

This is definitely a grav error and not an admin issue.
I did all updates first (grav, admin, form, login). --> preview error
Then installed backup and did only the grav update...--> preview error

Seems related to:
#2044
rhukster added a commit that referenced this issue Jun 20, 2018
@rhukster
Fix for modular page preview #2066
578e129
@rhukster rhukster added the fixed label Jun 20, 2018
@rhukster
Copy link
Member

Ok, fixed... one liner.. see above...

@rhukster
Copy link
Member

While that fixed the preview, it reverted the original issue.. better fix is:

Grav: dfed333

and

Admin: getgrav/grav-plugin-admin@dc9b6da

rhukster added a commit that referenced this issue Aug 17, 2018
@rhukster
Squashed commit of the following:
62d0fd5 
commit 33fffa6
Merge: c381bc8 dbd825f
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Aug 17 11:24:56 2018 -0600

    Merge tag '1.5.0' into develop

    Release v1.5.0

commit dbd825f
Merge: fa7e6be 8ab0078
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Aug 17 11:24:55 2018 -0600

    Merge branch 'release/1.5.0'

commit 8ab0078
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Aug 17 11:24:43 2018 -0600

    Prepare for release

commit c381bc8
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Aug 16 14:58:19 2018 -0600

    PHP 7.2 by default now

commit fb20b58
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Aug 15 17:12:20 2018 -0600

    changelog update

commit 906017e
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Aug 15 17:12:10 2018 -0600

    Added system blueprint for strict_mode settings

commit 266369e
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Aug 15 16:15:37 2018 -0600

    unified 1.5.0 changelog entry for clarity

commit 308ac14
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Aug 15 16:11:47 2018 -0600

    Updated changelog

commit 2a9da76
Merge: 8e43550 8d9efe4
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Aug 15 16:08:42 2018 -0600

    Merge branch 'develop' into 1.5

commit 8e43550
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Aug 15 15:52:31 2018 -0600

    Updated changelog

commit 75ac020
Author: Djamil Legato <djamil@djamil.it>
Date:   Wed Aug 15 13:36:05 2018 -0700

    Added support for multiple repos lookup (as array) in .grav/config

    This will allow to keep clones of repositories on different folders and still be able to symlink them.

    Example of ~/.grav/config:

    ```
    github_repos:
        - /Users/my_user/Projects/grav/
        - /Users/my_user/Projects/personal/
        - /Users/my_user/Projects/work/
    ```

commit 8d9efe4
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Aug 14 19:47:16 2018 -0600

    Extra semicolon

commit 5934007
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Aug 14 19:46:52 2018 -0600

    Fix for plugin order

commit 42ff8ea
Author: Matias Griese <matias@trilbymedia.com>
Date:   Mon Aug 13 22:28:12 2018 +0300

    Make ObjectTrait::serialize() overrides easier

commit 5c2f994
Merge: fde75e1 63161e6
Author: Matias Griese <matias@trilbymedia.com>
Date:   Mon Aug 13 09:36:07 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

commit 63161e6
Author: Jascha Geerds <41366030+gn-jgeerds@users.noreply.github.com>
Date:   Fri Aug 10 00:05:24 2018 +0200

    Fix broken nounce handling (#2121)

    * Remove deprecated "getNonceOldStyle" function

    This commit removes the following functions:

    - getNonceOldStyle
    - generateNonceStringOldStyle

    The functions have been replaced in newer versions of
    grav. It seems to me that they only existed in order to make a
    upgrade to a newer version of grav painless (i.e. accept both types of
    nonce tokens). Nowadays, existing old style nonces are expired long
    time ago so it should be save to delete the deprecated funtions.

    * Fix caching of nonces in static class variable

    Currently, the behavior of `getNonce` is broken because it saves the
    generated nonce in an array and only use the $action as the
    key. However, the generated nonce does not only depend on the $action,
    but also on $plusOneTick.

    * Fix broken "plusOneTick" for nonces

    It looks to me that there is a bug in the current implemention of
    verifyNonce. Here is an example:

    - 2018-08-01 10:00: We respond to a request and generate a nonce. The
      current tick is at 35489

    - 2018-08-01 10:05: We use the previously generated nonce to make
      another request. We compare the given nounce with a new generated
      one (based on the same tick). The result is exactly the same and the
      request succeeds.

    - 2018-08-01 14:00: We're now one tick ahead. Remember: A day (24
      hours) is separated into two ticks (each 12 hours). A request comes
      in, we compare the given nounce with a newly generated one based on
      the current tick (now at 35490). They don't match (which is totally
      okay).

      If the comparison fails, we then compare the given nounce with a
      another, newly generated one. This time, we pass "plusOneTick", to
      the function, which increases the current tick by one. Our tick is
      now at 35491. We generate a nonce based on that tick and of course,
      it still does not match the given nonce.

      Instead of increasing the tick, we should rather decreasing it by
      one (i.e. use the previous tick). If the first comparison fails, we
      use the current tick (35490), decrease it by one (35489) and then
      compare it again. 35489 is the same tick as in the very first
      request.

    This bug leads to a maximum life time of 12 hours for a nonce and in
    worst case only a few seconds (!)

    I would like to prove the bug with an unit test but I'm too unexperienced
    in PHP. Furthermore it seems that we need some kind of library which
    is able to mock builtin functions (like "time"). Maybe
    <https://github.com/Codeception/AspectMock> would be a good canditate?

commit c84983a
Author: lucaswillering <github@chchchanges.com>
Date:   Thu Aug 9 23:32:53 2018 +0200

    Add muted and playsinline attributes (#2124)

    Fixes: #2099

    To be able to add videos to sites that behave as GIFs, two attributes are needed for the videos to be properly handled on iOS and in Chrome: muted and playsinline.

    Muted
    Chrome only allows videos to autoplay when the contain the muted attribute. Non-muted videos will not autoplay unless the user has interacted with the site. More details here:  https://developers.google.com/web/updates/2017/09/autoplay-policy-changes#new-behaviors

    Playsinline
    The playsinline attribute allows developers to specify videos on iPhone should play inline and not automatically enter fullscreen mode when playback begins. More details here: https://developers.google.com/web/updates/2017/09/autoplay-policy-changes#new-behaviors

commit 3cee535
Author: atyner <40250786+atyner@users.noreply.github.com>
Date:   Thu Aug 9 17:32:34 2018 -0400

    Typo 'Subscxripted' on default Typography page (#2136)

commit fde75e1
Author: Matias Griese <matias@trilbymedia.com>
Date:   Wed Aug 8 21:09:25 2018 +0300

    Composer update (toolbox)

commit 16d2f60
Author: Matias Griese <matias@trilbymedia.com>
Date:   Tue Aug 7 23:12:38 2018 +0300

    Fixed Uri::parseUrl($url) with no path (part 2)

commit 816a3eb
Author: Matias Griese <matias@trilbymedia.com>
Date:   Tue Aug 7 22:46:23 2018 +0300

    Fixed Uri::parseUrl($url) with no path

commit d59fe2f
Author: Matias Griese <matias@trilbymedia.com>
Date:   Tue Aug 7 22:32:29 2018 +0300

    Display better exception message if Grav fails to initialize

commit ef55e7d
Author: Matias Griese <matias@trilbymedia.com>
Date:   Tue Aug 7 22:30:45 2018 +0300

    Added option to disable `SimpleCache` key validation

commit 424da52
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Aug 6 15:37:59 2018 -0600

    Fix #2134 - inheritance of theme classes that include digits in camelcase

commit 08cb311
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Aug 6 15:36:38 2018 -0600

    Fix truncator tests

commit e1b5875
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Aug 6 15:22:55 2018 -0600

    Update vendor libs

commit 7d27206
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Aug 6 14:56:00 2018 -0600

    Fixed #2133 - uppercase fallback media urls

commit 18d405d
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Aug 6 13:09:15 2018 -0600

    Improved `Utils::url()` to support query strings

commit 34fa50f
Author: Matias Griese <matias@trilbymedia.com>
Date:   Fri Aug 3 13:19:26 2018 +0300

    Added `FormatterInterface::getDefaultFileExtension()`

commit ca3cf2e
Author: Matias Griese <matias@trilbymedia.com>
Date:   Fri Aug 3 13:03:51 2018 +0300

    Added `FormatterInterface::getSupportedFileExtensions()` method, deprecated `getFileExtension()`

commit 76fb113
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu Aug 2 22:41:54 2018 +0300

    Added `Uri::method()` to get current HTTP method (GET/POST etc)

commit e4f2808
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jul 31 11:27:49 2018 -0600

    prepare for release

commit f7496b5
Merge: ead125d 2f0d600
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jul 31 11:27:08 2018 -0600

    Merge branch 'develop' into 1.5

    # Conflicts:
    #	CHANGELOG.md
    #	composer.lock
    #	system/defines.php

commit 2f0d600
Merge: c83852f fa7e6be
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jul 31 11:23:36 2018 -0600

    Merge tag '1.4.8' into develop

    Release v1.4.8

commit fa7e6be
Merge: 24edf15 cea43a2
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jul 31 11:23:35 2018 -0600

    Merge branch 'release/1.4.8'

commit cea43a2
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jul 31 11:23:24 2018 -0600

    Prepare for release

commit b7387c8
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jul 31 11:23:15 2018 -0600

    vendor updates

commit c83852f
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jul 31 11:20:49 2018 -0600

    update changelog

commit ce271cf
Merge: 8ee367e db03091
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jul 31 11:17:09 2018 -0600

    Merge branch 'develop' of github.com:getgrav/grav into develop

commit ead125d
Merge: 6b5849b db03091
Author: Matias Griese <matias@trilbymedia.com>
Date:   Mon Jul 30 12:10:24 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

commit 8ee367e
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jul 27 15:05:45 2018 -0600

    Don't allow `null` to be set as Page content

commit db03091
Author: Jeremy Gonyea <jeremy.gonyea@gmail.com>
Date:   Fri Jul 27 16:23:35 2018 -0400

    Added nginx config for hosting in a ddev project (#2117)

commit 6b5849b
Author: Matias Griese <matias@trilbymedia.com>
Date:   Fri Jul 20 22:54:22 2018 +0300

    Added `MediaTrait::getMediaCache()` to allow custom caching

commit ba0a8c4
Author: Matias Griese <matias@trilbymedia.com>
Date:   Fri Jul 20 22:25:22 2018 +0300

    Added `MediaTrait::clearMediaCache()` to allow cache to be cleared

commit c8ab5d3
Merge: a754f69 c9367ba
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu Jul 19 10:05:26 2018 +0300

    Merge branch 'develop' into 1.5

    # Conflicts:
    #	CHANGELOG.md
    #	system/defines.php

commit c9367ba
Author: Hugh Barnes <dev@hubns.com>
Date:   Thu Jul 19 13:03:25 2018 +1200

    Add Grav version to debug bar Messages tab (#2106)

commit a754f69
Author: Matias Griese <matias@trilbymedia.com>
Date:   Sat Jul 14 13:22:35 2018 +0300

    Added twig filters for casting values: `|string`, `|int`, `|bool`, `|float`, `|array`
    Made `|markdown` filter HTML safe

commit dd75ce5
Author: Matias Griese <matias@trilbymedia.com>
Date:   Sat Jul 14 12:12:53 2018 +0300

    Code style fix on Twig tags

commit ea83b46
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jul 13 16:54:32 2018 -0600

    Prepare for release

commit e7f6282
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jul 13 16:47:49 2018 -0600

    Update changelog

commit 24edf15
Merge: 5435ee6 a5e97ef
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jul 13 16:38:56 2018 -0600

    Merge branch 'release/1.4.7'

commit 70e6512
Merge: 8a1f0d4 24edf15
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jul 13 16:38:56 2018 -0600

    Merge tag '1.4.7' into develop

    Release v1.4.7

commit a5e97ef
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jul 13 16:38:46 2018 -0600

    Prepare for release

commit 8a1f0d4
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jul 13 16:38:04 2018 -0600

    update changelog

commit f29997a
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jul 13 16:35:51 2018 -0600

    Minor vendor updates

commit 4daec69
Merge: 05028d0 79bff58
Author: Matias Griese <matias@trilbymedia.com>
Date:   Fri Jul 6 09:17:41 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

commit 79bff58
Author: Timothy Cyrus <tcyrus@users.noreply.github.com>
Date:   Thu Jul 5 16:14:57 2018 -0400

    Change getBasename to getFilename where possible (#2087)

    * Update Pages.php

    * Update Themes.php

    * Update Installer.php

    * Update Plugins.php

    * Update ConfigFileFinder.php

commit 05028d0
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu Jul 5 13:14:17 2018 +0300

    Changelog update

commit b414880
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu Jul 5 13:12:59 2018 +0300

    Criteria: Added support for `LENGTH()`, `LOWER()`, `UPPER()`, `LTRIM()`, `RTRIM()` and `TRIM()`

commit 07f8dfb
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu Jul 5 12:27:28 2018 +0300

    Made `ObjectCollection::matching()` criteria expressions to behave more like in Twig

commit f3c559f
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu Jul 5 10:13:36 2018 +0300

    Composer update (Fixes blueprint issues)

commit 48a3228
Merge: be661e8 d214080
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu Jul 5 10:07:14 2018 +0300

    Merge remote-tracking branch 'origin/1.5' into 1.5

    # Conflicts:
    #	CHANGELOG.md

commit be661e8
Merge: 68a9552 a0918df
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu Jul 5 10:06:27 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

    # Conflicts:
    #	CHANGELOG.md

commit a0918df
Author: Timothy Cyrus <tcyrus@users.noreply.github.com>
Date:   Mon Jul 2 18:46:44 2018 -0400

    Update Media.php (#2083)

    Fixes getgrav/grav-plugin-admin#1330

commit d214080
Merge: 68a9552 a09c6b1
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Jul 2 16:05:56 2018 -0600

    Merge branch 'develop' into 1.5

    # Conflicts:
    #	CHANGELOG.md

commit a09c6b1
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jun 22 11:59:22 2018 +0100

    Fix for Page::routeCanonical accpeting string #2069

commit dfed333
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Jun 20 23:38:41 2018 +0100

    Set `html` in admin not in here…

commit 578e129
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Jun 20 22:56:27 2018 +0100

    Fix for modular page preview #2066

commit 7d215f9
Merge: d72eca7 5435ee6
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Jun 20 19:38:40 2018 +0100

    Merge tag '1.4.6' into develop

    Release v1.4.6

commit 5435ee6
Merge: 34cc378 761d792
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Jun 20 19:38:39 2018 +0100

    Merge branch 'release/1.4.6'

commit 761d792
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Jun 20 19:37:15 2018 +0100

    Prepare for release

commit 68a9552
Merge: 7aa688e d72eca7
Author: Matias Griese <matias@trilbymedia.com>
Date:   Wed Jun 20 11:56:55 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

    # Conflicts:
    #	composer.json
    #	composer.lock

commit d72eca7
Author: Matias Griese <matias@trilbymedia.com>
Date:   Wed Jun 20 11:11:46 2018 +0300

    Force Rockettheme/Toolbox to version 1.3.* in Grav 1.4 series

commit ca9dba1
Author: Matias Griese <matias@trilbymedia.com>
Date:   Wed Jun 20 10:57:57 2018 +0300

    Move wrongly placed items in changelog to the latest release

commit 7aa688e
Merge: 794db2e 4eb9866
Author: Matias Griese <matias@trilbymedia.com>
Date:   Wed Jun 20 10:51:52 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

    # Conflicts:
    #	CHANGELOG.md
    #	system/defines.php

commit 794db2e
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jun 19 19:15:22 2018 +0100

    set version as beta.1

commit ba457f7
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jun 19 19:11:22 2018 +0100

    composer update

commit 6471557
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jun 19 18:46:42 2018 +0100

    Update changelog

commit 8288551
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jun 19 18:42:55 2018 +0100

    Merge tag '1.4.6' into develop

    Release v1.4.6

    # Conflicts:
    #	system/defines.php

commit 9816b53
Merge: bbfbdec bd21b7f
Author: Matias Griese <matias@trilbymedia.com>
Date:   Fri Jun 15 09:22:46 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

    # Conflicts:
    #	composer.lock

commit bbfbdec
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu Jun 14 19:23:35 2018 +0300

    Added setting to disable sessions from the site [#2013]

commit 9ca427e
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu Jun 14 12:46:27 2018 +0300

    Composer update (rockettheme/toolbox => 1.4)

commit 228757a
Author: Matias Griese <matias@trilbymedia.com>
Date:   Tue Jun 12 13:06:58 2018 +0300

    Composer update (rockettheme/toolbox => dev-develop)

commit 027a760
Author: Matias Griese <matias@trilbymedia.com>
Date:   Tue Jun 12 12:06:14 2018 +0300

    Added function Session::clear()

commit 0a3cadc
Author: Matias Griese <matias@trilbymedia.com>
Date:   Tue Jun 12 10:55:38 2018 +0300

    Composer update

commit 04ea069
Author: Matias Griese <matias@trilbymedia.com>
Date:   Tue Jun 12 10:48:13 2018 +0300

    Fixed routing issues with multisite and multilanguage (Grav 1.5 edition) (#2046)

    * Fixed routing issues with multisite and multilanguage (#1501)

commit 280d540
Merge: 9f75341 036fc2d
Author: Matias Griese <matias@trilbymedia.com>
Date:   Tue Jun 12 10:40:42 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

commit 9f75341
Merge: 62a8d8b 3b4296c
Author: Matias Griese <matias@trilbymedia.com>
Date:   Fri Jun 1 12:37:13 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

    # Conflicts:
    #	CHANGELOG.md

commit 62a8d8b
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu May 31 20:04:16 2018 +0300

    Add method MediaInterface::getMediaOrder() and implement it

commit d7bd0bf
Merge: 3ccadde 9eded2e
Author: Matias Griese <matias@trilbymedia.com>
Date:   Thu May 31 12:28:19 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

    # Conflicts:
    #	CHANGELOG.md

commit 3ccadde
Author: Matias Griese <matias@kunena.org>
Date:   Tue May 22 10:42:30 2018 +0300

    Fixed blueprint field validation: Allow numeric inputs in text fields

commit b82c17e
Author: Andy Miller <rhuk@mac.com>
Date:   Sun May 20 12:01:38 2018 -0600

    Fixed typo in trucate #1943

commit a0946c6
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 17 10:46:13 2018 +0300

    Implement SessionInterface

commit 00376d3
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 17 10:22:14 2018 +0300

    Session code cleanup, add changelog entries

commit e8fd540
Merge: 718dfa9 eae017a
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 17 10:14:10 2018 +0300

    Merge branch 'feature/session' of https://github.com/getgrav/grav into 1.5

commit eae017a
Merge: 78ab2aa 1976471
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 17 10:10:16 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into feature/session

commit 718dfa9
Merge: 11266ce 1976471
Author: Andy Miller <rhuk@mac.com>
Date:   Tue May 15 17:55:50 2018 -0600

    Merge branch 'develop' into 1.5

    # Conflicts:
    #	CHANGELOG.md
    #	system/defines.php
    #	system/src/Grav/Common/User/User.php

commit 11266ce
Author: Andy Miller <rhuk@mac.com>
Date:   Mon May 14 18:25:36 2018 -0600

    Revert "Add special handling for User authenticated and authorized properties"

    This reverts commit 8e0e3e8.

commit dab595f
Merge: 5ab956a afe72d0
Author: Matias Griese <matias@kunena.org>
Date:   Mon May 14 21:25:35 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

    # Conflicts:
    #	system/defines.php

commit 5ab956a
Author: Matias Griese <matias@kunena.org>
Date:   Mon May 14 12:30:30 2018 +0300

    Fixed `Route::withQueryParam()` to accept array values

commit 2c82e15
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 10 19:56:56 2018 +0300

    Added authorized support (2FA)

commit 2c7d866
Author: Andy Miller <rhuk@mac.com>
Date:   Wed May 9 22:43:26 2018 -0600

    alignment of parens

commit a977023
Author: Andy Miller <rhuk@mac.com>
Date:   Wed May 9 14:43:28 2018 -0600

    minor vendor updates

commit 9c7008e
Author: Djamil Legato <djamil@djamil.it>
Date:   Wed May 9 10:41:23 2018 -0700

    Enable markdown support for 2FA account field description

commit 342aa0f
Author: Matias Griese <matias@kunena.org>
Date:   Wed May 9 14:01:20 2018 +0300

    Added MediaTrait::getMediaUri()

commit d434d51
Merge: f03eb69 18928d6
Author: Matias Griese <matias@kunena.org>
Date:   Tue May 8 21:00:24 2018 +0300

    Merge remote-tracking branch 'origin/1.5' into 1.5

commit f03eb69
Author: Matias Griese <matias@kunena.org>
Date:   Tue May 8 21:00:16 2018 +0300

    Rename object key back to _key

commit 18928d6
Author: Andy Miller <rhuk@mac.com>
Date:   Tue May 8 09:48:56 2018 -0600

    Revert "fire onPluginsInitialized event"

    This reverts commit f7832e7.

commit f7832e7
Author: Andy Miller <rhuk@mac.com>
Date:   Mon May 7 21:32:00 2018 -0600

    fire onPluginsInitialized event

commit 68428a7
Author: Matias Griese <matias@kunena.org>
Date:   Mon May 7 15:24:43 2018 +0300

    Change exception type in ContentBlock::fromArray()

commit 58db31a
Author: Matias Griese <matias@kunena.org>
Date:   Mon May 7 14:58:50 2018 +0300

    Added support for ContentBlock checksums

commit 2917345
Author: Matias Griese <matias@kunena.org>
Date:   Fri May 4 21:43:12 2018 +0300

    Improve ObjectTrait

commit 1cfd348
Author: Matias Griese <matias@kunena.org>
Date:   Fri May 4 19:06:37 2018 +0300

    Added `Grav\Common\Media` interfaces and trait; use those in `Page` and `Media` classes
    Added `Grav\Common\Page` interface to allow custom page types in the future

commit 4d69093
Merge: 0b1c18d 40b475e
Author: Matias Griese <matias@kunena.org>
Date:   Mon Apr 30 12:37:01 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

commit 0b1c18d
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Apr 27 15:40:03 2018 -0600

    Added `Uri::post()` and `Uri::getConentType()`

commit f681f1c
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Apr 27 16:18:16 2018 -0600

    resolve streams earlier

commit 27df27d
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Apr 27 16:17:52 2018 -0600

    resolve streams earlier

commit 91e98cd
Author: Matias Griese <matias@kunena.org>
Date:   Fri Apr 27 20:41:05 2018 +0300

    Added `RouteFactory::createFromString()` rename MarkdownFormatter configuration option

commit 1cef2a1
Author: Matias Griese <matias@kunena.org>
Date:   Fri Apr 27 20:38:57 2018 +0300

    Added `Grav\Common\Media` interfaces and trait; use those in `Page` and `Media` classes
    Added `Grav\Common\Page` interface to allow custom page types in the future

commit ad87648
Author: Matias Griese <matias@kunena.org>
Date:   Tue Apr 24 15:47:31 2018 +0300

    New classes have wrong namespace

commit d2e700e
Author: Matias Griese <matias@kunena.org>
Date:   Tue Apr 24 12:22:06 2018 +0300

    Formatters: Better error handling, allow custom file extension

commit 895e145
Author: Matias Griese <matias@kunena.org>
Date:   Tue Apr 24 11:41:55 2018 +0300

    Added new `Grav\Framework\File\Formatter` classes for encoding/decoding YAML, MarkDown, JSON, INI and PHP serialized formats

commit 78ab2aa
Author: Matias Griese <matias@kunena.org>
Date:   Mon Apr 23 09:40:31 2018 +0300

    Minor improvement on session check (using PHP 5.4+ way)

commit b9a7341
Author: Matias Griese <matias@kunena.org>
Date:   Sun Apr 22 19:09:05 2018 +0300

    Composer update to fix YAML issues

commit 261ea62
Author: Matias Griese <matias@kunena.org>
Date:   Fri Apr 20 14:03:49 2018 +0300

    Added compatibility mode to fall back to Symfony YAML 2.8 when needed

commit fae2aa4
Author: Matias Griese <matias@kunena.org>
Date:   Fri Apr 20 11:18:01 2018 +0300

    Added compatibility mode to fall back to Symfony YAML 2.8 when needed

commit fb7230e
Merge: ce1e635 692aff3
Author: Matias Griese <matias@kunena.org>
Date:   Fri Apr 20 10:24:06 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.5

    # Conflicts:
    #	CHANGELOG.md

commit 830c952
Merge: b8c61e3 33cfa17
Author: Matias Griese <matias@kunena.org>
Date:   Mon Apr 16 09:33:07 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into feature/session

commit ce1e635
Author: Matias Griese <matias@kunena.org>
Date:   Sat Apr 14 17:42:13 2018 +0300

    Minimum PHP requirement was 5.6.4, not 5.6.0

commit 8b0c1b7
Author: Matias Griese <matias@kunena.org>
Date:   Sat Apr 14 13:23:54 2018 +0300

    Updated Symfony Components to 3.4, causing some compatibility issues with YAML files

commit 87b0d80
Author: Matias Griese <matias@kunena.org>
Date:   Sat Apr 14 12:28:00 2018 +0300

    PHP 5.6.0 minimum, updated to Doctrine Collections 1.4

commit b8c61e3
Author: Matias Griese <matias@kunena.org>
Date:   Sat Apr 14 11:50:22 2018 +0300

    Improve session error if it fails to start

commit 02555ba
Merge: 2b17bf7 4db2b75
Author: Matias Griese <matias@kunena.org>
Date:   Fri Apr 13 21:04:40 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into feature/session

commit 2b17bf7
Merge: f31f7f0 8e019b7
Author: Matias Griese <matias@kunena.org>
Date:   Tue Apr 10 09:47:59 2018 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into feature/session

commit f31f7f0
Author: Matias Griese <matias@kunena.org>
Date:   Wed Mar 21 12:45:57 2018 +0200

    Added `Grav\Framework\Session` class to replace `RocketTheme\Toolbox\Session\Session`
    Improved session handling, allow all session configuration options in `system.session.options`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
fixed
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@rhukster @axel-rank