Merge develop into sane-add-plugin #2 #5122
Merged
Conversation
This file contains 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
…modal-private Modal private methods unit tests
…modal-private Unit tests for modal private methods
…modal-private tests for loadIframe
Conflicts: cms/static/cms/js/dist/bundle.admin.base.min.js cms/static/cms/js/dist/bundle.toolbar.min.js cms/static/cms/js/modules/cms.base.js cms/static/cms/js/modules/cms.toolbar.js
Conflicts: cms/static/cms/js/dist/bundle.admin.pagetree.min.js cms/static/cms/js/modules/cms.pagetree.js
fix removePage, reuse expandPlaceholderPlugins, add openSideframe, expandPageTree, getPageId
Conflicts: gulpfile.js
…/cms-sideframe CMS Sideframe unit tests
…/cms-structureboard CMS Structureboard unit tests
|
also the branch will require additional code to deal with some of the stuff we had before |
|
Changes Unknown when pulling eec6bb1 on czpython:merge/sane-add-plugin-2 into * on divio:sane-add-plugin*. |
|
Changes Unknown when pulling 77cab91 on czpython:merge/sane-add-plugin-2 into * on divio:sane-add-plugin*. |
|
Changes Unknown when pulling 2c8fd6c on czpython:merge/sane-add-plugin-2 into * on divio:sane-add-plugin*. |
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.
Merge develop into sane-add-plugin
Pending conflicts:
CONFLICT (content): Merge conflict in cms/static/cms/js/modules/cms.plugins.js
CONFLICT (content): Merge conflict in cms/static/cms/js/dist/bundle.toolbar.min.js
CONFLICT (content): Merge conflict in cms/static/cms/js/dist/bundle.admin.pagetree.min.js
CONFLICT (content): Merge conflict in cms/static/cms/js/dist/bundle.admin.base.min.js
Fixed Conflicts:
CONFLICT (content): Merge conflict in cms/tests/test_cache.py
@vxsx all yours 😈