Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 27, 2015
  1. @yakky

    Merge branch 'release/3.0.14' into HEAD

    yakky authored
    Conflicts:
    	CHANGELOG.txt
    	cms/admin/pageadmin.py
    	cms/locale/zh_CN.GB2312/LC_MESSAGES/django.mo
    	cms/locale/zh_CN.GB2312/LC_MESSAGES/django.po
    	cms/locale/zh_CN.GB2312/LC_MESSAGES/djangojs.mo
    	cms/locale/zh_CN.GB2312/LC_MESSAGES/djangojs.po
    	docs/upgrade/index.rst
  2. @yakky
Commits on Jun 10, 2015
  1. @yakky

    Merge remote-tracking branch 'upstream/support/3.0.x' into remerge_3014

    yakky authored
    Conflicts:
    	cms/tests/menu.py
Commits on Jun 8, 2015
  1. @douwevandermeij @yakky
  2. @yakky

    Merge remote-tracking branch 'upstream/support/3.0.x' into c

    yakky authored
    Conflicts:
    	CHANGELOG.txt
    	cms/admin/change_list.py
    	cms/cms_toolbar.py
    	cms/menu.py
    	cms/templatetags/cms_tags.py
    	cms/test_utils/project/sampleapp/menu.py
    	cms/test_utils/project/sampleapp/urls.py
    	cms/test_utils/project/sampleapp/views.py
    	cms/tests/apphooks.py
    	cms/tests/menu.py
    	cms/tests/multilingual.py
    	cms/tests/placeholder.py
    	cms/tests/toolbar.py
    	cms/utils/plugins.py
    	menus/menu_pool.py
    	menus/templatetags/menu_tags.py
    	setup.py
    	test_requirements/django-1.4.txt
    	test_requirements/django-1.5.txt
    	test_requirements/requirements_base.txt
Commits on Jun 6, 2015
  1. @yakky
Commits on May 26, 2015
  1. @mkoistinen

    Remove ineffective test

    mkoistinen authored
  2. @mkoistinen

    Remove debugging code

    mkoistinen authored
  3. @mkoistinen

    Fix after testing better

    mkoistinen authored
  4. @mkoistinen

    Update

    mkoistinen authored
  5. @mkoistinen
Commits on May 5, 2015
  1. @yakky

    Fix menu templatetags

    yakky authored
Commits on Apr 16, 2015
  1. @mkoistinen

    The fix

    mkoistinen authored
    This issue here was that *sometimes* when, we're unlucky, the wrong publisher version (draft, public) was getting marked as "selected", which then later was being pruned out of the set of nodes. The solution is to mark both versions as selected and let the "wrong" one be pruned, leaving the good one in.
  2. @mkoistinen

    whitespace, pep8, style

    mkoistinen authored
  3. @mkoistinen
  4. @mkoistinen
Commits on Apr 10, 2015
  1. @yakky
Commits on Mar 28, 2015
  1. @yakky

    Fix comments

    yakky authored
Commits on Mar 15, 2015
  1. @yakky

    Fix error in registering menus

    yakky authored
Commits on Mar 4, 2015
  1. @yakky
Commits on Feb 7, 2015
  1. @timgraham
  2. @timgraham
Commits on Feb 5, 2015
  1. @mkoistinen
Commits on Feb 2, 2015
  1. @mkoistinen

    fix hasattr

    mkoistinen authored
  2. @mkoistinen
Commits on Jan 31, 2015
  1. @mkoistinen

    Support apphook_config'ed CMSAttachMenus

    mkoistinen authored
    To be honest, this work probably enables some features to work as they were expected to work in the first place, even without considering apphook_configs. For example, if previously, someone wanted to attach the same CMSAttachMenu to multiple apphooks, or directly to multiple pages, it would have not worked. It may now.
    
    Still need to write tests (and run existing).
  2. @mkoistinen
Commits on Jan 27, 2015
  1. @timgraham
Commits on Dec 10, 2014
  1. @yakky

    Fix merge

    yakky authored
Commits on Dec 1, 2014
  1. @yakky

    Fix query count, imports

    yakky authored
  2. @yakky
Commits on Nov 8, 2014
  1. @bradmwalker

    menus.*: comprehensions, infix if/else, shortcut or

    bradmwalker authored
    MenuPool.get_menus_by_attribute():
    The value parameter shouldn't be None so the hasattr() call was dropped.
Commits on Nov 5, 2014
  1. @yakky
Commits on Sep 27, 2014
  1. @yakky
Commits on Aug 22, 2014
  1. @yakky
Something went wrong with that request. Please try again.