0.16 into develop #11460

rtibbles · 2023-10-25T21:38:35Z

Summary

Cascade merge

Merge conflicts:

#	kolibri/core/auth/serializers.py
#	kolibri/core/package.json
#	kolibri/plugins/coach/assets/src/views/CoachImmersivePage.vue
#	kolibri/plugins/perseus_viewer/assets/src/views/PerseusRendererIndex.vue
#	yarn.lock

Nothing particularly tricky about the merge conflict resolutions.

serializers.py was just two adjacent import changes resolved
package.json resolved in favour of the KDS beta - as the commit referenced by develop appears to be unfindable
CoachImmersivePage - complete vs partial removal of unused class
PerseusRendererIndex - two adjacent import edits
yarn.lock automatically resolved by yarn

References

…

Reviewer guidance

…

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

…ads.

…ent storage.

… base process bus.

…ystems.

Include diskcache directory in file size counts.

…superuser with an osuser

contentnode is deleted.

Bumps [launch-editor-middleware](https://github.com/yyx990803/launch-editor) from 2.6.0 to 2.6.1. - [Commits](yyx990803/launch-editor@v2.6.0...v2.6.1) --- updated-dependencies: - dependency-name: launch-editor-middleware dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Commit updates to state sorted by timestamp. Fixes learningequality#11302 where "Completed" update was commited before "Started" update.

… Media Player plugin (learningequality#11365) Replace KResponsiveWindow mixin by useKResponsiveWindow composable - Media Player plugin

…dabot/npm_and_yarn/launch-editor-middleware-2.6.1 Bump launch-editor-middleware from 2.6.0 to 2.6.1

Bumps [csv-parse](https://github.com/adaltas/node-csv/tree/HEAD/packages/csv-parse) from 5.5.1 to 5.5.2. - [Changelog](https://github.com/adaltas/node-csv/blob/master/packages/csv-parse/CHANGELOG.md) - [Commits](https://github.com/adaltas/node-csv/commits/[email protected]/packages/csv-parse) --- updated-dependencies: - dependency-name: csv-parse dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…ns-order Fix order in which notification updates are commited to state

…ools Update package versions for latest publish.

…dabot/npm_and_yarn/csv-parse-5.5.2 Bump csv-parse from 5.5.1 to 5.5.2

…itted

…le download button after download initiated cleanup

…lity

… polls for the currently available devices and can be shared across components and files

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…dabot/npm_and_yarn/eslint-plugin-import-2.29.0 Bump eslint-plugin-import from 2.28.1 to 2.29.0

…dabot/github_actions/actions/setup-node-4 Bump actions/setup-node from 3 to 4

on the Kolibri v16 release branch Release notes: https://github.com/learningequality/kolibri-design-system/releases/tag/v2.0.0-beta1

…dal_Message Fix unwanted welcomeModal display

Pin KDS to version 2.0.0-beta1

…storage-not-calculated Fixes My downloads - The 'Available storage' value not being calculated when I am signed in as a Learner

Bumps [xstate](https://github.com/statelyai/xstate) from 4.38.2 to 4.38.3. - [Release notes](https://github.com/statelyai/xstate/releases) - [Commits](https://github.com/statelyai/xstate/compare/[email protected]@4.38.3) --- updated-dependencies: - dependency-name: xstate dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…dabot/npm_and_yarn/xstate-4.38.3 Bump xstate from 4.38.2 to 4.38.3

# Conflicts: # kolibri/core/auth/serializers.py # kolibri/core/package.json # kolibri/plugins/coach/assets/src/views/CoachImmersivePage.vue # kolibri/plugins/perseus_viewer/assets/src/views/PerseusRendererIndex.vue # yarn.lock

github-actions · 2023-10-25T22:32:24Z

Build Artifacts

Asset type	Download link
PEX file	kolibri-0.16.0b6.dev0_git.484.g20f38a9e.pex
Windows Installer (EXE)	kolibri-0.16.0b6.dev0+git.484.g20f38a9e-unsigned.exe
Debian Package	kolibri_0.16.0b6.dev0+git.484.g20f38a9e-0ubuntu1_all.deb
Mac Installer (DMG)	kolibri-0.16.0b6.dev0+git.484.g20f38a9e-0.3.0.dmg
Android Package (APK)	kolibri-0.16.0b6.dev0+git.484.g20f38a9e-0.1.0-debug.apk
TAR file	kolibri-0.16.0b6.dev0+git.484.g20f38a9e.tar.gz
WHL file	kolibri-0.16.0b6.dev0+git.484.g20f38a9e-py2.py3-none-any.whl

rtibbles and others added 30 commits August 8, 2023 10:25

Change the way we check for Android to use Python internals.

9238464

Add utility to manage and evict chunked files.

7bb6cfb

Tweak storage calc logic to prevent double counting incomplete downlo…

2f1f14c

…ads.

Use streamed file cache clear as a last resort when there's insuffici…

44f8613

…ent storage.

Add method to limit_files to a specific total number of bytes.

2eb8f41

Separate out default task scheduling into separate plugin, and add to…

b24bb37

… base process bus.

Add scheduled task for cleaning up the streamed file cache.

ea0772f

Sort file names to avoid inconsistency of os.walk on different file s…

8ca431d

…ystems.

Optimize os.walk usage.

2b35350

Include diskcache directory in file size counts.

Raise when the channel cannot be found on the remote.

6f3e5a5

Update device provisioning serializer to allow associating a created …

1e7107f

…superuser with an osuser

Always collect and send superuser info except for on my own setup.

2644c03

Update package versions for latest publish.

e30af52

Catch any request exception and raise a LocationError instead.

f06a0a8

Mark Completed ContentDownloadRequests as pending when the associated

db42132

contentnode is deleted.

Fix order in which notification updates are commited to state

17225f9

Commit updates to state sorted by timestamp. Fixes learningequality#11302 where "Completed" update was commited before "Started" update.

Replaced KResponsiveWindow mixin by useKResponsiveWindow composable -…

a18fffb

… Media Player plugin (learningequality#11365) Replace KResponsiveWindow mixin by useKResponsiveWindow composable - Media Player plugin

Merge pull request learningequality#11373 from learningequality/depen…

abc863b

…dabot/npm_and_yarn/launch-editor-middleware-2.6.1 Bump launch-editor-middleware from 2.6.0 to 2.6.1

Merge pull request learningequality#11374 from MisRob/fix-notificatio…

e67339e

…ns-order Fix order in which notification updates are commited to state

Merge pull request learningequality#11370 from rtibbles/dev5kolibri-t…

7f026dd

…ools Update package versions for latest publish.

Merge pull request learningequality#11376 from learningequality/depen…

da0cba2

…dabot/npm_and_yarn/csv-parse-5.5.2 Bump csv-parse from 5.5.1 to 5.5.2

Download page displays in sidenav only when download permissions perm…

338b3a8

…itted

Add download progress polling, remove download before complete, disab…

c14586a

…le download button after download initiated cleanup

Fixing prop warning topics page

7164551

conditionalize failure errors based on source device network availabi…

145a142

…lity

PR feedback implementation

817324b

Update useDevices composable to contain a networkDevices object which…

4247069

… polls for the currently available devices and can be shared across components and files

Misc. cleanup of downloads related files

a92e54e

dependabot bot and others added 17 commits October 24, 2023 00:34

Merge pull request learningequality#11450 from learningequality/depen…

cdba002

…dabot/npm_and_yarn/eslint-plugin-import-2.29.0 Bump eslint-plugin-import from 2.28.1 to 2.29.0

Merge pull request learningequality#11452 from learningequality/depen…

7fb25aa

…dabot/github_actions/actions/setup-node-4 Bump actions/setup-node from 3 to 4

Pin KDS to version 2.0.0-beta1

a08ab52

on the Kolibri v16 release branch Release notes: https://github.com/learningequality/kolibri-design-system/releases/tag/v2.0.0-beta1

Merge branch 'release-v0.16.x' into pin-kds

2a683b4

Relaxes freespace permissions

c4a8ac2

fixes available storage bug

f870c9b

Streamlines storage of space to bytes in the backend

f0ec413

Fixes conflicts on rebase

72ef54d

Uses pure calculations for gigabyte conversions

6f6b075

fixes collapsing label when size limit is set to 0

263936a

Merge pull request learningequality#11449 from ozer550/Fix_Welcome_Mo…

5686106

…dal_Message Fix unwanted welcomeModal display

Merge pull request learningequality#11431 from MisRob/pin-kds

28918e3

Pin KDS to version 2.0.0-beta1

Merge pull request learningequality#11412 from akolson/fix-available-…

19c3384

…storage-not-calculated Fixes My downloads - The 'Available storage' value not being calculated when I am signed in as a Learner

Merge pull request learningequality#11454 from learningequality/depen…

041ff47

…dabot/npm_and_yarn/xstate-4.38.3 Bump xstate from 4.38.2 to 4.38.3

Merge branch 'release-v0.16.x' into develop

fea24d0

# Conflicts: # kolibri/core/auth/serializers.py # kolibri/core/package.json # kolibri/plugins/coach/assets/src/views/CoachImmersivePage.vue # kolibri/plugins/perseus_viewer/assets/src/views/PerseusRendererIndex.vue # yarn.lock

rtibbles added the TODO: needs review Waiting for review label Oct 25, 2023

rtibbles requested a review from marcellamaki October 25, 2023 21:38

marcellamaki approved these changes Oct 25, 2023

View reviewed changes

marcellamaki merged commit 545323a into learningequality:develop Oct 25, 2023
34 checks passed

rtibbles deleted the 0.16intodevelop branch October 26, 2023 00:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

0.16 into develop #11460

0.16 into develop #11460

rtibbles commented Oct 25, 2023

github-actions bot commented Oct 25, 2023

0.16 into develop #11460

0.16 into develop #11460

Conversation

rtibbles commented Oct 25, 2023

Summary

References

Reviewer guidance

Testing checklist

PR process

Reviewer checklist

github-actions bot commented Oct 25, 2023

Build Artifacts