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.

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
merged 35 commits into from
Apr 20, 2021

Conversation

jonboiser
Copy link
Contributor

Conflicts found on

#	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

Also, just need to make sure any non-conflicting changes from 0.14 don't undo recent work on develop

rtibbles and others added 30 commits March 26, 2021 10:31
…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
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
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
Copy link
Member

@rtibbles rtibbles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No concerns here.

@rtibbles rtibbles merged commit 0c2b49a into learningequality:develop Apr 20, 2021
@jonboiser jonboiser deleted the merge-0.14.7-to-develop branch April 20, 2021 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants