Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 26, 2011
  1. @ojii

    Added Kim Blomqvist to AUTHORS

    ojii authored
Commits on Aug 25, 2011
  1. @kezabelle

    fix attr indent on menus

    kezabelle authored
  2. @kezabelle
  3. @ojii
  4. @ojii

    Translations pull from transifex

    ojii authored
  5. @ojii

    Merge pull request #961 from applecat/develop

    ojii authored
    Docs: fix docs/extending_cms/extending_examples.rst
  6. @ojii
  7. @applecat
  8. @ojii

    Some minor cleanups

    ojii authored
  9. @ojii

    Merge branch 'feature/speedups' of https://github.com/stephrdev/djang…

    ojii authored
    …o-cms into stephrdev-feature/speedups
  10. @ojii

    Fixed #963

    ojii authored
  11. @ojii

    Fixed #907

    ojii authored
  12. @ojii
  13. @ojii

    Merge pull request #960 from stephrdev/feature/fix_cached_loader

    ojii authored
    Placeholder scanning is broken with cached template loader.
  14. @ojii
Commits on Aug 24, 2011
  1. @kezabelle
  2. @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
  3. @ojii
  4. @ojii

    Bumped to 2.1.4

    ojii authored
  5. @ojii

    Updated CHANGELOG

    ojii authored
  6. @ojii
  7. @ojii

    Moved text plugin cleaning to cms.plugins.text.models.AbstractText.clean

    ojii authored
    Moved html cleaning to cms.utils.html.clean_html
  8. @ojii
Commits on Aug 23, 2011
  1. @applecat
Commits on Aug 19, 2011
  1. @applecat
  2. @stephrdev

    This fixes the placeholder scanning/template parsing when using the c…

    stephrdev authored
    …ached template loader.
    
    Without this fix the test suite will freeze/infinite loop while parsing the templates.
  3. @stephrdev
  4. @stephrdev

    Fetch the last position for the placeholder to add a correct position…

    stephrdev authored
    … to the new created plugin.
Commits on Aug 18, 2011
  1. @ojii

    yml was wrong it seems.

    ojii authored
    Next time I'll run the test suite locally before pushing :D
  2. @ojii

    Thanks yml

    ojii authored
  3. @ojii
  4. @ojii

    Silly code style changes

    ojii authored
  5. @ojii

    Merge branch 'feature/remove_transaction_page_publish' of https://git…

    ojii authored
    …hub.com/yml/django-cms into yml-feature/remove_transaction_page_publish
  6. @chrisglass

    Merge pull request #957 from ojii/feature/tutorial-improvements

    chrisglass authored
    Feature/tutorial improvements
  7. @ojii
Something went wrong with that request. Please try again.