Permalink
Commits on Aug 28, 2011
  1. compiled translation catalogs

    Jonas Obrist committed Aug 28, 2011
  2. translations pulled from transifex

    Jonas Obrist committed Aug 28, 2011
  3. Added tests for toolbar show/notshow

    Jonas Obrist committed Aug 28, 2011
  4. Fixed #965 (toolbar shown too foten)

    cms_toolbar tag should now fail silently if for some reason there is no toolbar on the request
    Jonas Obrist committed Aug 28, 2011
Commits on Aug 26, 2011
  1. Added Kim Blomqvist to AUTHORS

    ojii committed Aug 26, 2011
Commits on Aug 25, 2011
  1. Merge pull request #964 from kezabelle/develop

    [Docs] minor app integration changes.
    ojii committed Aug 25, 2011
  2. pave the way for reducing some of the duplication between this page a…

    …nd the API ref by providing explicit call-outs to it.
    kezabelle committed Aug 25, 2011
  3. Improved install instructions to reflect recent changes

    Jonas Obrist committed Aug 25, 2011
  4. document node visibility here too, because the preceding statement im…

    …plies a full list of arguments is detailed.
    kezabelle committed Aug 25, 2011
  5. fix attr indent on menus

    kezabelle committed Aug 25, 2011
  6. Compiled new translations from transifex

    Jonas Obrist committed Aug 25, 2011
  7. Translations pull from transifex

    Jonas Obrist committed Aug 25, 2011
  8. Merge pull request #961 from applecat/develop

    Docs: fix docs/extending_cms/extending_examples.rst
    ojii committed Aug 25, 2011
  9. Cleaned up cms.plugins.text.settings and fixed #962, thanks to @fivet…

    …hreeo for the help
    Jonas Obrist committed Aug 25, 2011
  10. Some minor cleanups

    Jonas Obrist committed Aug 25, 2011
  11. Merge branch 'feature/speedups' of https://github.com/stephrdev/djang…

    …o-cms into stephrdev-feature/speedups
    Jonas Obrist committed Aug 25, 2011
  12. Fixed #963

    Jonas Obrist committed Aug 25, 2011
  13. Fixed #907

    Jonas Obrist committed Aug 25, 2011
  14. Merge pull request #954 from kblomqvist/develop

    Fix #953
    ojii committed Aug 25, 2011
  15. Merge pull request #960 from stephrdev/feature/fix_cached_loader

    Placeholder scanning is broken with cached template loader.
    ojii committed Aug 25, 2011
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. Made _get_inner_body a little more sane and robust

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

    Jonas Obrist committed Aug 24, 2011
  4. Updated CHANGELOG

    Jonas Obrist committed Aug 24, 2011
  5. 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
  6. Added html5lib powered html cleaning to text plugin (in form) and tes…

    …ts for it
    Jonas Obrist committed Aug 24, 2011
Commits on Aug 23, 2011