aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-12-04Add missing definite articleCarlton Gibson
2014-12-04updates based on suggestionsphalt
2014-12-04Initial link from Serializers to ValidatorsCarlton Gibson
2014-12-04Merge branch 'master' of github.com:tomchristie/django-rest-frameworkCarlton Gibson
2014-12-04Merge pull request #2172 from kchange/masterTom Christie
Added missing default style for FileField
2014-12-04Removed custom StringIO, force_text, smart_text compatTymur Maryokhin
2014-12-04Removed custom python_2_unicode_compatible. Closes #2183Tymur Maryokhin
2014-12-03Merge branch 'jpadilla-yaml' into version-3.1Tom Christie
2014-12-03MergeTom Christie
2014-12-03Merge branch 'jpadilla-jsonp' into version-3.1Tom Christie
2014-12-03MergeTom Christie
2014-12-03MergeTom Christie
2014-12-03Merge branch 'jpadilla-oauth_as_package' into version-3.1Tom Christie
2014-12-03Merge pull request #2160 from jpadilla/xmlTom Christie
Remove XML support from core
2014-12-04Updated Django versions to match requirementsTymur Maryokhin
2014-12-03Merge pull request #2197 from mtschammer/mtschammer-validated_attrs-renameTom Christie
Renamed validated_attrs to validated_data to be more in line with other code
2014-12-03Merge pull request #2196 from ↵Kevin Brown
tomchristie/tomchristie-improve-update-nested-validation Improve checks for nested creates and updates.
2014-12-03Renamed validated_attrs to validated_data to be more in line with other ↵Martin Tschammer
similar code.
2014-12-03Improve nested update and create testing.Tom Christie
2014-12-03Improved nested update test in update().Tom Christie
Closes #2194.
2014-12-03Escape \u2028 and \u2029 in JSON output.Tom Christie
Closes #2169.
2014-12-03Merge pull request #2188 from eiriksm/patch-2Tom Christie
Update build status icon on github pages page.
2014-12-03Update build status icon on github pages page.eiriksm
2014-12-03Added test to show potential issue with UniqueValidator being added to the ↵Mark Hughes
underlying Django model.
2014-12-03Merge pull request #2175 from BrickXu/fix_2171Tom Christie
Not allow to pass an empty actions to viewset.as_view()
2014-12-03Merge pull request #2185 from eiriksm/patch-1Tom Christie
Use svg version of travis build status badge
2014-12-03Use svg version of travis build status badgeeiriksm
2014-12-02remove unsused linkphalt
2014-12-02Merge pull request #2182 from sh4r3m4n/masterTom Christie
Updated serializers documentation
2014-12-02Updated serializers documentationMatías Lang
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.
2014-12-02Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2014-12-02BindingDict inherits from collections.MutableMapping. Closes #2135.Tom Christie
2014-12-02Merge pull request #2181 from daaray/patch-2Tom Christie
Fix typo in serializers doc
2014-12-02fix typoDavid Ray
2014-12-02FileUploadParser. Raising StopFutureHandlers removes any handlers not yet ↵Tom Christie
run for the active set. Closes #2109.
2014-12-02Update README with 3.0 info.Tom Christie
2014-12-02Merge branch 'gregmuellegger-fixes/2013'Tom Christie
2014-12-02Minor tweaks for helpful message on Model.objects.create() failure.Tom Christie
2014-12-02Merge branch 'fixes/2013' of ↵Tom Christie
git://github.com/gregmuellegger/django-rest-framework into gregmuellegger-fixes/2013
2014-12-02Only show pip install for httpiephalt
2014-12-02Raise assertion error if calling .save() on a serializer with errors. Closes ↵Tom Christie
#2098.
2014-12-02Document Field.fail(). Closes #2147.Tom Christie
2014-12-02Not allow to pass an empty actions to viewset.as_view(). Refs issue #2171BrickXu
2014-12-02Promote 'many_init' to public API. Closes #2152.Tom Christie
2014-12-02Merge pull request #2173 from jpadilla/masterTom Christie
Consolidate Django and test requirements
2014-12-02Merge pull request #2161 from NextHub/masterTom Christie
Move models to respective test modules
2014-12-02Merge pull request #2 from tomchristie/masterBrickXu
Merge upstream
2014-12-02Merge branch 'master' of github.com:tomchristie/django-rest-frameworkTymur Maryokhin
2014-12-01Consolidate Django and test requirementsJosé Padilla
2014-12-01Fix requirements. Closes #2170.Tom Christie