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.

Sign up for GitHub

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

Jump to bottom

0.16 into develop #12014

Merged
merged 87 commits into from
Mar 22, 2024
Merged

0.16 into develop #12014

merged 87 commits into from
Mar 22, 2024

Conversation

rtibbles
Copy link
Member

Summary

Cascade merge

# Conflicts:
#	AUTHORS.md
#	kolibri/core/assets/src/views/language-switcher/LanguageSwitcherList.vue
#	kolibri/core/package.json
#	kolibri/plugins/pdf_viewer/package.json
#	kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/CreateLearnerAccountForm.vue
#	kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GuestAccessForm.vue
#	kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/RequirePasswordForLearnersForm.vue
#	packages/kolibri-core-for-export/package.json
#	packages/kolibri-tools/package.json
#	yarn.lock

Nothing seemed particularly concerning in terms of the merge conflict resolution.

rtibbles and others added 30 commits January 11, 2024 15:21
@rtibbles
Removes inconsistently applied and mostly no-op double click blocking.
4d442d6
@rtibbles
Delete coreAPI PageRoot component in favour of default component in k…
2ce9790 
…olibri_app.
@KshitijThareja
Fix NO_FILE_BASED_LOGGING env var not working properly
f81afc9
@KshitijThareja
Fix condition check for env var
0641169
@KshitijThareja
Make code python2 compatible
717a931
@KshitijThareja
Add condition check before calling render on response
bb86130
@KshitijThareja
Check if response.render is callable
716eb84
@nick2432
Merge pull request #7 from learningequality/release-v0.16.x
4655620 
merge
@rtibbles
Avoid looking up the facility user twice if not needed.
e20025c 
Ensure we don't error when exact username duplicates exist in a facility.
@ThEditor
feat: update to vue-virtual-scroller 1.1.2
6aa9ef2
@ThEditor
feat: dynamic scroller
d851068
@ThEditor
fix: preloading offset pages
36c83eb
@ThEditor
chore: add theditor to authors
4702ab5
@ThEditor
revert: preloading offset pages
7d8488e
@ThEditor
chore: variable mode recyclable scroller
740426b
@ThEditor
fix: linting issues
5982d4a
@ThEditor
chore: add recyclescroller credits
12490d2
@ThEditor
chore: dynamic height loading
b00e981
@ThEditor
chore: scroll buffer & item height
54490df
@ThEditor
docs: modifications to recyclescroller
bdaf4c4
@ThEditor
refactor: lint fix
2b0024b
@ThEditor
refactor: cleanup
fd46934
@ThEditor
fix: mobile scrolling
979391e
@ThEditor
fix: extra space at pdf end
fa6100e
@thesujai
Watch core for changes if KDS option is provided
fc3a453
@ThEditor
refactor: lint fix
3ac6614
@KshitijThareja
Update env var condition
3044120
@KshitijThareja
Add a check for response.content
1540ece
@ThEditor
refactor: more lint fixes
9b95098
@nick2432
Merge pull request #8 from learningequality/release-v0.16.x
705045a 
Release v0.16.x
marcellamaki and others added 15 commits February 27, 2024 17:40
@marcellamaki
Merge pull request learningequality#11730 from rtibbles/rooting_out_p…
51a7503 
…ages

Delete coreAPI PageRoot component in favour of a default component in kolibri_app
@marcellamaki
Merge pull request learningequality#11719 from rtibbles/double_click_…
91f0b3e 
…blocking

Removes inconsistently applied and mostly no-op double click blocking.
@MisRob
Install KDS 3.0.1
b3e7aa3 
Release notes
- https://github.com/learningequality/kolibri-design-system/releases/tag/v3.0.0
- https://github.com/learningequality/kolibri-design-system/releases/tag/v3.0.1
@rtibbles
Pin vue and vue-template-compiler to ensure correct version is used i…
650359a 
…n kolibri-tools.
@bjester
Merge pull request learningequality#11930 from rtibbles/pin_vue_and_t…
a19234a 
…emplates

Pin vue and vue-template-compiler to ensure correct version is used in kolibri-tools.
@iskipu
fix syntax
f1f71f2
@rtibbles
Merge pull request learningequality#11929 from MisRob/upgrade-kds
33e4c76 
Upgrade KDS from v2.0.0 to v3.0.1 on the release branch
@iskipu
fix syntax again :)
4cf7b76
@LianaHarris360
Merge pull request learningequality#11921 from iskipu/spinner_misalign
f63cb78 
Fix Loader Misallignment and Flickering
Use FacilityUser instead of AUTH_USER_MODEL in migrations
c888bd8
@rtibbles
Do further cleanup to remove unneeded swappable dependencies in migra…
3fa705c 
…tions.
@jredrejo
Merge pull request learningequality#11984 from jredrejo/do_not_use_AU…
4959560 
…TH_USER_MODEL

Use FacilityUser instead of AUTH_USER_MODEL in migrations
@thesujai
add IsAuthenticated permission class in api/content/contentrequest
b7e52c8
@rtibbles
Merge pull request learningequality#11995 from thesujai/IsAuthenticat…
8ca3654 
…ed-permission

Add IsAuthenticated permission class in api/content/contentrequest
@rtibbles
Merge branch 'release-v0.16.x' into develop
66d0f6d 
# Conflicts:
#	AUTHORS.md
#	kolibri/core/assets/src/views/language-switcher/LanguageSwitcherList.vue
#	kolibri/core/package.json
#	kolibri/plugins/pdf_viewer/package.json
#	kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/CreateLearnerAccountForm.vue
#	kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GuestAccessForm.vue
#	kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/RequirePasswordForLearnersForm.vue
#	packages/kolibri-core-for-export/package.json
#	packages/kolibri-tools/package.json
#	yarn.lock
@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: 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 SIZE: large labels Mar 21, 2024
@github-actions GitHub Actions
Copy link
Contributor

Build Artifacts

Asset type Download link
PEX file kolibri-.pex
Windows Installer (EXE) kolibri-0.16.1.dev0+git.20240321233217-unsigned.exe
Debian Package kolibri_0.16.1.dev0+git.20240321233217-0ubuntu1_all.deb
Mac Installer (DMG) kolibri-0.16.1.dev0+git.20240321233217-0.4.0.dmg
Android Package (APK) kolibri-0.16.1.dev0+git.20240321233217-0.1.0-debug.apk
TAR file kolibri-0.16.1.dev0+git.20240321233217.tar.gz
WHL file kolibri-0.16.1.dev0+git.20240321233217-py2.py3-none-any.whl

marcellamaki
marcellamaki approved these changes Mar 22, 2024
View reviewed changes
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.

quick smoke test looks good

@rtibbles
Copy link
Member Author

This PR switches MacOS tests to 3.10 rather than 3.6. Merging and will then update the required checks.

@rtibbles rtibbles merged commit 564e713 into learningequality:develop Mar 22, 2024
31 checks passed
@rtibbles rtibbles deleted the 0.16intodevelop branch March 22, 2024 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcellamaki marcellamaki marcellamaki approved these changes

Assignees
No one assigned
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 DEV: renderers HTML5 apps, videos, exercises, etc. DEV: tools Internal tooling for development SIZE: large
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.