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

Cascade merge 0.16 into develop #11135

Merged
merged 109 commits into from
Aug 22, 2023
Merged

Cascade merge 0.16 into develop #11135

merged 109 commits into from
Aug 22, 2023

Conversation

rtibbles
Copy link
Member

Cascade merge

bjester and others added 30 commits August 8, 2023 13:29
@bjester
Consolidate api resources into one set
b25c4ac
@bjester
Add new source instance ID field for preferred download sourcing
a40372f
@bjester
Allow setting of source instance ID in API with tests
19bbe0a
@bjester
Pass along instance id when initiating a download
ea0429f
@bjester
Handle preferred instances when importing metadata
a8b3dfb
@bjester
Upgrade le_utils and incorporate well known Studio UUID
b6fc377
@bjester
Add new location_type field, switch over to it
d5b9e55
@bjester
Update resource import to use preferred location
7c438f4
@bjester
use studio id string for now
f9f9bb6
@bjester
Filter network locations when on metered connection with disabled
dd9be51
@bjester
Special handling for reserved locations
e4c1c09
@bjester
Rename existing external download for disambiguation
7abe48a
@bjester
Defensiveness on UUID vs str
39edad2
@bjester
Allow detail fetching using instance_id
db1deca
@bjester
Log routing errors and dedupe router.replace calls
f8b8fee
@bjester
Integrate allow learner downloads
323b25a
@bjester
More integration with device settings
b8bce32
@bjester
Fixes for total size aggregation and tests
c5d14ae
@bjester
Content download from studio testing
dae1282
@bjester
Override content settings function for checking metered status
bee839a
@bjester
Adjust testing check
140fa63
@bjester
Frontend test fixes
b65cd2e
@bjester
Mock that the netloc is not reserved
902f377
@bjester
Add testing flag to core settings, combine total size annotation, bre…
4bf143d 
…akout free space calc
@bjester
Different approach for inline migration
1ba3cca
@bjester
Return promise since .catch is applied to return value
b9e3098
@bjester
Increase diff to better identify issue with flaky tests
38894ce
@bjester
Add super setup call for safety
81148be
@dependabot
Bump recast from 0.23.3 to 0.23.4
5a886f2 
Bumps [recast](https://github.com/benjamn/recast) from 0.23.3 to 0.23.4.
- [Release notes](https://github.com/benjamn/recast/releases)
- [Commits](benjamn/recast@v0.23.3...v0.23.4)

---
updated-dependencies:
- dependency-name: recast
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@rtibbles
Merge pull request #11089 from learningequality/dependabot/npm_and_ya…
dd43382 
…rn/recast-0.23.4

Bump recast from 0.23.3 to 0.23.4
LianaHarris360 and others added 16 commits August 18, 2023 12:50
@LianaHarris360
Fix resource viewing wasted vertical spacing for smaller devices
fac2319
@bjester
Merge pull request #11120 from rtibbles/stop_drop_and_roll
5342834 
Actually cancel running jobs on worker shutdown to prevent blocking shutdown
@marcellamaki
Updates AppBar styles to be consistent on desktop, no matter app or n…
0367f5f 
…ot, and limit app nav styles to mobile and tablet app
@dependabot
Bump core-js from 3.32.0 to 3.32.1
3e858f0 
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.32.0 to 3.32.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.32.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Bump @testing-library/jest-dom from 6.0.0 to 6.0.1
465abd8 
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](testing-library/jest-dom@v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Bump eslint-plugin-import from 2.28.0 to 2.28.1
78a4fb0 
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.0 to 2.28.1.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](import-js/eslint-plugin-import@v2.28.0...v2.28.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@MisRob
Fix links to issues
ec25e89
@rtibbles
Merge pull request #11123 from learningequality/dependabot/npm_and_ya…
9ebce57 
…rn/core-js-3.32.1

Bump core-js from 3.32.0 to 3.32.1
@rtibbles
Merge pull request #11124 from learningequality/dependabot/npm_and_ya…
5e970ca 
…rn/testing-library/jest-dom-6.0.1

Bump @testing-library/jest-dom from 6.0.0 to 6.0.1
@rtibbles
Merge pull request #11125 from learningequality/dependabot/npm_and_ya…
0fbe6ec 
…rn/eslint-plugin-import-2.28.1

Bump eslint-plugin-import from 2.28.0 to 2.28.1
@rtibbles
Merge pull request #11126 from MisRob/docs-links-fix
3d54cba 
Fix links to issues in the contributing guidelines
@rtibbles
Merge pull request #11122 from LianaHarris360/vertical-spacing-resour…
2ef4d39 
…ce-views

Fix resource viewing wasted vertical spacing for smaller devices
@marcellamaki
Code cleanup, add comments to better explain the interdpendence of tw…
5a37699 
…o files that manage app navigation UI
@dependabot
Bump jest from 29.6.2 to 29.6.3
e37bdb9 
Bumps [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) from 29.6.2 to 29.6.3.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.6.3/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@GarvitSinghal47
Merge branch 'learningequality:release-v0.16.x' into ux-1
56dd3b9
@MisRob
Merge pull request #11090 from GarvitSinghal47/ux-1
b356d93 
ui error resolved related to library
@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: Learn Re: Learn App (content, quizzes, lessons, etc.) APP: Setup Wizard Re: Setup Wizard (facility import, superuser creation, settings, etc.) SIZE: very large labels Aug 22, 2023
@rtibbles rtibbles mentioned this pull request Aug 22, 2023
Closed
9 tasks
@rtibbles
Merge pull request #11128 from learningequality/dependabot/npm_and_ya…
4929268 
…rn/jest-29.6.3

Bump jest from 29.6.2 to 29.6.3
@rtibbles
Merge pull request #11008 from marcellamaki/desktop-navigation-breakp…
b2bd70b 
…oints

Updates AppBar styles to be consistent on desktop
@rtibbles rtibbles merged commit 8e8f98b into develop Aug 22, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Aug 22, 2023 •
edited
Loading

Build Artifacts

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

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

@MisRob MisRob Awaiting requested review from MisRob

Assignees
No one assigned
Labels
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 SIZE: very large
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@rtibbles @marcellamaki @bjester @GarvitSinghal47 @MisRob @jredrejo @manuq @thanksameeelian @LianaHarris360