Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 24, 2011
  1. @ojii

    Merge branch 'develop' of github.com:divio/django-cms into security/t…

    ojii authored
    …ext-plugin-xss-develop-premerge
    
    Conflicts:
    	CHANGELOG.txt
    	cms/__init__.py
    	cms/tests/security.py
    	setup.py
    	tests/buildout.cfg
  2. @ojii
Commits on Aug 11, 2011
  1. @ojii

    Moved to newer classytags

    ojii authored
Commits on Aug 5, 2011
  1. @ojii

    2.2b1 release.

    ojii authored
    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
  1. @ojii
Commits on Jun 14, 2011
  1. @ojii

    Changed version to 2.2.dev0 to comply with PEP0386, this is NOT a rel…

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

    Merge pull request #846 from FinalAngel/bugfixes/https

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

    Fixed failing tests

    ojii authored
Commits on Mar 30, 2011
  1. @FrankBie
Commits on Mar 2, 2011
  1. @ojii

    changed classytags and sekizai requirements to 0.3.2 and 0.4.2 respec…

    ojii authored
    …tively to address some issues in 0.3.1 and 0.4.1
Commits on Feb 23, 2011
  1. @ojii

    Merge branch 'develop' of github.com:divio/django-cms into feature/se…

    ojii authored
    …kizai
    
    Conflicts:
    	cms/tests/__init__.py
    	cms/tests/plugins.py
    	setup.py
Commits on Feb 22, 2011
  1. @ojii

    Merge branch 'hotfix/2.1.3' into develop

    ojii authored
    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
  2. @ojii
Commits on Feb 18, 2011
  1. @ojii

    sekizai & passing tests

    ojii authored
  2. @ojii

    starting transition to sekizai

    ojii authored
Commits on Feb 3, 2011
  1. @fivethreeo

    almost there

    fivethreeo authored
Commits on Jan 30, 2011
  1. @ojii

    Fixed some issues caused by the switch away from a shipped MPTT to dj…

    ojii authored
    …ango-mptt 0.4.2.
    
    Removed the shipped mptt
Commits on Jan 28, 2011
  1. @ojii

    fixed classifier in setup.py

    ojii authored
Commits on Jan 18, 2011
  1. @ojii

    python packaging is annoying...

    ojii authored
Commits on Jan 10, 2011
  1. @chrisglass
Commits on Jan 7, 2011
  1. @chrisglass
Commits on Dec 24, 2010
  1. @ojii
Commits on Dec 13, 2010
  1. @ojii

    Switched to classy tags for readability and sanity

    ojii authored
    Fixed menu tests not actually testing the tags properly
Commits on Oct 18, 2010
  1. @ojii

    fixed setup.py

    ojii authored
Commits on Oct 13, 2010
  1. @ojii

    Merge branch 'master' into pkg

    ojii authored
    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
Commits on Aug 17, 2010
  1. @ojii

    moved docs to the 'standard' location /docs/ instead of /cms/docs/

    ojii authored
    Updated setup.py and MANIFEST.in accordingly
Commits on Aug 12, 2010
  1. @ojii

    new pkg

    ojii authored
Commits on Jun 30, 2010
  1. @ojii

    version bump

    ojii authored
Commits on Jun 23, 2010
  1. @ojii

    version bump

    ojii authored
  2. @ojii

    version bump

    ojii authored
Commits on May 14, 2010
  1. @ojii

    changed setup.py to use the proper classifiers

    ojii authored
    bumped version to beta3
Commits on Mar 23, 2010
  1. @digi604

    beta2

    digi604 authored
Commits on Mar 19, 2010
  1. Added the templates directory of the menu module to the list of packa…

    Jonathan Stoppani authored
    …ge_data file to be copied when installing.
Something went wrong with that request. Please try again.