django-rest-framework/rest_framework/utils, branch 2.4.0 Web APIs for Django. Resolve python3 linting issue 2014-08-19T13:11:26+00:00 Tom Christie 2014-08-19T13:11:26+00:00 2d2737f367c241c29c9c3913f2dba986c7c9a4a5 






Code linting and added runtests.py
2014-08-19T12:28:07+00:00

Tom Christie

2014-08-19T12:28:07+00:00

bf09c32de8f9d528f83e9cb7a2773d1f4c9ab563












Merge remote-tracking branch 'origin/master' into 2.4.0
2014-04-12T22:05:57+00:00

Xavier Ordoquy

2014-04-12T22:05:57+00:00

d08536ad9d026fb7126c430f6d9c18f8540aacd6

Conflicts:
	.travis.yml
	docs/api-guide/fields.md
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/authentication.py
	rest_framework/serializers.py
	rest_framework/templatetags/rest_framework.py
	rest_framework/tests/test_authentication.py
	rest_framework/tests/test_filters.py
	rest_framework/tests/test_hyperlinkedserializers.py
	rest_framework/tests/test_serializer.py
	rest_framework/tests/test_testing.py
	rest_framework/utils/encoders.py
	tox.ini





Conflicts:
	.travis.yml
	docs/api-guide/fields.md
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/authentication.py
	rest_framework/serializers.py
	rest_framework/templatetags/rest_framework.py
	rest_framework/tests/test_authentication.py
	rest_framework/tests/test_filters.py
	rest_framework/tests/test_hyperlinkedserializers.py
	rest_framework/tests/test_serializer.py
	rest_framework/tests/test_testing.py
	rest_framework/utils/encoders.py
	tox.ini







Fix dict_keys equality test for python 3.
2014-04-11T04:49:49+00:00

Ian Leith

2014-04-11T04:49:49+00:00

613df5c6501f715c0775229f34fcba9f4291c05d












Encode django QuerySets to lists and not dicts in JSONEncoder
2014-01-17T12:05:10+00:00

Mathieu Pillard

2014-01-17T12:05:10+00:00

f034cb595ae0b9091a9eb68a2b583a320ef39c4e












Merge branch 'master' into 2.4.0
2013-12-13T16:32:34+00:00

Tom Christie

2013-12-13T16:32:34+00:00

9c41c007afc71c899306bcb02e40bdfc36b09146

Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/compat.py





Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/compat.py







Fix compat issues for #1231
2013-12-09T09:24:10+00:00

Tom Christie

2013-12-09T09:24:10+00:00

ddd17c69e7abdd70448fa0f2f2a807d600b3391d












Fix issue #1231: JSONEncoder doesn't handle dict-like objects
2013-11-21T20:09:48+00:00

Malcolm Box

2013-11-21T20:09:48+00:00

263281d71d0425d7bb9b4ebbdf1811ef637ee60a

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





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







Fix decimal support with YAMLRenderer
2013-10-16T23:08:24+00:00

badaud_t

2013-10-16T23:08:24+00:00

b730aec0f46e2b849b3c597bcf1a1bcdc158e415












Drop 1.3 support
2013-09-25T09:30:04+00:00

Tom Christie

2013-09-25T09:30:04+00:00

e441f85109e64345a12e65062fc0e51c5787e67f