Permalink
Commits on Dec 4, 2012
  1. 2.1.5 release

    ojii committed Dec 4, 2012
  2. Backported bb8c827

    ojii committed Dec 4, 2012
Commits on Aug 24, 2011
  1. Made _get_inner_body a little more sane and robust

    Jonas Obrist committed Aug 24, 2011
  2. Bumped to 2.1.4

    Jonas Obrist committed Aug 24, 2011
  3. Updated CHANGELOG

    Jonas Obrist committed Aug 24, 2011
  4. Moved text plugin cleaning to cms.plugins.text.models.AbstractText.clean

    Moved html cleaning to cms.utils.html.clean_html
    Jonas Obrist committed Aug 24, 2011
  5. Added html5lib powered html cleaning to text plugin (in form) and tes…

    …ts for it
    Jonas Obrist committed Aug 24, 2011
Commits on May 20, 2011
  1. Merge pull request #787 from CharString/master

    Updated locale NL
    ojii committed May 20, 2011
  2. Fixed django-reversion version to 1.3.3

    Jonas Obrist committed May 20, 2011
Commits on May 10, 2011
  1. Update Dutch locale (nl)

    CharString committed May 10, 2011
  2. Merged divio/master

    CharString committed May 10, 2011
Commits on Mar 31, 2011
Commits on Feb 22, 2011
  1. Merge branch 'hotfix/2.1.3'

    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
  3. python 2.5 incompatibilities

    Jonas Obrist committed Feb 22, 2011
  4. Bumped version number

    Jonas Obrist committed Feb 22, 2011
  5. Updated CHANGELOG.txt

    Jonas Obrist committed Feb 22, 2011
  6. Fixed problem with multiple_reverse_monkeypatch test

    Jonas Obrist committed Feb 22, 2011
  7. Merge branch 'feature/double-monkeypatch-fix' of https://github.com/p…

    …iquadrat/django-cms into hotfix/2.1.3
    Jonas Obrist committed Feb 22, 2011
  8. Added Iacopo Spalletti to AUTHORS

    Jonas Obrist committed Feb 22, 2011
  9. Merge branch 'hotfix/2.1.2' of https://github.com/nephila/django-cms

    …into hotfix/2.1.3
    
    Conflicts:
    	cms/tests/__init__.py
    Jonas Obrist committed Feb 22, 2011
  10. More fixes due to bad backporting from develop

    Jonas Obrist committed Feb 22, 2011
  11. Fixed issues introduced by backporting from develop

    Jonas Obrist committed Feb 22, 2011
  12. Fixed indentation error

    Jonas Obrist committed Feb 22, 2011
  13. Added tests for placeholderadmin and pageadmin plugin operations secu…

    …rity
    
    Added permission checks to placeholders and placeholderadmin
    Fixed limits not being respected by placeholderadmin
    
    Conflicts:
    
    	cms/test/testcases.py
    	cms/tests/placeholder.py
    	cms/tests/plugins.py
    Jonas Obrist committed Feb 22, 2011
Commits on Feb 21, 2011
Commits on Feb 18, 2011
Commits on Feb 16, 2011
  1. Merge branch 'hotfix/2.1.2'

    Jonas Obrist committed Feb 16, 2011
  2. Added Manuel Schmidt, kar1m, Krzysztof Bandurski and Angelo Dini to A…

    …UTHORS
    
    Smarter sorting in AUTHORS
    Jonas Obrist committed Feb 16, 2011
  3. Bumped version to 2.1.2

    Jonas Obrist committed Feb 16, 2011
  4. Updated changelog with 2.1.1 and 2.1.2 releases

    Jonas Obrist committed Feb 16, 2011
  5. Alphabetically ordered AUTHORS and put core committers in a seperate …

    …list, so people get a better grasp of who is who.
    Jonas Obrist committed Feb 16, 2011
  6. updated locales from transifex

    Jonas Obrist committed Feb 16, 2011