Merge develop into master - #425
Merged
Merged
Conversation
this should speed up the test runs by quite a bit.
* Enable Django REST Framework browsable API for docker devstack * WIP Tahoe API courses resource * WIP appsembler api courses endpoint testing * Got course api and site module tests working * Course list view test fails. Only one course is returned. Otherwise, very close * Tahoe API v1 courses endpoint with some basic test coverage * test_course_api module docstring fix * Tahoe api sites module cleanup * Tahoe API updated sites and test_sites for enrollments * Tahoe API WIP enrollments * WIP Tahoe enrollment api * Tahoe API cleanup code for test_course_api * Tahoe API - fixed typo in v1.urls * Tahoe enrollment api - added stub for enrollment create method * Fixed missing import in tahoe api v1 filters * Tahoe API WIP course enrollment api tests * Tahoe API serializer - Add BulkEnrollmentSerializer * WIP Tahoe enrollment api * WIP Tahoe API - enrollment * tahoe api cleanup * WIP Tahoe API enrollment, added modulestore support for enrollment api using existing code * WIP enrollment api * WIP Tahoe enrollment api test * WIP tahoe api enrollment - wrapping up testing * Tahoe API enrollment API tests now passing * Updated tests to use absolute path for 'factories' import * Updated test instructions in readme * Tahoe API - replaced relative imports with absolute imports * Tahoe enrollment api - addressed PR comments for PR #397, except for the comment on using the default site * Updated site handling in tests per PR #397 comments * Disabled throttling test. Getting a transaction error. Need to investigate * Tahoe enrollment api - Added invalid site check in enrollment POST
Avoid tokens of trusted web clients after a password reset
Use a safe default for KEEP_TRUSTED_CONFIDENTIAL_CLIENT_TOKENS
This reverts commit c0d6f3e.
This reverts commit b39636e.
Revert translation updates to get back old Canadian French translations
It looks like 7fbb26a introduced some pep8 errors. This should clean those up.
Update translations (autogenerated message)
|
@OmarIthawi I don't have any objection, the API code is isolated, so is @johnbaldwin is ok, we can ship to prod, but not releasing it yet. |
Author
|
Thanks @melvinsoft. Now #424 is merged, this PR is also ready go. |
melvinsoft
approved these changes
Jul 10, 2019
iamjazzar
approved these changes
Jul 10, 2019
This is until we implement "unenroll"
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
I would like to get #424 pushed to production for PSAC. Opening this as a placeholder for now.
@johnbaldwin and @melvinsoft how comfortable are about shipping the API to production?