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.

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

Release hotfixes to production #3138

Merged
merged 84 commits into from
May 5, 2021
Merged

Release hotfixes to production #3138

merged 84 commits into from
May 5, 2021

Conversation

bjester
Copy link
Member

@bjester bjester commented May 5, 2021

Summary

See staged release here #3115

sairina and others added 30 commits January 13, 2021 20:32
Adding dots between languages on sign-in page
- Removes PrimaryDialog from ChannelItem.vue as the modal
  handling the deletion pop-up.
- Wraps the <VCard> with a <div> so that KModal can live outside
  of the hierarchy of the <VCard>, which wraps internals in an <a>
  tag resulting in clicking the action buttons in KModal following
  that <a> tag.
Cascade latest release into develop
Fix a linter issue (RouterNames -> RouteNames)
To make migration to KModal simpler

- Remove props that are not used from anywhere
- Remove logic related to copying or moving as `ProgressModal`
  is not used for these operations anymore
- Remove `showProgressModal` data that is used only in v-model
  of `ProgressModal`. `ProgressModal` doesn't use it at all
  to decide if it should be displayed and calculates these
  criteria internally instead.
Also required moving ChannelTokenModal usage in ChannelItem
such that it is rendered outside of the active wrapping DOM element
so that clicking the Close button on KModal doesn't click behind it too
Replace VDialog with KModal in "Related resources tab"
# Conflicts:
#	contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue
#	contentcuration/contentcuration/frontend/channelEdit/views/progress/__tests__/progressModal.spec.js
rtibbles and others added 23 commits April 15, 2021 12:58
Make ContentNode filter_edit_queryset consistent with other methods.
Clean up and consolidate permissions.
Reinstate synchronous channel size calculation with lower threshold, and resolve misc task related issues
Update 'customContentAnswer' for catalog FAQ
…n/ssri-6.0.2

Bump ssri from 6.0.1 to 6.0.2
…el-modal

Add editing permissions condition to view/display Publish Modal
…dsearchesmodal

KDS to Studio: Replace ResponsiveDialog by KModal in SavedSearchesModal
Catch duplicate editor assignment for newly created channels.
Hotfixes release for sprint ending 2021-04-26
Make sure to always annotate can_edit and can_view.
Added ES and FR translations for 'customContentAnswer'
Copy translations for close button label
Copy link
Member

@radinamatic radinamatic left a comment

Choose a reason for hiding this comment

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

Good to go! 💯

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants