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 #1594 #1641

Closed
wants to merge 9 commits into from
Closed

Fixed #1594 #1641

wants to merge 9 commits into from

Commits on Feb 20, 2013

  1. Added get_current_language() method and using it instead of translati… 

    …on.get_language()
    @littlepea
    littlepea committed Feb 20, 2013
    Copy the full SHA
    24dec6e View commit details
    Browse the repository at this point in the history

  2. #1594 - closed

    @littlepea
    littlepea committed Feb 20, 2013
    Copy the full SHA
    490174f View commit details
    Browse the repository at this point in the history

  3. Fixed #1594 for PageAdmin and get_language_from_request

    @littlepea
    littlepea committed Feb 20, 2013
    Copy the full SHA
    d0fe251 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2013

  1. Added get_current_language function to i18n utils

    @littlepea
    littlepea committed Mar 6, 2013
    Copy the full SHA
    7eab9e3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/littlepea/django-cms int… 

    …o develop
    @littlepea
    littlepea committed Mar 6, 2013
    Copy the full SHA
    b27b5a8 View commit details
    Browse the repository at this point in the history

  3. Fixed merge

    @littlepea
    littlepea committed Mar 6, 2013
    Copy the full SHA
    18686a4 View commit details
    Browse the repository at this point in the history

  4. Fixed i18n.get_language_object

    @littlepea
    littlepea committed Mar 6, 2013
    Copy the full SHA
    f5c8da1 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2013

  1. Merge branch 'develop' of github.com:divio/django-cms into develop 

    Conflicts:
	cms/admin/pageadmin.py
    @littlepea
    littlepea committed Mar 27, 2013
    Copy the full SHA
    78e1059 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2013

  1. Revert to 3e52d83

    @littlepea
    littlepea committed Mar 28, 2013
    Copy the full SHA
    54e6658 View commit details
    Browse the repository at this point in the history