Master into develop cascade merge#2985
Merged
rtibbles merged 38 commits intolearningequality:developfrom Feb 23, 2021
Merged
Conversation
…ion_updates Updates to create channel internal endpoint to handle custom channel navigation creation
…e_username Trim whitespace for email addresses
…_channels Avoid left join when filtering for channel permissions
Release 2021-02-15
…s, clipboard steps moved to scenario
Allow MPTT updates when uploading tree to ensure proper order.
…e-field Fix "randomize question order" field not being synced when toggling its checkbox in EditModal
Fix channel thumbnail links in Details.vue
…width Fix resource panel header width
update stopPublish action to work also cancel sync tasks
For feedback direct users to the forum instead.
Disable usage of spreadsheet row filling
…extra code and simplify conditions.
…ss-modal-titles Fix mismatch between Progress Modal content and current task
Release 2021-02-23 UX Data Consistency Pt 1
# Conflicts: # contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue # contentcuration/contentcuration/frontend/channelEdit/views/progress/__tests__/progressModal.spec.js
marcellamaki
approved these changes
Feb 23, 2021
Member
marcellamaki
left a comment
marcellamaki
left a comment
There was a problem hiding this comment.
The conflicts in the Progress Modal look to be resolved correctly to me
Codecov Report
@@ Coverage Diff @@
## develop #2985 +/- ##
===========================================
+ Coverage 85.53% 85.74% +0.21%
===========================================
Files 299 298 -1
Lines 15827 15843 +16
===========================================
+ Hits 13538 13585 +47
+ Misses 2289 2258 -31
Continue to review full report at Codecov.
|
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
8 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.
Conflicts: