Permalink
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. add cms reset for ul and li

    fivethreeo committed Aug 14, 2011
  3. 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
  4. Merge pull request #947 from ojii/issue-940

    (Partially) fixed #940 by handling non-existing icons better
    fivethreeo committed Aug 14, 2011
  5. 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
  6. (Partially) fixed #940 by handling non-existing icons better

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

    … around some css :D
    Jonas Obrist committed Aug 14, 2011
  8. 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 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
  3. note on middleware ordering

    fivethreeo committed Aug 8, 2011
  4. Merge pull request #932 from fivethreeo/develop

    mention cms_toolbar in templatetags docs
    ojii committed Aug 8, 2011
  5. add ...

    fivethreeo committed Aug 8, 2011
  6. where to put the tag

    fivethreeo committed Aug 8, 2011
  7. Fixed rst markup for search docs

    Jonas Obrist committed Aug 8, 2011
Commits on Aug 5, 2011
  1. Updated version to 2.2b1.post1

    Jonas Obrist committed Aug 5, 2011
  2. 2.2b1 release.

    Many thanks to everyone who helped with the 2.2 release so far.
    
    Special thanks to Chris Glass, who kept reviewing code until a few hours before getting married today. Congratulations to him and his wife.
    Jonas Obrist committed Aug 5, 2011
  3. more python 2.5 fixes

    Jonas Obrist committed Aug 5, 2011
  4. Fixed test settings not working on 1.3

    Jonas Obrist committed Aug 5, 2011
  5. Merge pull request #930 from ojii/view-permission-performance-boost

    View permission performance boost
    ojii committed Aug 5, 2011
  6. Added more tests for view permission in menu

    Fixed an issue that PagePermission were not respected in cms.menu.get_visible_pages
    Jonas Obrist committed Aug 5, 2011