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.

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

fixes #2685 (tree view has links to current page language) #2723

Merged
merged 6 commits into from Feb 27, 2014
Merged

fixes #2685 (tree view has links to current page language) #2723

merged 6 commits into from Feb 27, 2014

Commits on Feb 25, 2014

  1. fixes the backend part

    @digi604
    digi604 committed Feb 25, 2014
    Copy the full SHA
    019c21c View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2014

  1. remove tabs

    @FinalAngel
    FinalAngel committed Feb 26, 2014
    Copy the full SHA
    40b705c View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2014

  1. set current page to active within the sidebar

    @FinalAngel
    FinalAngel committed Feb 27, 2014
    Copy the full SHA
    883f030 View commit details
    Browse the repository at this point in the history

  2. update language on sideframe

    @FinalAngel
    FinalAngel committed Feb 27, 2014
    Copy the full SHA
    6047f5d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8 from FinalAngel/fixes/2685 

    Fixes/2685
    @digi604
    digi604 committed Feb 27, 2014
    Copy the full SHA
    1f5db0c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into fix-2685 

    Conflicts:
	cms/templates/admin/cms/page/tree/menu_item.html
    @digi604
    digi604 committed Feb 27, 2014
    Copy the full SHA
    b7137c2 View commit details
    Browse the repository at this point in the history