-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Fix placeholder conf empty parent/child classes #3383
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
digi604
wants to merge
16
commits into
django-cms:develop
from
digi604:fix-placeholder_conf-empty-parent/child_classes
Closed
Fix placeholder conf empty parent/child classes #3383
digi604
wants to merge
16
commits into
django-cms:develop
from
digi604:fix-placeholder_conf-empty-parent/child_classes
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
Fixes bug which made it impossible to add plugins, with placeholder.pk>=1000. Reason was, that placeholder.pk got a thousand separator.
Conflicts: cms/templates/admin/cms/page/widgets/plugin_editor.html
Presently, the new RTD contents list in the sidebar is more or less unusable: https://www.dropbox.com/s/bl36v087cza6r7v/Screenshot%202014-07-14%2014.48.21.png (image) The new version looks like: https://www.dropbox.com/s/soiv9iq4vss1v9k/Screenshot%202014-07-14%2014.49.50.png The expanded table of contents still appears in the main index page. conf.py has also been updated to use the new RTD theme locally, if the user has it installed; if not it will use the built-in theme as usual. Also includes miscellaneous minor corrections.
Restructure documentation and improve contents tables (backport)
Fix docs building on master
`breadcrumb.html` is actually located in `menu`, not `cms`.
Fix location of breadcrumb template in docs
…hild_classes Conflicts: docs/getting_started/index.rst
Closing this: duplicate of #3385 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.