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

Develop <- v0.14.x #7184

Merged
merged 272 commits into from Jul 2, 2020
Merged

Develop <- v0.14.x #7184

merged 272 commits into from Jul 2, 2020

Conversation

DXCanas
Copy link
Member

@DXCanas DXCanas commented Jun 24, 2020

Summary

Updating develop with a number of changes and fixes from release 0.14

Contributor Checklist

PR process:

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Testing:

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

Reviewer Checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

jonboiser and others added 30 commits June 16, 2020 15:38
@jonboiser
Break apart the ImportFacilityModalGroup
b748c82
@jonboiser
Integrate SyncAllModal with backend
783d9a3
@jonboiser
Merge remote-tracking branch 'origin/release-v0.14.x' into peer-sync-…
dc2ebb6 
…ui-integration

# Conflicts:
#	kolibri/core/assets/src/api-resources/facilityTask.js
@nucleogenesis
topic page heading, channelcard use kgrid
ddc4d40
@indirectlylit
Merge pull request #7050 from jredrejo/remove_chrome_autofilling
3c45240 
Remove chrome autofilling detection
@indirectlylit
Merge pull request #6917 from bjester/app-support-keyboard-change
b6f9c7d 
Add keyup handler to ensure proper triggering of input value event
@indirectlylit
Merge pull request #6996 from nucleogenesis/mobile-gestures
a505f69 
Gestures on PDFs
@jonboiser
Integrate FacilityTasksPage with backend
fb8a105
@indirectlylit
Merge remote-tracking branch 'le/app-support' into merge-app
3abad8f 
# Conflicts:
#	kolibri/plugins/user/assets/src/views/SignInPage/index.vue
@indirectlylit
Merge pull request #7069 from indirectlylit/merge-app
1db18cc 
merge app-support -> 0.14
@mrpau-richard
Update Python version at the build_windows dockerfile
86cd4d7
@mrpau-richard
Update Windows Installer to v1.4.0-beta2
a3b8015 
Remove curl downloading Python installer in the dockerfile
@mrpau-richard
I added a comment to re-build the PR.
cd0d118
@cpauya
Merge pull request #7072 from mrpau/feature/upgrade-windows-python-to…
36535cc 
…-3.6

Update Python version to v3.6.8 at the `build_windows.dockerfile`
@DXCanas
Using requirements file rather than inline dependency definition
d41d128
@DXCanas
Making release upload requirements less ambiguous.
41adf77
@DXCanas
Pinning dependencies.
eb4968d
@DXCanas
Dockerize integration test worksheet
1758cb1
@rtibbles
Use python modules to encode SQLAlchemy content schema instead of bin…
d722af3 
…aries.
@rtibbles
Upgrade SQLAlchemy.
0e8c292
@rtibbles
Linting.
8822c7e
@jonboiser
Reorganize setup wizard APIs
148a6e3
@jonboiser
Update the FacilitiesTask UIs
173f0e5
@bjester @jonboiser
Simplify Store deletion, remove DatabaseMaxCounter records, clear cache
a35fd43
@jonboiser
Remove unnecessary line
6ac2c9d
@jonboiser
Update for Import Tasks
47a3522
@jonboiser
Add more metadata to tasks
61c834f
@jonboiser
Merge remote-tracking branch 'origin/release-v0.14.x' into peer-sync-…
b77d4d2 
…ui-integration
@DXCanas
Bind mounting dir with gdrive auth
b371a18
@DXCanas
Correcting faulty conditional logic for TAG_NAME definition.
88b7d6d 
Using function rather than reassigning the variable multiple times.
Michaela Robosova and others added 9 commits June 30, 2020 13:29
Select options behavior improvements
445a019 
- do not switch between added/removed states before redirect
- disable add/remove button after click
Consistent snackbars labels
8898149
Removed OIDC provider plugin because it's been built as an external p…
f057627 
…lugin
@rtibbles
Merge pull request #7221 from jredrejo/remove_oidc_provider_plugin_v14
2b3b778 
Remove oidc provider plugin for 0.14 release
@rtibbles
Merge pull request #7107 from nucleogenesis/etag-account-for-plugin-data
2842e43 
Cache etags
@jonboiser
Use user ID instead of username to determine whether user is the “sam…
43ff030 
…e” in Permissions pages
@jonboiser
Memoize the facilityName method to avoid repeat facility name look ups
208ecf9
@jonboiser
Make test assertion order-invariant
44cf8e9
@jonboiser
Fix the AppBarTitle when in Facility > AllFacilitiesPage
3fb26c6
@rtibbles
Copy link
Member

Nice, no merge conflict from the cherry pick!

jonboiser and others added 14 commits June 30, 2020 14:23
@jonboiser
Merge pull request #7213 from MisRob/redirect-to-list-after-adding-re…
a16d93f 
…moving-item

Return to resource list after adding/removing an item from a lesson/quiz
@bjester
Update content negotiation for morango operation
434cc5e
@bjester
Allow default parsing
9933818
@kollivier
Merge pull request #7029 from rtibbles/interface_initialize_url
bd1fdde 
Add method to get initialize url.
@bjester
Remove morango renderer override
d5b4c78
@kollivier
urls object wants all dashes (or all underscores) for keys.
aeb6e8e
@jonboiser
Merge pull request #7102 from jredrejo/show_password_if_validated
eed1cf2 
Don't show the password input if the username is not correctly validated
@jonboiser
Merge pull request #7182 from jonboiser/permissions-page-fixes
4273078 
Fix bugs in Permissions pages caused by "unique username" assumption
Close dialog when switching to the same language
c1e579a
@rtibbles
Merge pull request #7226 from bjester/content-negotiation
e5b8eb8 
Fix invalid JSON during morango sync
@rtibbles
Merge pull request #7217 from rtibbles/sensitive_symlinks_covered_in_…
babcb4d 
…whitenoise

Make static symlinking check more robust.
@jonboiser
Merge pull request #7231 from MisRob/language-switcher-same-language
8c1a495 
Close language modal when language not changed
@kollivier
Syntax fixes for client calls.
0168f10
@rtibbles
Merge pull request #7228 from kollivier/dashing_underscore
fa9ea9e 
Fix urls notation to make the share button URL accesible
@rtibbles rtibbles merged commit 1b8c60b into develop Jul 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@indirectlylit indirectlylit indirectlylit approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet