Skip to content

Conversation

@rtibbles
Copy link
Member

@rtibbles rtibbles commented Aug 6, 2025

Cascade merge

Conflicts:
CONFLICT (content): Merge conflict in kolibri/init.py
CONFLICT (content): Merge conflict in kolibri/plugins/coach/assets/src/views/common/QuestionsAccordion.vue
CONFLICT (content): Merge conflict in packages/kolibri/components/DownloadButton.vue
CONFLICT (content): Merge conflict in packages/kolibri/constants.js
CONFLICT (content): Merge conflict in packages/kolibri/package.json

rtibbles and others added 30 commits July 15, 2025 16:23
Only pass defined urls to query parameters.
Allow bloompubs with undefined distribution files to be rendered
Deprecate ContentRenderer mixin and ContentRenderer API.
Migrate usage of ContentRenderer to ContentViewer.
Rename code and docs to prefer 'viewer' to 'renderer'.
Consolidate content viewer props.
Remove stale prop passing for unused/nonexistent props.
[HTML5 Article Renderer] Apply table styling
rtibbles and others added 14 commits July 25, 2025 09:43
MVP Implementation of QTI Multiple Choice and Text Entry
…tats box, and have lessons completed set to 0 without additional text if no lessons exist
…n-completed-number

Fix lesson completed number to be filtered by user
Fix answer saving for quizzes, practice quizzes, and surveys
@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: Learn Re: Learn App (content, quizzes, lessons, etc.) APP: Coach Re: Coach App (lessons, quizzes, groups, reports, etc.) APP: Setup Wizard Re: Setup Wizard (facility import, superuser creation, settings, etc.) DEV: frontend DEV: tools Internal tooling for development SIZE: very large labels Aug 6, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Aug 6, 2025

@marcellamaki marcellamaki merged commit 19b2f28 into learningequality:develop Aug 7, 2025
51 checks passed
@rtibbles rtibbles deleted the 0.18intodevelop branch August 7, 2025 19:42
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: Learn Re: Learn App (content, quizzes, lessons, etc.) APP: Setup Wizard Re: Setup Wizard (facility import, superuser creation, settings, 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: very large

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants