Skip to content
This repository was archived by the owner on May 6, 2024. It is now read-only.

Conversation

@mjog
Copy link

@mjog mjog commented Mar 24, 2014

This is just a merge of the v1.8.4 feincms tag over the top of the IXC fork, which is currently based on v1.7.6.

I need this for ic-cms feincms#648, specifically commit 8619e23, which uses TreeEditor.queryset() rather than TreeEditor.model.objects, allowing the PageManager which extends TreeEditor to return the appropriate set of non-published Page objects for admining.

After running it yesterday with minimal testing, it works great!

matthiask and others added 30 commits February 26, 2013 17:52
* master:
  Fix TreeEditor.indented_short_title if get_absolute_url crashes
* master:
  1.7 requires Django 1.4 or better
This project layout worked really well with Plata and Towel.
* master:
  Fix sitemap generation when there are no pages yet
* master:
  FeinCMS v1.7.1
  Fix feincms#394: Generation of extension search paths
…MIDDLEWARE_CLASSES. Avoids warning "feincms.module.extensions.translations:Could not access request.LANGUAGE_CODE"
* master:
  FeinCMS v1.7.2
  Fix test_36_sitemaps
  Rename the _feincms_content_model class to prevent name clashes
  Re feincms#399 catches "%sContent" class name conflicts and produces a warning.
  Better explanation re feincms#323.
  Re feincms#323 - models cache is cleared at the end of ensure_completely_loaded, so as to play nice with Django 1.5.

Conflicts:
	feincms/__init__.py
* official/next:
  Tests: Also call module.medialibrary doctests
…cript arrays, IE absolutely hates them.

Contributed in feincms#389 by Hedde.
… later with an obscure "Nonetype has no attribute".
…ould be found near the wanted splitting point.

Add tests for it too.
* master:
  Take a stab at fixing feincms#395
  Fix ckeditor init template. While there, fix trailing commas in javascript arrays, IE absolutely hates them.
matthiask and others added 30 commits November 8, 2013 16:02
Decouple PageSitemap from the One Page Model. See feincms#241.
Terrible oversights.
The don't break old code release.
Make {% feincms_breadcrumbs %} isinstance check BasePage not Page. See feincms#487
We still have a few ignored error codes and excluded folders left.
FeinCMS v1.8.4

Conflicts:
	feincms/admin/item_editor.py
	feincms/static/feincms/item_editor.js
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.