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

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

Merged
merged 9 commits into from
Jun 12, 2018
Merged

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

merged 9 commits into from
Jun 12, 2018

Commits on Jun 2, 2017

  1. Fixed routing issues with multisite and multilanguage (#1501)

    @mahagr
    mahagr committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    9fcfb80 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2017

  1. Fix unit tests (#1501)

    @mahagr
    mahagr committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    ad498b5 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2018

  1. Merge branch 'develop' of https://github.com/getgrav/grav into featur… 

    …e/multisite-route

# Conflicts:
#	system/src/Grav/Common/Page/Pages.php
#	system/src/Grav/Common/Processors/InitializeProcessor.php
#	system/src/Grav/Common/Twig/TwigExtension.php
#	system/src/Grav/Common/Uri.php
    @mahagr
    mahagr committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    8f90951 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2018

  1. Merge branch 'develop' of https://github.com/getgrav/grav into featur… 

    …e/multisite-route
    @mahagr
    mahagr committed May 17, 2018
    Configuration menu
    Copy the full SHA
    23cf909 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/multisite-route' into feature/multisite-15

    @mahagr
    mahagr committed May 17, 2018
    Configuration menu
    Copy the full SHA
    65ead88 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. Merge branch '1.5' of https://github.com/getgrav/grav into feature/mu… 

    …ltisite-15
    @mahagr
    mahagr committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    3630402 View commit details
    Browse the repository at this point in the history

  2. Code cleanup

    @mahagr
    mahagr committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    5d000f1 View commit details
    Browse the repository at this point in the history

  3. Remove some duplicated code

    @mahagr
    mahagr committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    2eac670 View commit details
    Browse the repository at this point in the history

  4. Merge branch '1.5' of https://github.com/getgrav/grav into feature/mu… 

    …ltisite-15
    @mahagr
    mahagr committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    51c1917 View commit details
    Browse the repository at this point in the history