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

0.16 into develop #11745

Merged
merged 54 commits into from
Jan 19, 2024
Merged

0.16 into develop #11745

merged 54 commits into from
Jan 19, 2024

Conversation

rtibbles
Copy link
Member

Summary

Cascade merge

References

Conflicts:

    #       kolibri/plugins/facility/assets/src/views/DataPage/index.vue
    #       kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/HowAreYouUsingKolibri.vue
    #       packages/hashi/src/H5P/H5PRunner.js

Additional updates made to:

  • kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
  • kolibri/plugins/setup_wizard/assets/src/machines/wizardMachine.js
  • kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
  • kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SettingUpKolibri.vue

To address linting errors from reintroduction of no-console rule and import errors caused by moving the Presets constant to core.

Reviewer guidance

Hopefully just a successful build is the key here.


Testing checklist

  • 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

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

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

Sorry, something went wrong.

adviti-mishra and others added 30 commits December 4, 2023 22:17
Workflow for task_runner tests in multiprocessing mode in the macOS environment to stimulate conditions for the KeyError issue
running specific test cases made to test the fix
Handle metadata import failure.
Remove inaccessible language switcher modal.
Bumps the babel group with 1 update: [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env).


Updates `@babel/preset-env` from 7.23.7 to 7.23.8
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.8/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: babel
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [stylelint-scss](https://github.com/stylelint-scss/stylelint-scss) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/stylelint-scss/stylelint-scss/releases)
- [Changelog](https://github.com/stylelint-scss/stylelint-scss/blob/master/CHANGELOG.md)
- [Commits](stylelint-scss/stylelint-scss@v5.3.1...v5.3.2)

---
updated-dependencies:
- dependency-name: stylelint-scss
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…dabot/npm_and_yarn/stylelint-scss-5.3.2

Bump stylelint-scss from 5.3.1 to 5.3.2
…dabot/npm_and_yarn/babel-a8655fc483

Bump the babel group with 1 update
merge
AllanOXDi and others added 9 commits January 17, 2024 15:01
Unpin docs requirements and tweak docs to fix build
…-consts

Swap on-my-own const for using the existing Personal const
…dal-edge-cases

Fix welcome modal appearing after deleting channels
…-error

Username case error
…uttons_in_app_context

No download buttons in app context
# Conflicts:
#	kolibri/plugins/facility/assets/src/views/DataPage/index.vue
#	kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/HowAreYouUsingKolibri.vue
#	packages/hashi/src/H5P/H5PRunner.js
@rtibbles rtibbles added the TODO: needs review Waiting for review label Jan 18, 2024
@rtibbles rtibbles requested a review from marcellamaki January 18, 2024 23:31
@github-actions github-actions bot added DEV: dev-ops Continuous integration & deployment DEV: renderers HTML5 apps, videos, exercises, etc. DEV: backend Python, databases, networking, filesystem... APP: Device Re: Device App (content import/export, facility-syncing, user permissions, etc.) APP: Facility Re: Facility App (user/class management, facility settings, csv import/export, etc.) APP: Learn Re: Learn App (content, quizzes, lessons, etc.) APP: Coach Re: Coach App (lessons, quizzes, groups, reports, etc.) APP: User Re: User app (sign-in, sign-up, user profile, etc.) APP: Setup Wizard Re: Setup Wizard (facility import, superuser creation, settings, etc.) DEV: frontend DEV: tools Internal tooling for development labels Jan 18, 2024
@rtibbles rtibbles changed the base branch from release-v0.16.x to develop January 18, 2024 23:32
@rtibbles rtibbles merged commit 66589c6 into learningequality:develop Jan 19, 2024
31 checks passed
@rtibbles rtibbles deleted the 0.16intodevelop branch January 19, 2024 00:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
APP: Coach Re: Coach App (lessons, quizzes, groups, reports, etc.) APP: Device Re: Device App (content import/export, facility-syncing, user permissions, etc.) APP: Facility Re: Facility App (user/class management, facility settings, csv import/export, etc.) APP: Learn Re: Learn App (content, quizzes, lessons, etc.) APP: Setup Wizard Re: Setup Wizard (facility import, superuser creation, settings, etc.) APP: User Re: User app (sign-in, sign-up, user profile, etc.) DEV: backend Python, databases, networking, filesystem... DEV: dev-ops Continuous integration & deployment DEV: frontend DEV: renderers HTML5 apps, videos, exercises, etc. DEV: tools Internal tooling for development SIZE: medium TODO: needs review Waiting for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants