aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-05-03Added FileUploadParser refs #7Michael Elovskikh
2013-05-01Merge pull request #804 from dbrgn/iss803Tom Christie
Catch ImproperlyConfigured exception in compat.py
2013-04-30Catch ImproperlyConfigured exception in compat.py (fixes #803)Danilo Bargen
2013-04-29Added @chenjyw for depth bugfix #802. Thanks!Tom Christie
2013-04-29Merge pull request #802 from chenjyw/masterTom Christie
Fix nesting issue with depth >=2
2013-04-27Changed definition of NestedModelSerializer to correct depth handlingJC
2013-04-27Changed DepthTest to have depth=2JC
2013-04-27TypoTom Christie
2013-04-27Update docs on object-level permissions.Tom Christie
Closes #801.
2013-04-17Added @forgingdestiny for login template work.Tom Christie
Thanks! (Refs: #794)
2013-04-17Update release-notes.mdTom Christie
2013-04-17Merge pull request #794 from forgingdestiny/masterTom Christie
Add branding block to login template
2013-04-17Update browsable-api.mdMatt Majewski
Add login template docs
2013-04-17extend base login templateforgingdestiny
2013-04-17add branding and style blocksforgingdestiny
2013-04-17Version 2.2.72.2.7Tom Christie
2013-04-17Remove unneccessary tests from #789, and bit of cleanup.Tom Christie
2013-04-17Merge https://github.com/shezi/django-rest-frameworkTom Christie
2013-04-16Explicit error if dev does not return a response from the viewTom Christie
2013-04-14adding test case for generic view with overriden get_object()Johannes Spielmann
2013-04-13Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2013-04-13Allow overriding get_object to work correctly. Fixes #784Tom Christie
2013-04-11Merge pull request #783 from vshih/masterTom Christie
Remove redundant text.
2013-04-11Remove redundant text.Victor Shih
2013-04-10Fix 1.3 compat issue. Closes #780Tom Christie
2013-04-04Version 2.2.62.2.6Tom Christie
2013-04-04Use consistent header style in tutorial part 5Tom Christie
2013-04-04Merge pull request #777 from glic3rinu/masterTom Christie
Break long headers on the browsable API
2013-04-04Rephrased break_long_headers release notes lineglic3rinu
2013-04-04Added break_long_headers on the release notesglic3rinu
2013-04-04Fixed comma detection in break_long_headers templatetagglic3rinu
2013-04-04Added break_long_headers on templatetags and base templateglic3rinu
2013-04-03Update release-notes.mdTom Christie
2013-04-03Added @preed for bugfix #772. Thanks!Tom Christie
2013-04-03Merge pull request #772 from preed/preed/ModelSerializer-bool-fixTom Christie
Don't have the ModelSerializer trust deserialized objects to not have re...
2013-04-03Update release-notes.mdTom Christie
2013-04-03Added @atlefren for bugfix in #776Tom Christie
2013-04-03Merge pull request #776 from atlefren/masterTom Christie
Proper import of errors from oauth_provider
2013-04-03Fix the fact that InvalidConsumerError and InvalidTokenError wasn't imported ↵Atle Frenvik Sveen
correctly from oauth_provider
2013-04-03Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2013-04-03Fix bug with inactive user accessing OAuthTom Christie
2013-04-02Don't have the ModelSerializer trust deserialized objects to not have ↵J. Paul Reed
redefine bool()ean-ness. If the model we're using the ModelSerializer for has redefined methods that act as a boolean (__bool__ or __len__), it may not return the object even though it is_valid(), and should.
2013-04-01Merge pull request #771 from glic3rinu/masterTom Christie
Fixed IPv6 support for urlize_quoted_links template tag
2013-04-01Fixed IPv6 support for urlize_quoted_linksglic3rinu
2013-04-01Added @vshih for docs fixes in #769. Thanks!Tom Christie
2013-03-31Merge pull request #769 from vshih/masterTom Christie
Spelling/grammar fixes.
2013-03-30Spelling/grammar fixes.Victor Shih
2013-03-30Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2013-03-30Tweak straplineTom Christie
2013-03-29Fix typoTom Christie