Fix conflicts with refactored develop #2
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
# Conflicts: # frontend/src/core/editor/page/models/editorBlockModel.js # frontend/src/core/editor/page/models/editorComponentModel.js
# Conflicts: # frontend/src/core/less/sharedStyles.less # frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js
# Conflicts: # frontend/src/core/editor/extensions/views/editorExtensionsEditView.js # frontend/src/core/editor/page/models/editorBlockModel.js # frontend/src/core/editor/page/models/editorComponentModel.js
# Conflicts: # frontend/src/core/editor/page/models/editorBlockModel.js # frontend/src/core/editor/page/models/editorComponentModel.js
* develop: (29 commits) Remove test data both before and after tests Add extended timeout to after() in addition to before() Reinstate longer timeout Add grunt to deps Temporarily disable casperjs tests Update package.json prior for next release Update mocha Tidy up mocha config Switch to use grunt test task Only show logger errors Remove log Update config files Amend testData Alter tests to stop error messages Move data folder cleanup and rename various things for readability Rename references to tenant record results for clarity fix tests, upgrade should tests now allways start with a clean db Add comment Fix removeDirectory ...
Seems 1 min isn't enough for the Travis servers, so bumping to 10 as before
* develop: (29 commits) Remove test data both before and after tests Add extended timeout to after() in addition to before() Reinstate longer timeout Add grunt to deps Temporarily disable casperjs tests Update package.json prior for next release Update mocha Tidy up mocha config Switch to use grunt test task Only show logger errors Remove log Update config files Amend testData Alter tests to stop error messages Move data folder cleanup and rename various things for readability Rename references to tenant record results for clarity fix tests, upgrade should tests now allways start with a clean db Add comment Fix removeDirectory ...
* develop: (30 commits) Remove test data both before and after tests Add extended timeout to after() in addition to before() Reinstate longer timeout Add grunt to deps Temporarily disable casperjs tests Update package.json prior for next release Update mocha Tidy up mocha config Switch to use grunt test task Fix heading Only show logger errors Remove log Update config files Amend testData Alter tests to stop error messages Move data folder cleanup and rename various things for readability Rename references to tenant record results for clarity fix tests, upgrade should tests now allways start with a clean db Add comment ...
* develop: (57 commits) Remove test data both before and after tests Add extended timeout to after() in addition to before() Reinstate longer timeout Add grunt to deps Temporarily disable casperjs tests Update package.json prior for next release Update mocha Tidy up mocha config Switch to use grunt test task Fix heading Only show logger errors Remove log Update config files Amend testData Alter tests to stop error messages Move data folder cleanup and rename various things for readability Rename references to tenant record results for clarity fix tests, upgrade should tests now allways start with a clean db Add comment ...
Bump timeout for Travis
simplifed conection string auth source check logic
* develop: Bump timeout for Travis
Use variables for font weights
Fix auth source issue
Remove sidebar progress bars
Remove unused files
Fix asset preview in place
Remove grunt-casperjs from dependencies
Populate new courses so that they can be previewed
* develop: (296 commits) revert image changes Refactor nesting Localise page title, remove initialize function from models rebase and fix conflicts plus broken stuff localise body text Add block layout options Populate new courses so that they can be previewed Remove test_frontend/ Remove grunt-casperjs from dependencies fix auth source issue Bump timeout for Travis Fix asset preview in place Remove test data both before and after tests Add extended timeout to after() in addition to before() Reinstate longer timeout Add grunt to deps Temporarily disable casperjs tests Update package.json prior for next release Update mocha Tidy up mocha config ... # Conflicts: # frontend/src/modules/editor/contentObject/views/editorPageComponentListView.js # frontend/src/modules/editor/contentObject/views/editorPageComponentView.js # frontend/src/modules/editor/global/views/editorOriginView.js
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.
Hi Dan, we're not able to merge your PR into develop due to various conflicts, so I've attempted to fix these here (done a merge rather than a rebase, feel free to do yourself if you'd prefer).