This repository was archived by the owner on May 6, 2024. It is now read-only.
forked from feincms/feincms
-
Notifications
You must be signed in to change notification settings - Fork 0
Update IXC feincms to 1.8.x #2
Open
mjog
wants to merge
239
commits into
ixc:master
Choose a base branch
from
mjog:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
…oring second call to register_regions"
…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.
…l-level validation) Refs feincms#480.
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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!