aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-12-11Use get_user_model instead of User in Generating Tokens exampleOddBloke
Because that's a better way of doing it.
2013-12-11Add full required imports to Generating Tokens exampleOddBloke
Previously we were missing User and post_save.
2013-12-11Merge pull request #1282 from daaray/patch-1Tom Christie
Update routers.md
2013-12-10Update routers.mdDavid Ray
Reference to ```DefaultRouter``` should be ```SimpleRouter```
2013-12-10SimpleRouter.get_lookup_regex got lookup_prefixAlan Justino
This allows @alanjds/drf-nested-routers to not duplicate/monkeypatch work made here
2013-12-10Merge pull request #1280 from tomchristie/fix-1205Tom Christie
Refine model manager behavior so as not to use the behavior in incorrect...
2013-12-10Remove incorrect apostropheTom Christie
2013-12-10Update release notesTom Christie
2013-12-10Refine model manager behavior so as not to use the behavior in incorrect ↵Tom Christie
cases. Closes #1205
2013-12-10Tweak REST condition text.Tom Christie
2013-12-10Merge pull request #1278 from caxap/masterTom Christie
Added REST Condition to 3rd party permissions packages list.
2013-12-09Added REST Condition to 3rd party permissions packages list.Maxim Kamenkov
2013-12-09Merge pull request #1277 from Ian-Foote/masterTom Christie
Fix typo "Not" -> "Note"
2013-12-09Fix typo "Not" -> "Note"Ian
2013-12-09Update release notesTom Christie
2013-12-09Fix compat issues for #1231Tom Christie
2013-12-09Merge branch 'issue-1231-jsonencoder' of ↵Tom Christie
git://github.com/mbox/django-rest-framework into mbox-issue-1231-jsonencoder
2013-12-09Add notes to contributing docsTom Christie
2013-12-09Add notes to contributing docsTom Christie
2013-12-09Add notes to contributing docsTom Christie
2013-12-09Add notes to contributing docsTom Christie
2013-12-08Merge pull request #1262 from tomchristie/fix-1261Tom Christie
Catch errors during parsing and set empty .DATA/.FILES before re-raising.
2013-12-08Merge pull request #1275 from qooleot/masterTom Christie
RelatedField is function of serializer class
2013-12-09Merge masterTom Christie
2013-12-08Merge pull request #1276 from lalkaka/masterTom Christie
Minor grammar fix -- 'team' is singular
2013-12-09Drop unneeded assertTom Christie
2013-12-09Catch and mask ParseErrors that occur during rendering of the BrowsableAPI.Tom Christie
2013-12-08Minor grammar fix -- 'team' is singularRustam Lalkaka
2013-12-08RelatedField is function of serializer classtaras
2013-12-07Merge pull request #1274 from wilsaj/patch-1Tom Christie
docfix: update installation example to work with django 1.6
2013-12-06update installation example to work with django 1.6Andy Wilson
looks like django.conf.urls.defaults was deprecated as of django 1.6
2013-12-06Version 2.3.102.3.10Tom Christie
2013-12-06Update release-notes.mdTom Christie
2013-12-06Added @chuckharmston for kickass bug squashing in #1272Tom Christie
2013-12-06Merge pull request #1272 from chuckharmston/1158-partial_relatedfield_nullTom Christie
Raise appropriate error in serializer when making a partial update to set a required RelatedField to null (issue #1158)
2013-12-06Raise appropriate error in serializer when making a partial update to set a ↵Chuck Harmston
required RelatedField to null (issue #1158)
2013-12-06Merge pull request #1270 from irrelative/masterTom Christie
fix setup.py with new __init__.py boilerplate
2013-12-05fix setup.py with new __init__.py boilerplateJustin Davis
2013-12-05Boilerplate cutenessTom Christie
2013-12-05Upgrade JSONP security warning.Tom Christie
2013-12-05Merge pull request #1269 from infecto/masterTom Christie
fix broken documentation links
2013-12-04fix broken documentation linksDrew Kowalik
2013-12-04Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2013-12-04First pass on contribution guideTom Christie
2013-12-04Merge pull request #1267 from tomchristie/fix-1133Tom Christie
Clarify wording, fixes #1133.
2013-12-04Clarify wording, fixes #1133.Tom Christie
2013-12-03Merge pull request #1265 from tomchristie/fix-1196Tom Christie
Remove Content-Type header from empty responses. Fixes #1196
2013-12-03Remove Content-Type header from empty responses. Fixes #1196Tom Christie
2013-12-03First pass at a test for ParseErrors breaking the browsable APITom Christie
2013-12-03Added @ian-foote, for work on #1250. Thanks!Tom Christie