0.16 into develop #12239
Merged
0.16 into develop #12239
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nt_exist Handle case when username doesn't exist on remote and try to create it.
…r_realz Zip the whl file before uploading for BCK step.
Update background
Add transform to ensure proper layering in Safari.
# Conflicts: # kolibri/core/static/assets/default_theme/background.jpg # kolibri/core/static/assets/default_theme/kolibri-logo-192.png # kolibri/core/static/assets/default_theme/kolibri-logo-512.png # kolibri/core/static/assets/default_theme/kolibri-logo.svg # kolibri/core/static/assets/default_theme/logo.ico # kolibri/core/static/assets/kolibri-logo-192.png # kolibri/core/static/assets/kolibri-logo-512.png # kolibri/core/static/assets/kolibri-logo.svg # kolibri/core/static/assets/logo.ico # kolibri/plugins/default_theme/kolibri_plugin.py # kolibri/plugins/default_theme/static/assets/default_theme/kolibri-logo-192.png # kolibri/plugins/default_theme/static/assets/default_theme/kolibri-logo-512.png # kolibri/plugins/default_theme/static/assets/default_theme/kolibri-logo.svg # kolibri/plugins/default_theme/static/assets/default_theme/logo.ico # kolibri/plugins/user_auth/assets/src/views/AuthBase.vue
rtibbles
added this to the Kolibri 0.17: General maintenance, bugs, misc. important fixes milestone
github-actions
bot
added
DEV: dev-ops
Build Artifacts
|
marcellamaki
approved these changes
Jun 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This should be the final cascade merge into develop from release-v0.16.x
Conflicts mostly caused by the cherry pick commit, meaning the same changes are made on both branches in differently identified commits.