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

Merge unstable to hotfixes #4270

Merged
merged 57 commits into from
Sep 14, 2023
Merged

Merge unstable to hotfixes #4270

merged 57 commits into from
Sep 14, 2023

Conversation

marcellamaki
Copy link
Member

@marcellamaki marcellamaki commented Aug 31, 2023

Summary

PR Issue Category QA Focus
#4181 #4079 UI: Fixes scroll to display "Question Type" on new question creation Test adding new questions, and confirm the page doesn't autoscroll and type is now displayed
#4186 #4166 UI: Adds text truncation in import channel dropdown Manual confirmation that original issue is resolved
#4260 #4215 UI: "Practice quiz" labeling Ensure Practice Quiz completion criteria label is fixed in the "Details" side panel
#4131 N/A N/A N/A
#4255 N/A UI: Upload H5P files Upload a range of H5P files and ensure that upload works - preview will not display
#4262 N/A N/A N/A
#4245 N/A Merge down: Hotfixes > Unstable N/A
#4129 N/A Dependency Bump N/A
#4213 N/A Dependency Bump N/A
#4132 N/A Dependency Bump N/A
#4217 N/A Dependency Bump N/A
#4218 N/A Dependency Bump N/A
#3887 N/A Dependency Bump N/A
#4225 N/A Dependency Bump N/A
#4224 N/A Dependency Bump N/A
#4223 N/A Dependency Bump N/A
#4227 N/A Dependency Bump N/A
#4228 N/A Dependency Bump N/A
#4230 N/A Dependency Bump N/A
#4234 N/A Dependency Bump N/A
#4235 N/A Dependency Bump N/A
#4252 N/A Dependency Bump N/A
#4271 N/A Dependency Bump N/A

Reviewer guidance

How can a reviewer test these changes?

Please see the QA descriptions and linked issues/PRs for manual QA details

Note that the two remaining fixes by Vivek were merged directly into hotfixes, which is why they are not listed here. They will be detailed in the hotfixes QA table.

