Merge 0.14.7a2 to develop #7818
Merged
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
…tzlocal-errors Handle ValueError from tzlocal.get_localzone
…pdate Indentation corrections + 2 new scenarios added
…e-pytz-2020.5 Upgrade pytz==2020.5
…r-profile-update Redirect to the Learn page after updating profile (when prompted by notification)
Do not compare noResults to a number
Removing all venv-specific code.
Shouldn't be necessary if fully dockerized.
…oad-step Encapsulate upload step
…e-v0.12.x Upload Step Dockerization | 0.13 <- 0.12
Simplifies the step and removes unnecessary complexity from the build overall.
…oad-step Removing gcloud upload step during release.
…e-v0.12.x Enacpsulate Upload Step | 0.13 <- 0.12
…oad-step Encapsulate upload step
…mation In password-update sign-in flow, block user if password and its confirmation do not match
…o-develop # Conflicts: # docs/i18n.rst # kolibri/__init__.py # kolibri/plugins/facility/assets/src/views/ClassEnrollForm.vue # kolibri/plugins/h5p_viewer/assets/src/views/Html5AppRendererIndex.vue # kolibri/plugins/html5_viewer/assets/src/views/Html5AppRendererIndex.vue
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.
Merge 0.14.7a2 to develop