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

Release v0.16.x into develop #12181

Merged
merged 52 commits into from
May 23, 2024
Merged

Release v0.16.x into develop #12181

merged 52 commits into from
May 23, 2024

Conversation

rtibbles
Copy link
Member

@rtibbles rtibbles commented May 16, 2024 •
edited

Summary

Cascade merge
Conflicts:

# Conflicts:
#	.github/workflows/build_whl.yml
#	build_tools/preseed_home.py
#	kolibri/core/assets/src/core-app/apiSpec.js
#	kolibri/core/assets/src/views/TotalPoints.vue
#	kolibri/core/auth/test/test_api.py
#	kolibri/core/package.json
#	kolibri/plugins/coach/assets/src/app.js
#	packages/kolibri-core-for-export/package.json
#	yarn.lock

AlexVelezLl and others added 30 commits April 26, 2024 11:30
@AlexVelezLl
Upadte now value in SyncStatusDisplay
6c7896b
@rtibbles
Don't let users that are used for os user have their passwords set vi…
6e0bcb5 
…a the not specified password flow.
@rtibbles
Updates mac build to latest.
46c2b65
@LianaHarris360
Update facility settings link display for Learn only Device users
763cb26
@rtibbles
Add duplicate log consolidation to sync hooks.
fcd69e0
@marcellamaki
Merge pull request learningequality#12128 from rtibbles/fix_mac_signing
74fd3b2 
Updates mac build to latest.
@rtibbles
Always show the background for the Kolibri logo.
1c5f7f8
@marcellamaki
Merge pull request learningequality#12129 from rtibbles/background_check
535f108 
Always show the background for the Kolibri logo.
@AlexVelezLl
Merge pull request learningequality#12110 from AlexVelezLl/fix-update…
cb98c94 
…-last-sync

Update now value in SyncStatusDisplay
@LianaHarris360
Merge pull request learningequality#12123 from LianaHarris360/update-…
f10889b 
…facility-settings-link-display

Update facility settings link display for Learn Only Device users
Add form to add address after device import
c850ff6
@jredrejo
Merge pull request learningequality#12136 from jredrejo/add_new_devic…
7ca7454 
…e_post

Add form to add address after device import
@marcellamaki
Merge pull request learningequality#12131 from rtibbles/log_reconcile
6daf78c 
Add duplicate log consolidation to sync hooks.
@marcellamaki
Create a helper function to sort arrays according to their reference …
3c864f8 
…array for correct dropdown order, and use this function in the grade levels and accessiblity options dropdown menu creation
@rtibbles
Update brand color validation to match new schema.
268e3b8
@rtibbles
Update color tokens to ones that match the new scheme.
e239cbe
@AlexVelezLl
Fix facility sync elapsed time
b375a91
@rtibbles
Fix incorrect language code for Chewa. Use ny instead of nyn.
79df69a 
Add intl locale data for ny language code.
@rtibbles
Fix copies modal display.
4b5de0c
@rtibbles
Add core function for matching content language to current language.
00d7f70 
Update duplicate resource prioritization with new function.
@marcellamaki
Merge pull request learningequality#12154 from rtibbles/theming_miss
f5e9d6d 
Fix some missed updates in theming
@AlexVelezLl
Watch completed repeating tasks
4f33dc9
@AlexVelezLl
Fix clear task Resource
06546c6
@marcellamaki
Merge pull request learningequality#12115 from rtibbles/dont_take_my_…
ec43861 
…user

Don't let users that are used for os user have their passwords set via the not specified password flow.
@marcellamaki
Merge pull request learningequality#12152 from rtibbles/language!
32e1e94 
Fix language preferentiality for duplicate resources
@marcellamaki
Improve readability/simplicity based on pr feedback
cd6f9d8
@marcellamaki
upgrade KDS version to latest, which updates the points icon to match…
3bff490 
… the new brand
@marcellamaki
Set points icon to blue in AppBar
c22bda9
@marcellamaki
Remove now-unnecessary PointsIcon component, and refactor for simpler…
7d4d35b 
… icon usage. Minor styling tweak to correct alignment after this
@marcellamaki
Merge pull request learningequality#12161 from marcellamaki/dropdown-…
3d44bd9 
…sort-order

Align metadata dropdown order to the figma spec
@github-actions github-actions bot added DEV: dev-ops Continuous integration & deployment 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.) DEV: frontend labels May 16, 2024
@github-actions github-actions bot added DEV: tools Internal tooling for development SIZE: very large labels May 16, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented May 16, 2024 •
edited

Build Artifacts

Asset type Download link
PEX file kolibri-.pex
Windows Installer (EXE) kolibri-0.16.2b2.dev0+git.1136.gf261d548-windows-setup-unsigned.exe
Debian Package kolibri_0.16.2b2.dev0+git.1136.gf261d548-0ubuntu1_all.deb
Mac Installer (DMG) kolibri-0.16.2b2.dev0+git.1136.gf261d548-0.4.2.dmg
Android Package (APK) kolibri-0.16.2b2.dev0+git.1136.gf261d548-0.1.3-debug.apk
TAR file kolibri-0.16.2b2.dev0+git.1136.gf261d548.tar.gz
WHL file kolibri-0.16.2b2.dev0+git.1136.gf261d548-py2.py3-none-any.whl

bjester and others added 9 commits May 17, 2024 15:18
@bjester
Don't deprovision within running Kolibri to create preseeded DBs
1b7c572
@bjester
Try without python path; add rm of dist/home
ac8f733
@bjester
Convert to bash script with query verification
3fc8d81
@bjester
Install sqlite3 dep
641e804
@rtibbles
Merge pull request learningequality#12184 from bjester/unpreseed-db
a5ec048 
Don't deprovision within running Kolibri to create preseeded DBs
@rtibbles
Truncate the syncqueue table before we add the unique constraint.
8562347
@rtibbles
Merge pull request learningequality#12197 from rtibbles/truncate_sync…
4abdca3 
…queue

Truncate the syncqueue table before we add the unique constraint.
@rtibbles
Merge branch 'release-v0.16.x' into release-v0.16.xintodevelop
3e6dfff 
# Conflicts:
#	.github/workflows/build_whl.yml
#	build_tools/preseed_home.py
#	kolibri/core/assets/src/core-app/apiSpec.js
#	kolibri/core/assets/src/views/TotalPoints.vue
#	kolibri/core/auth/test/test_api.py
#	kolibri/core/package.json
#	kolibri/plugins/coach/assets/src/app.js
#	packages/kolibri-core-for-export/package.json
#	yarn.lock
@rtibbles
Merge conflicting migrations.
5fd5b0a
@rtibbles rtibbles force-pushed the release-v0.16.xintodevelop branch from 4405f30 to 5fd5b0a Compare May 23, 2024 16:21
marcellamaki
marcellamaki approved these changes May 23, 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 checks out, and in the files where there are conflicts, it does appear that the correct resolution happened.

@rtibbles rtibbles merged commit 5aa75bf into learningequality:develop May 23, 2024
31 checks passed
@rtibbles rtibbles deleted the release-v0.16.xintodevelop branch May 23, 2024 17:34
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: 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: 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: tools Internal tooling for development SIZE: very large
Projects
None yet
Milestone
Kolibri 0.17: General maintenance, bu...
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@rtibbles @marcellamaki @AlexVelezLl @LianaHarris360 @jredrejo @bjester