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 #11871

Merged
merged 46 commits into from
Feb 21, 2024
Merged

0.16 into develop #11871

merged 46 commits into from
Feb 21, 2024

Conversation

rtibbles
Copy link
Member

@rtibbles rtibbles commented Feb 14, 2024

Summary

Cascade merge

Conflicts:

# kolibri/plugins/learn/assets/src/views/cards/CardGrid.vue
# kolibri/utils/env.py

rtibbles and others added 30 commits January 25, 2024 11:50
Use responsive composable instead of mixin to fix errors from the mixin.
…ion_errors

Capture more errors from the backend and show error messages for them
Use dataset flag to infer if we should allow sign up or not.
…d_that_is_the_question

Prevent user sign up on LOD imports
…redundant-label

Remove redundant mastery label masking exercise card thumbnail
…s_are_better_than_one

Ensure facility id is properly sent to public signup viewset.
…_seems_easier

Fix 500 errors when using django redis cache for response caching
…ort-loading-state

Add conditional check to ensure resource exists before rendering report page
…push_me_pull_you

Pass the correct kwargs to the cleanupsyncs management command.
…assignments

LOD Syncing: create canonical set of assignments when learner is assigned multiple ways
…e-crowdin

Update translations with latest from Crowdin
Pin all installer actions to specific versions.
…angelog-016

Update changelog for 0.16.0 release
@github-actions github-actions bot added DEV: dev-ops Continuous integration & deployment DEV: backend Python, databases, networking, filesystem... 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 SIZE: very large labels Feb 14, 2024
Copy link
Member

@marcellamaki marcellamaki left a comment

Choose a reason for hiding this comment

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

The one conflict resolution makes sense (linting, and linting checks passed) and smokle test checks out ✅ Should be good to go once the checks pass

rtibbles and others added 13 commits February 13, 2024 22:55
Fix version parsing for release candidates.
…l_the_queue

Reduce the chance of database locks interrupting soud syncing.
…ler_update

Update debian installer to include critical fix for raspberry Pi os.
…edoff

Set markdown to None in module cache to prevent it being imported by DRF.
…l_request

Prevent unique constraint saving errors.
Ensure noarch dir is added to path when abi3 c extensions are used.
# Conflicts:
#	kolibri/plugins/learn/assets/src/views/cards/CardGrid.vue
#	kolibri/utils/env.py
@rtibbles rtibbles merged commit 9f6898b into learningequality:develop Feb 21, 2024
31 checks passed
@rtibbles rtibbles deleted the 0.16intodevelop branch February 21, 2024 04:45
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: 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 SIZE: very large
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants