Skip to content

Tahoe: Merge develop into master - #428

Merged
OmarIthawi merged 2 commits into
appsembler/tahoe/masterfrom
appsembler/tahoe/develop
Jul 18, 2019
Merged

Tahoe: Merge develop into master#428
OmarIthawi merged 2 commits into
appsembler/tahoe/masterfrom
appsembler/tahoe/develop

Conversation

@johnbaldwin

Copy link
Copy Markdown

This PR gets #427 pushed to production. I spot tested it on staging today with both the user list and user detail views

* Added user filtering to enrollment api test
* Updated course enrollment filter to support user filtering
* Added user index viewset
* Added UserIndexSerializer
* Updated v1.urls to include user index viewset
* Added unit test for UserIndexViewSet
@johnbaldwin

Copy link
Copy Markdown
Author

@OmarIthawi OmarIthawi changed the title Appsembler/tahoe/develop Tahoe: Merge develop into master Jul 17, 2019

@OmarIthawi OmarIthawi left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Same as #427 that I already approved.

It would be great if @AhmedAljazzar and/or @thraxil can take a quick look even if it's just for awareness.

@OmarIthawi
OmarIthawi merged commit b839360 into appsembler/tahoe/master Jul 18, 2019
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.

2 participants