Permalink
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
  1. @yakky
  2. @yakky
Commits on Feb 18, 2011
  1. @piquadrat
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
  7. Added CSRF Protection to text plugins for embbed plugins (thanks to M…

    …anuel Schmidt and kar1m for helping with this)
    Jonas Obrist committed Feb 16, 2011
Commits on Feb 15, 2011
  1. fixed csrf issues (thanks to krisb78 and Angelo Dini for helping with…

    … this)
    Jonas Obrist committed Feb 15, 2011
  2. fixed an issue in the sampleapp (tests)

    Jonas Obrist committed Feb 15, 2011
Commits on Feb 13, 2011
  1. @piquadrat
Commits on Feb 9, 2011
  1. Merge branch 'hotfix/2.1.1'

    Jonas Obrist committed Feb 9, 2011
  2. bumped veresion to 2.1.1

    Jonas Obrist committed Feb 9, 2011
  3. fixed pageadmin lookup_allowed

    Jonas Obrist committed Feb 9, 2011
  4. Merge branch 'master' of https://github.com/gleb-chipiga/django-cms i…

    …nto hotfix/master
    Jonas Obrist committed Feb 9, 2011
  5. changed tests to use django 1.2.5

    Jonas Obrist committed Feb 9, 2011
  6. hotfix for Django 1.2.5 (csrf changes for AJAX)

    Jonas Obrist committed Feb 9, 2011
Commits on Jan 28, 2011
  1. fixed classifier in setup.py

    Jonas Obrist committed Jan 28, 2011
Commits on Jan 27, 2011
  1. @gleb-chipiga
Commits on Jan 26, 2011
  1. 2.1.0 Final Release

    Jonas Obrist committed Jan 26, 2011