16 Commits

Author	SHA1	Message	Date
Tom Christie	9c41c007af	Merge branch 'master' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py	2013-12-13 16:32:34 +00:00
Tom Christie	ddd17c69e7	Fix compat issues for #1231	2013-12-09 09:24:10 +00:00
Tom Christie	a6ca943faa	Merge branch 'issue-1231-jsonencoder' of git://github.com/mbox/django-rest-framework into mbox-issue-1231-jsonencoder	2013-12-09 08:50:31 +00:00
Tom Christie	80ef2685e5	Merge master	2013-12-09 07:45:45 +00:00
Tom Christie	4e9385e709	Drop unneeded assert	2013-12-09 07:37:13 +00:00
Tom Christie	06d8a31e13	Catch and mask ParseErrors that occur during rendering of the BrowsableAPI.	2013-12-09 07:34:08 +00:00
Tom Christie	38d78b21c0	Remove Content-Type header from empty responses. Fixes #1196	2013-12-03 16:55:11 +00:00
Tom Christie	774298f145	First pass at a test for ParseErrors breaking the browsable API	2013-12-03 16:18:35 +00:00
Malcolm Box	6af31ed394	Remove u from literals	2013-11-22 10:59:48 +00:00
Malcolm Box	263281d71d	Fix issue #1231: JSONEncoder doesn't handle dict-like objects ... Check for __getitem__ and then attempt to convert to a dict. The check for __getitem__ is there as there's no universal way to check if an object is a mapping type, but this is a likely proxy	2013-11-21 20:09:48 +00:00
badaud_t	b730aec0f4	Fix decimal support with YAMLRenderer	2013-10-17 01:08:24 +02:00
badaud_t	8a5fea06f0	Fix typo YAMLRendererTests	2013-10-17 01:07:50 +02:00
Tom Christie	e441f85109	Drop 1.3 support	2013-09-25 10:30:04 +01:00
Tom Christie	7224b20d58	Added APIRequestFactory	2013-06-28 17:17:39 +01:00
Tom Christie	85fe7197bf	Change test urls to match 1.6 test module name style	2013-05-29 09:00:30 +01:00
Tom Christie	cb49c5d3c0	Rename test modules to 1.6 style	2013-05-29 08:57:11 +01:00