Skip to content
Commits on Jun 8, 2012
  1. @ojii

    updated tests_require in setup.py

    ojii committed
  2. @ojii
  3. @ojii

    added sphinx to tests_require

    ojii committed
  4. @ojii

    setup.py test anyone?

    ojii committed
  5. @piquadrat

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

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

    enforce mptt 0.5.1, not 0.4.2

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

    Jonas Obrist committed
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…

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

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

    Jonas Obrist committed
Commits on Aug 5, 2011
  1. 2.2b1 release.

    Jonas Obrist committed
    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.
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…

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

    Merge pull request #846 from FinalAngel/bugfixes/https

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

    Jonas Obrist committed
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…

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

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

    Jonas Obrist committed
    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
Commits on Feb 18, 2011
  1. sekizai & passing tests

    Jonas Obrist committed
  2. starting transition to sekizai

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

    almost there

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

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

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

    Jonas Obrist committed
Commits on Jan 10, 2011
  1. @chrisglass
Commits on Jan 7, 2011
  1. @chrisglass
Commits on Dec 24, 2010
  1. Djanog-CMS 2.1.0 Release Candidate 1

    Jonas Obrist committed
Commits on Dec 13, 2010
  1. Switched to classy tags for readability and sanity

    Jonas Obrist committed
    Fixed menu tests not actually testing the tags properly
Commits on Oct 18, 2010
  1. fixed setup.py

    Jonas Obrist committed
Commits on Oct 13, 2010
  1. Merge branch 'master' into pkg

    Jonas Obrist committed
    Conflicts:
    	docs/Makefile
    	docs/conf.py
    	docs/static/basic.css
    	docs/static/default.css
    	docs/static/doctools.js
    	docs/static/jquery.js
    	docs/static/pygments.css
    	docs/static/searchtools.js
    	docs/templates/defindex.html
    	docs/templates/genindex-single.html
    	docs/templates/genindex-split.html
    	docs/templates/genindex.html
    	docs/templates/layout.html
    	docs/templates/modindex.html
    	docs/templates/page.html
    	docs/templates/search.html
Something went wrong with that request. Please try again.