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 upstream #3

Merged
merged 35 commits into from
Dec 5, 2014
Merged

Merge upstream #3

merged 35 commits into from
Dec 5, 2014

Conversation

BrickXu
Copy link
Owner

@BrickXu BrickXu commented Dec 5, 2014

No description provided.

kchang and others added 30 commits November 12, 2014 12:46
Move models to respective test modules
Consolidate Django and test requirements
Fix typo in serializers doc
There was an error in the docs: the field extra_field_kwargs of the serializer's Meta doesn't work. The field must be extra_kwargs instead.
Updated serializers documentation
Use svg version of travis build status badge
Not allow to pass an empty actions to viewset.as_view()
Update build status icon on github pages page.
tomchristie and others added 5 commits December 3, 2014 22:45
…nested-validation

Improve checks for nested creates and updates.
…ename

Renamed validated_attrs to validated_data to be more in line with other code
Added missing default style for FileField
BrickXu added a commit that referenced this pull request Dec 5, 2014
@BrickXu BrickXu merged commit 4042180 into BrickXu:master Dec 5, 2014
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.