Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 24, 2012
  1. @piquadrat
  2. @piquadrat

    Merge remote-tracking branch 'remotes/pvanderlinden/show_placeholder_…

    piquadrat authored
    …fix' into develop
    
    Conflicts:
    	tests/project/settings.py
Commits on Jun 8, 2012
  1. @ojii

    removed buildout tests

    ojii authored
Commits on Jun 7, 2012
  1. @FinalAngel
  2. @KristianOellegaard
  3. @KristianOellegaard
  4. @piquadrat
  5. @ojii

    don't use cached template loader

    ojii authored
  6. @ojii
  7. @piquadrat

    changed settings.py of the test app for Django 1.4 compatibility.

    piquadrat authored
     * renamed ``'django.core.context_processors.auth'`` to
       ``'django.contrib.auth.context_processors.auth'`` in
       ``TEMPLATE_CONTEXT_PROCESSORS``
     * added ``'django.contrib.messages.middleware.MessageMiddleware'``
       to ``MIDDLEWARE_CLASSES``
    
    This removes all the noise from running tests under 1.4 so that we
    can get some actual work done. -101 failing tests :)
  8. @ojii

    disable xml results by default

    ojii authored
    added -t/--time-tests flags to runtests.sh to get the ten slowest test
    added -x/--xml-reports to runtests.sh to enable the xml reports
Commits on Jan 9, 2012
  1. @ojii

    enforce mptt 0.5.1, not 0.4.2

    ojii authored
Commits on Nov 29, 2011
  1. added extra tests showing the bug

    Paul van der Linden authored
Commits on Nov 6, 2011
  1. @ojii

    yep, typo

    ojii authored
Commits on Nov 3, 2011
  1. @ojii
Commits on Oct 30, 2011
  1. @ojii
Commits on Oct 14, 2011
  1. @ojii

    Merge branch 'feature/url_overwrite_signals' of https://github.com/st…

    ojii authored
    …ephrdev/django-cms into stephrdev-feature/url_overwrite_signals
  2. @ojii

    Merge branch 'placeholderfix' of https://github.com/pvanderlinden/dja…

    ojii authored
    …ngo-cms into pvanderlinden-placeholderfix
Commits on Oct 10, 2011
  1. @ojii

    proof #1041 is not an issue

    ojii authored
Commits on Oct 6, 2011
  1. @pvanderlinden
Commits on Oct 5, 2011
  1. @stephrdev
Commits on Aug 25, 2011
  1. @ojii

    Merge pull request #960 from stephrdev/feature/fix_cached_loader

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

    Merge branch 'develop' into stephrdev-feature/staticfiles

    ojii authored
    Conflicts:
    	cms/admin/pageadmin.py
    	cms/admin/placeholderadmin.py
    	cms/forms/widgets.py
    	cms/media/cms/js/libs/jquery.bind.js
    	cms/media/cms/js/libs/jquery.cookie.js
    	cms/media/cms/js/libs/jquery.form.js
    	cms/media/cms/js/libs/jquery.functional.js
    	cms/media/cms/js/libs/jquery.livequery.js
    	cms/media/cms/js/libs/jquery.query.js
    	cms/media/cms/js/libs/jquery.tweet.js
    	cms/media/cms/js/libs/jquery.ui.checkbox.js
    	cms/media/cms/js/libs/jquery.ui.core.js
    	cms/media/cms/js/libs/jquery.ui.dialog.js
    	cms/media/cms/js/libs/jquery.ui.effects.core.js
    	cms/media/cms/js/libs/jquery.ui.effects.highlight.js
    	cms/media/cms/js/libs/jquery.ui.sortable.js
    	cms/media/cms/js/plugins/jquery.cookie.js
    	cms/media/cms/js/plugins/jquery.tweet.js
    	cms/plugins/text/widgets/wymeditor_widget.py
    	cms/plugins/twitter/templates/cms/plugins/twitter_recent_entries.html
    	cms/static/cms/js/plugins/jquery.cookie.js
    	cms/static/cms/js/plugins/jquery.tweet.js
    	cms/static/cms/js/plugins/jquery.ui.core.js
    	cms/static/cms/js/plugins/jquery.ui.draggable.js
    	cms/static/cms/js/plugins/jquery.ui.droppable.js
    	cms/static/cms/jstree/_lib/jquery.cookie.js
    	cms/templates/admin/cms/page/change_list.html
    	cms/templates/admin/cms/page/plugin_change_form.html
    	cms/templates/admin/cms/page/plugin_forms_history.html
    	cms/templates/cms/toolbar/toolbar.html
    	cms/tests/plugins.py
Commits on Aug 3, 2011
  1. @ojii

    Fixed adding plugins to PlaceholderFields in frontend

    ojii authored
    Added a view in the tests project to see the placeholder field frontend admin in action
  2. @ojii

    Fixed wym editor

    ojii authored
  3. @ojii

    Tests blergh

    ojii authored
  4. @ojii

    Merge branch 'feature/staticfiles' of https://github.com/stephrdev/dj…

    ojii authored
    …ango-cms into stephrdev-feature/staticfiles
    
    Conflicts:
    	cms/plugins/video/templates/cms/plugins/video.html
    	cms/toolbar/items.py
    	tests/project/settings.py
  5. @ojii

    Merge branch 'feature/toolbar-frontend' of git://github.com/FinalAnge…

    ojii authored
    …l/django-cms into finalangel-feature/toolbar-frontend
Commits on Aug 2, 2011
  1. @FinalAngel
Commits on Jul 28, 2011
  1. @mbi

    Include STATIC_URL in the list of url prefixes not to be transformed …

    mbi authored
    …by the MultilingualURLMiddleware
Something went wrong with that request. Please try again.