dependabot bot and others added 30 commits June 12, 2023 01:00
Bumps [stylus-loader](https://github.com/webpack-contrib/stylus-loader) from 7.1.2 to 7.1.3.
- [Release notes](https://github.com/webpack-contrib/stylus-loader/releases)
- [Changelog](https://github.com/webpack-contrib/stylus-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/stylus-loader@v7.1.2...v7.1.3)

---
updated-dependencies:
- dependency-name: stylus-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
- implement code to extract .h5p files metadata;
Bumps [fonttools](https://github.com/fonttools/fonttools) from 4.27.1 to 4.40.0.
- [Release notes](https://github.com/fonttools/fonttools/releases)
- [Changelog](https://github.com/fonttools/fonttools/blob/main/NEWS.rst)
- [Commits](fonttools/fonttools@4.27.1...4.40.0)

---
updated-dependencies:
- dependency-name: fonttools
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
- override file title
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…n/stylus-loader-7.1.3

Bump stylus-loader from 7.1.2 to 7.1.3
…n/semver-5.7.2

Bump semver from 5.7.1 to 5.7.2
…ls-4.40.0

Bump fonttools from 4.27.1 to 4.40.0
Bumps [google-cloud-kms](https://github.com/googleapis/python-kms) from 1.4.0 to 2.10.0.
- [Release notes](https://github.com/googleapis/python-kms/releases)
- [Changelog](https://github.com/googleapis/python-kms/blob/main/CHANGELOG.md)
- [Commits](googleapis/python-kms@v1.4.0...v2.10.0)

---
updated-dependencies:
- dependency-name: google-cloud-kms
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [workbox-precaching](https://github.com/googlechrome/workbox) from 6.5.4 to 7.0.0.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](GoogleChrome/workbox@v6.5.4...v7.0.0)

---
updated-dependencies:
- dependency-name: workbox-precaching
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…n/workbox-precaching-7.0.0

Bump workbox-precaching from 6.5.4 to 7.0.0
Bumps [jest-serializer-vue](https://github.com/eddyerburgh/jest-serializer-vue) from 2.0.2 to 3.1.0.
- [Release notes](https://github.com/eddyerburgh/jest-serializer-vue/releases)
- [Changelog](https://github.com/eddyerburgh/jest-serializer-vue/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eddyerburgh/jest-serializer-vue/commits)

---
updated-dependencies:
- dependency-name: jest-serializer-vue
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…n/jest-serializer-vue-3.1.0

Bump jest-serializer-vue from 2.0.2 to 3.1.0
…cloud-kms-2.10.0

Bump google-cloud-kms from 1.4.0 to 2.10.0
Bumps [django-s3-storage](https://github.com/etianen/django-s3-storage) from 0.13.11 to 0.14.0.
- [Release notes](https://github.com/etianen/django-s3-storage/releases)
- [Changelog](https://github.com/etianen/django-s3-storage/blob/master/CHANGELOG.rst)
- [Commits](etianen/django-s3-storage@0.13.11...0.14.0)

---
updated-dependencies:
- dependency-name: django-s3-storage
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [locust](https://github.com/locustio/locust) from 2.8.6 to 2.15.1.
- [Release notes](https://github.com/locustio/locust/releases)
- [Changelog](https://github.com/locustio/locust/blob/master/CHANGELOG.md)
- [Commits](locustio/locust@2.8.6...2.15.1)

---
updated-dependencies:
- dependency-name: locust
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [workbox-webpack-plugin](https://github.com/googlechrome/workbox) from 6.5.4 to 7.0.0.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](GoogleChrome/workbox@v6.5.4...v7.0.0)

---
updated-dependencies:
- dependency-name: workbox-webpack-plugin
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…n/workbox-webpack-plugin-7.0.0

Bump workbox-webpack-plugin from 6.5.4 to 7.0.0
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…s3-storage-0.14.0

Bump django-s3-storage from 0.13.11 to 0.14.0
Bumps [attrs](https://github.com/python-attrs/attrs) from 19.3.0 to 23.1.0.
- [Release notes](https://github.com/python-attrs/attrs/releases)
- [Changelog](https://github.com/python-attrs/attrs/blob/main/CHANGELOG.md)
- [Commits](python-attrs/attrs@19.3.0...23.1.0)

---
updated-dependencies:
- dependency-name: attrs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [workbox-window](https://github.com/googlechrome/workbox) from 6.5.4 to 7.0.0.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](GoogleChrome/workbox@v6.5.4...v7.0.0)

---
updated-dependencies:
- dependency-name: workbox-window
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…n/workbox-window-7.0.0

Bump workbox-window from 6.5.4 to 7.0.0
…n/word-wrap-1.2.4

Bump word-wrap from 1.2.3 to 1.2.4
rtibbles and others added 24 commits July 19, 2023 19:05
…n/dexie-3.2.4

Bump dexie from 3.2.2 to 3.2.4
…n/less-loader-11.1.3

Bump less-loader from 11.0.0 to 11.1.3
…ing-text-on-dropdown

added text truncate in import channel dropdown
Merge down hotfixes into unstable
…question-should-show-question-type

removed scroll on adding new question
Bumps [le-utils](https://github.com/learningequality/le-utils) from 0.1.42 to 0.2.1.
- [Release notes](https://github.com/learningequality/le-utils/releases)
- [Changelog](https://github.com/learningequality/le-utils/blob/main/CHANGELOG.md)
- [Commits](learningequality/le-utils@v0.1.42...v0.2.1)

---
updated-dependencies:
- dependency-name: le-utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Implementation to extract metadata from H5P Content Package
…s-0.2.1

Bump le-utils from 0.1.42 to 0.2.1
New django app 'automation' for future AI features
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…ons/actions/checkout-4

Bump actions/checkout from 3 to 4
@marcellamaki marcellamaki marked this pull request as ready for review September 14, 2023 14:46
@marcellamaki marcellamaki changed the title [DRAFT] Merge unstable to hotfixes Merge unstable to hotfixes Sep 14, 2023
@rtibbles rtibbles merged commit b24c843 into hotfixes Sep 14, 2023
19 checks passed
@marcellamaki
Copy link
Member Author

@pcenov @radinamatic - the main items for manual QA are listed in the table above. There are also two more issues, where the PR was merged directly into hotfixes. Those two PRs are:

Each of these has Manual Verification steps listed out, but if you have any questions, please let me know. Thank you!

@bjester bjester mentioned this pull request Sep 27, 2023
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.

None yet

8 participants