-
Notifications
You must be signed in to change notification settings - Fork 716
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.
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
Merge 0.14.7 to develop #8022
Merged
rtibbles
merged 35 commits into
learningequality:develop
from
jonboiser:merge-0.14.7-to-develop
Apr 20, 2021
Merged
Merge 0.14.7 to develop #8022
rtibbles
merged 35 commits into
learningequality:develop
from
jonboiser:merge-0.14.7-to-develop
Apr 20, 2021
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
…ncies Stop installing dev dependencies during build.
Open CSV file with utf-8 encoding in Py3.
…g-pickles Add tab-indent style rule for Gherkin scenarios to the .editorconfig
… info banner button is clicked and transfer focus to that element once the header is dismissed.
…espace Correct the component namespace in the JSON files
to avoid locks.
Mark with BOM.
Fix utf-8 encoding issues for all Python CSV exports
…ng atomic transactions, for Sqlite created dummy operation to execute the task and for Postgres implemented advisory lock.
…k-implementation Implementation to enforce convenient write locks on Postgres and Sqlite
Use transaction lock.
Update perseus renderer for Safari compatibility
….7-to-develop # Conflicts: # kolibri/__init__.py # kolibri/core/assets/src/core-app/urls.js # kolibri/core/content/utils/annotation.py # kolibri/core/logger/csv_export.py # requirements/base.txt
rtibbles
approved these changes
Apr 20, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No concerns here.
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.
Conflicts found on
Also, just need to make sure any non-conflicting changes from 0.14 don't undo recent work on
develop