Permalink
Commits on Aug 18, 2011
  1. bumped version to 2.2rc1.post1

    Jonas Obrist committed Aug 18, 2011
Commits on Aug 16, 2011
  1. Fix #953 gracefully

    kblomqvist committed Aug 16, 2011
  2. Add models to the import list

    yml committed Aug 16, 2011
  3. Merge branch 'features/gracefully_handle_non_deletion_of_page_with_PU…

    …BLISHER_STATE_DELETE' into feature/remove_transaction_page_publish
    yml committed Aug 16, 2011
  4. Update the comment inline

    yml committed Aug 16, 2011
Commits on Aug 15, 2011
  1. Fix #953

    kblomqvist committed Aug 15, 2011
Commits on Aug 14, 2011
  1. 2.2 release candidate 1

    Many thanks to everyone who helped making this happen.
    Jonas Obrist committed Aug 14, 2011
  2. Merge pull request #949 from ojii/translations-update

    Translations update
    ojii committed Aug 14, 2011
  3. Added mo files

    Jonas Obrist committed Aug 14, 2011
  4. This is still a workaround the duplicate entry for page. Due to the f…

    …act that old page do not get deleted when it is deleted
    yml committed Aug 14, 2011
  5. Updated translation po files (makemessages)

    Jonas Obrist committed Aug 14, 2011
  6. Pull from transifex

    Jonas Obrist committed Aug 14, 2011
  7. add cms reset for ul and li

    fivethreeo committed Aug 14, 2011
  8. Merge pull request #946 from ojii/issue-942

    Fixed login form in toolbar not submitting itself on enter by hacking aro
    fivethreeo committed Aug 14, 2011
  9. Merge pull request #947 from ojii/issue-940

    (Partially) fixed #940 by handling non-existing icons better
    fivethreeo committed Aug 14, 2011
  10. Merge pull request #935 from ojii/failfast-on-invalid-menu-usage

    When using the menu tag wrong (eg give a page as 'namespace') the menu ta
    fivethreeo committed Aug 14, 2011
  11. (Partially) fixed #940 by handling non-existing icons better

    Jonas Obrist committed Aug 14, 2011
  12. Fixed login form in toolbar not submitting itself on enter by hacking…

    … around some css :D
    Jonas Obrist committed Aug 14, 2011
  13. Removed inapropriate comments from javascript.

    I apologize for letting them get into the main repo in the first place and will pay closer attention to the comments of contributed code in the future.
    Jonas Obrist committed Aug 14, 2011
Commits on Aug 13, 2011
  1. Override the Page.objects.drafts() and Page.objects.public() to make …

    …it survive the non deletion of pages with a publish_state=2.
    yml committed Aug 13, 2011
Commits on Aug 12, 2011
  1. Fixed #941

    Jonas Obrist committed Aug 12, 2011
Commits on Aug 11, 2011
  1. Moved to newer classytags

    Jonas Obrist committed Aug 11, 2011
  2. Merge branch 'docs-fixes' of https://github.com/chrisglass/django-cms

    …into chrisglass-docs-fixes
    
    Conflicts:
    	docs/advanced/templatetags.rst
    Jonas Obrist committed Aug 11, 2011
Commits on Aug 10, 2011
  1. Merge branch 'develop' of github.com:divio/django-cms into failfast-o…

    …n-invalid-menu-usage
    Jonas Obrist committed Aug 10, 2011
  2. When using the menu tag wrong (eg give a page as 'namespace') the men…

    …u tag should fail fast (or ignore the value). This fix prevents some infinite loops in some cases.
    Jonas Obrist committed Aug 10, 2011
Commits on Aug 9, 2011
  1. Merge pull request #934 from fivethreeo/develop

    removed reversing of url in toolbar.html
    ojii committed Aug 9, 2011
  2. Merge pull request #933 from fivethreeo/develop

    note on middleware ordering
    ojii committed Aug 9, 2011
Commits on Aug 8, 2011
  1. example

    fivethreeo committed Aug 8, 2011
  2. indent properly

    fivethreeo committed Aug 8, 2011