Skip to content
Commits on Jun 20, 2012
  1. @piquadrat
Commits on Jun 19, 2012
  1. @piquadrat

    turn children qs into list

    this brings us compatibility with django-mptt 0.5.2
    piquadrat committed Jun 19, 2012
Commits on Jun 12, 2012
  1. @ojii

    multi dependencies, oh my!

    ojii committed Jun 12, 2012
  2. @ojii
Commits on Jun 8, 2012
  1. @ojii

    updated tests_require in setup.py

    ojii committed Jun 8, 2012
  2. @ojii
  3. @ojii

    added sphinx to tests_require

    ojii committed Jun 8, 2012
  4. @ojii

    setup.py test anyone?

    ojii committed Jun 8, 2012
  5. @piquadrat

    ``Node.parent_name_expr`` is gone in Django 1.4, so let's use the new…

    … hotness from sekizai 0.6 to detect them
    piquadrat committed Jun 8, 2012
Commits on Jan 9, 2012
  1. @ojii

    enforce mptt 0.5.1, not 0.4.2

    ojii committed Jan 9, 2012
Commits on Oct 30, 2011
  1. fix mptt to 0.4.2, since 0.5 breaks all the things

    Jonas Obrist committed Oct 30, 2011
Commits on Sep 18, 2011
  1. @kezabelle
Commits on Aug 24, 2011
  1. Merge branch 'develop' of github.com:divio/django-cms into security/t…

    …ext-plugin-xss-develop-premerge
    
    Conflicts:
    	CHANGELOG.txt
    	cms/__init__.py
    	cms/tests/security.py
    	setup.py
    	tests/buildout.cfg
    Jonas Obrist committed Aug 24, 2011
  2. Added html5lib powered html cleaning to text plugin (in form) and tes…

    …ts for it
    Jonas Obrist committed Aug 24, 2011
Commits on Aug 11, 2011
  1. Moved to newer classytags

    Jonas Obrist committed Aug 11, 2011
Commits on Aug 5, 2011
  1. 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
Commits on Aug 4, 2011
Commits on Jun 14, 2011
  1. Changed version to 2.2.dev0 to comply with PEP0386, this is NOT a rel…

    …ease, just a fix of our versioning policy
    Jonas Obrist committed Jun 14, 2011
Commits on Jun 9, 2011
  1. @ojii

    Merge pull request #846 from FinalAngel/bugfixes/https

    fixing some https issues and use https whenever possible
    ojii committed Jun 9, 2011
  2. @FinalAngel
  3. @stephrdev
Commits on May 20, 2011
  1. Fixed failing tests

    Jonas Obrist committed May 20, 2011
Commits on Mar 30, 2011
  1. @FrankBie
Commits on Mar 2, 2011
  1. changed classytags and sekizai requirements to 0.3.2 and 0.4.2 respec…

    …tively to address some issues in 0.3.1 and 0.4.1
    Jonas Obrist committed Mar 2, 2011
Commits on Feb 23, 2011
  1. Merge branch 'develop' of github.com:divio/django-cms into feature/se…

    …kizai
    
    Conflicts:
    	cms/tests/__init__.py
    	cms/tests/plugins.py
    	setup.py
    Jonas Obrist committed Feb 23, 2011
Commits on Feb 22, 2011
  1. Merge branch 'hotfix/2.1.3' into develop

    Conflicts:
    	cms/test_utils/testcases.py
    	cms/tests/menu.py
    	cms/tests/multilingual.py
    	cms/tests/placeholder.py
    	cms/tests/plugins.py
    	cms/tests/toolbar.py
    Jonas Obrist committed Feb 22, 2011
  2. Removed PIL as requirement from setup.py because it's too hard to ins…

    …tall
    Jonas Obrist committed Feb 22, 2011
Commits on Feb 18, 2011
  1. sekizai & passing tests

    Jonas Obrist committed Feb 18, 2011
  2. starting transition to sekizai

    Jonas Obrist committed Feb 4, 2011
Commits on Feb 3, 2011
  1. @fivethreeo

    almost there

    fivethreeo committed Feb 2, 2011
Commits on Jan 30, 2011
  1. Fixed some issues caused by the switch away from a shipped MPTT to dj…

    …ango-mptt 0.4.2.
    
    Removed the shipped mptt
    Jonas Obrist committed Jan 30, 2011
Commits on Jan 28, 2011
  1. fixed classifier in setup.py

    Jonas Obrist committed Jan 28, 2011
Commits on Jan 18, 2011
  1. python packaging is annoying...

    Jonas Obrist committed Jan 18, 2011
Commits on Jan 10, 2011
  1. @chrisglass
Commits on Jan 7, 2011
  1. @chrisglass
Something went wrong with that request. Please try again.