Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge down hotfixes into unstable #3734

Merged
merged 74 commits into from
Oct 12, 2022
Merged

Merge down hotfixes into unstable #3734

merged 74 commits into from
Oct 12, 2022

Conversation

bjester
Copy link
Member

@bjester bjester commented Oct 12, 2022

Summary

Merges fixes made in hotfixes branch back down into unstable

bjester and others added 30 commits September 16, 2022 10:19
@bjester
Merge branch 'master' into hotfixes
07520a8
@bjester
Merge pull request #3644 from learningequality/unstable
7a87cc6 
Hotfixes release for development ending 2022-09-16
@bjester
Ensure we set item-text, so option text renders correctly
6fcbeef
@rtibbles
Update metadata inheritance behaviour to pass through folders and onl…
7760c1d 
…y be applied to resources.
@marcellamaki
Merge pull request #3667 from bjester/multi-select-text
2b406ba 
Resolve missing option labels in content library filters
@bjester
Refactor nested field getter for bulk editing
0ed50bf
@rtibbles
Make language inherited from ancestors also.
b18228c
@bjester
Merge pull request #3671 from rtibbles/topic_metadata_updates
8c89cc9 
Topic metadata updates
@rtibbles
Merge pull request #3670 from bjester/bulk-metadata-editing
fbe6016 
Resolve issues affecting the bulk editing of new metadata fields
@bjester
Resolve issue with selection mismatch between autocomplete and checkbox
d767f21
@rtibbles
Merge pull request #3674 from bjester/category-option-selection
e8a6530 
Resolve issue with selection mismatch between autocomplete and checkbox
@rtibbles
Adds testing for publishing of old and new mastery models. Fixes issu…
80df99d 
…e with publishing of new format mastery models.
@rtibbles
Coerce returned channel_id to be a simple string rather than full uuid.
8128d94
@rtibbles
Remove duplication apply modifications function.
1b1ed50
@rtibbles
Update all indexedDB listener mutations to set the map to ensure reac…
ac9ace6 
…tive updates for new properties.

Fix assessment item change application.
Make the fileUploadsMap the source of truth.
@rtibbles
Coerce all file durations with floor instead of ceil.
7b482e7 
Do this to ensure that duration never exceeds actual duration and makes it tricky to get full progress for duration based progress.
@rtibbles
Merge pull request #3685 from rtibbles/hunting_for_ceils
796b011 
Coerce all file durations with floor instead of ceil.
@rtibbles
Add reactivity test for Content node indexedDB update mutation.
0990594 
Update mutations to use Vue.set.
@LianaHarris360
Fixed paragraph formatting and broken links within studio welcome email
2eb9936
@rtibbles
Set empty nested maps if they don't exist.
e37f682
@rtibbles
Update strings based on review.
4bffcaf
@rtibbles
Update resources needed.
ac85bcc 
Add for beginners checkbox.
Remove persistence of kolibri string label typos.
@rtibbles
Adds a persistent hint to add more detail for other supplies.
22d3a47
@LianaHarris360
Updated domain value for dictionaries within users.py
4832325
@bjester
Handle reverting moves; fix error when no changes were observed
4ea3285
@rtibbles
Handle case where multiple content tags exist for tag_name and null c…
bfd0bef 
…hannel_id.
@rtibbles
Remove unused decorator from models.py
c0eb5df
@rtibbles
Add tests for tag syncing and regression test for fix.
dd226be
@rtibbles
Set original_channel_id on the frontend to prevent errors on first re…
292e59c 
…nder.
@rtibbles
Only prevent refresh from the backend if changes have not been synced.
10f4e34
bjester and others added 19 commits September 30, 2022 12:21
@bjester
Update where method logic to prevent fetches that would fail
982fc02
@rtibbles
Merge pull request #3707 from bjester/topics-are-folders
909ee05 
Resolve issues with editing and browsing newly added topics
@bjester
Revert incorrect RTL fixes due to devserver
6bb154d
@bjester
Add dropdown wrapper to a couple more selects
4a98923
@marcellamaki
Merge pull request #3679 from bjester/import-search-layout
d97db89 
Dropdown consolidation, layout fixes, and RTL updates
@marcellamaki
Merge pull request #3698 from rtibbles/clipboard_context
e8421ab 
Do existence check on navigator.clipboard
@marcellamaki
Merge pull request #3702 from rtibbles/ordah_ordah
98f38d8 
Tweaks to channel ordering for import from channels
@bjester
Tweaks to welcome email, and signatures across all html emails
32f611f
@bjester
Merge pull request #3714 from bjester/email-tweaks
b3c9024 
Tweaks to welcome email and signatures across all html emails
@marcellamaki
Remove feature flag for channel quizzes, to improve completion and du…
fbb8b46 
…ration options interactions
@bjester
Hide published status when syncing
247481f
@rtibbles
Merge pull request #3717 from bjester/sync-progress
ed17889 
Hide published status when showing sync progress
@marcellamaki
Remove obsolete test
4d89608
@rtibbles
Merge pull request #3722 from marcellamaki/updates-to-completion-dura…
f079615 
…tion-for-references

Remove feature flag for channel quizzes, thus fixing completion/duration dropdowns
@bjester
Add logging around task fetching and enqueuing
a44fa67
@bjester
Reset new/updated descendant flag on publish
1561225
@rtibbles
Merge pull request #3732 from bjester/publish-status
08d80b1 
Reset new/updated descendant flags on publish
@rtibbles
Merge pull request #3724 from bjester/fetch-task-logging
ce9a704 
Add logging around task fetching and requeuing
@bjester
Merge branch 'unstable' into hotfixes-mergedd
2972b71
@bjester bjester marked this pull request as ready for review October 12, 2022 22:24
rtibbles
rtibbles approved these changes Oct 12, 2022
View reviewed changes
Copy link
Member

@rtibbles rtibbles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming there were no merge conflicts to take a closer look at, this seems a-OK!

@bjester
Copy link
Member Author

bjester commented Oct 12, 2022

@rtibbles There was a merge conflict resolved in 2972b71

@bjester
Copy link
Member Author

bjester commented Oct 12, 2022

Hmm that link doesn't work when I use it in a comment

@rtibbles
Copy link
Member

Which files had conflicts? Just so I can give them a closer look.

@bjester
Copy link
Member Author

bjester commented Oct 12, 2022

@rtibbles Just this one. I think Vivek added the published in unstable and ordering was modified or added in hotfixes

@rtibbles
Copy link
Member

Looks right, merge away!

@bjester bjester merged commit d91e52f into unstable Oct 12, 2022
@bjester bjester deleted the hotfixes-mergedd branch October 12, 2022 22:46
@bjester bjester mentioned this pull request May 3, 2023
Merged
@bjester bjester mentioned this pull request Jul 5, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rtibbles rtibbles rtibbles approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bjester @rtibbles @marcellamaki @LianaHarris360