-
Notifications
You must be signed in to change notification settings - Fork 180
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
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
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.
Rename RouterNames -> RouteNames
Cascade latest release into develop
Fix a linter issue (RouterNames -> RouteNames)
Add flower to dev dependencies
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"
Migrate ProgressModal to KDS
# Conflicts: # contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue # contentcuration/contentcuration/frontend/channelEdit/views/progress/__tests__/progressModal.spec.js
Master into develop cascade merge
Master to hotfixes
Make ContentNode filter_edit_queryset consistent with other methods.
Hotfixes to unstable
Clean up and consolidate permissions.
Reinstate synchronous channel size calculation with lower threshold, and resolve misc task related issues
Update 'customContentAnswer' for catalog FAQ
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](npm/ssri@v6.0.1...v6.0.2) Signed-off-by: dependabot[bot] <[email protected]>
…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
rtibbles
approved these changes
May 5, 2021
radinamatic
approved these changes
May 5, 2021
There was a problem hiding this 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
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.
Summary
See staged release here #3115