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 v0.14.x into develop #7927

Merged

Conversation

rtibbles
Copy link
Member

@rtibbles rtibbles commented Mar 26, 2021

Summary

  • Cascade merge - local merging showed no merge conflicts
  • Reverts 0e9f2ea
  • Reverts 2255cb5
  • Net result of reversions is to keep the KDS 0.2.1 updates in develop, even though we reverted them on 0.14.x

Contributor Checklist

PR process:

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Testing:

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

Reviewer Checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

metodimilevqa and others added 30 commits February 18, 2021 06:52
…est-scenarios

First offline test scenario
…all-krouterlinks"

This reverts commit 72a858a, reversing
changes made to fc57aeb.
…o reduce performance issues on larger collection hierarchies (> 100)
…hical_filtering_from_readable_user_permissions_filter

FacilityUser performance speed up for non-admin users
…e-0.14.7

Update localizations for 0.14.7
Error while installing yarn dependencies in Docker
Merging `as is` for now, will address the linting issue in subsequent PRs.
sairina and others added 20 commits March 19, 2021 15:50
Reduce transform scale to prevent overflow
…xt_on_shaved_componenets

feat: dynamically add title on shaved text
…/change-all-krouterlinks""

This reverts commit 0e9f2ea.
@rtibbles rtibbles added the TODO: needs review Waiting for review label Mar 26, 2021
@rtibbles rtibbles added this to the 0.15.0 milestone Mar 26, 2021
@rtibbles rtibbles requested a review from jonboiser March 26, 2021 18:34
@jonboiser jonboiser removed the TODO: needs review Waiting for review label Mar 26, 2021
@jonboiser jonboiser merged commit 76cc697 into learningequality:develop Mar 26, 2021
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