Upgrade to current django-cms develop branch#95
Merged
nickstenning merged 2 commits intomasterfrom Feb 21, 2014
Merged
Conversation
|
Coverage remained the same when pulling 1c18faec2311ad9e4b57bdfec8799d5e780e8300 on bump-djangocms into 86331a1 on master. |
Member
Author
|
Not entirely sure why coveralls isn't reporting a coverage figure -- it all seems to be working locally... |
Member
Author
|
Anyway, @tryggvib -- if you could try this out locally (make sure you run |
Member
|
Works for me with the fix I just pushed (it fixes search). |
django-cms is currently gearing up for 3.0.0beta4. Bump version to pick up new styles for admin pages and (hopefully) fixed image upload plugins.
django-cms version 3 includes backward incompatible changes in that they removed the published boolean field for pages which was being used by aldryn_search to see what pages should be indexed (only published ones). The current aldryn_search version therefore does not work for django-cms3 but their github repo includes a branch that does. Incidentally this also includes a fix for the bug where an EmptyQuerySet was instantiated (something which was dropped in Django 1.6). So by moving to the cms3-compat branch we solve two problems, we no longer have to maintain our own fork with the Django 1.6 bug fix and we can use django-cms version 3.
Member
Author
|
Okay, merging. |
nickstenning
added a commit
that referenced
this pull request
Feb 21, 2014
Upgrade to current django-cms develop branch
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
django-cms is currently gearing up for 3.0.0beta4. Bump version to pick up new styles for admin pages and (hopefully) fixed image upload plugins.