django-rest-framework/rest_framework/utils, branch version-2.4.x

Use force_text from compat

2014-09-05T22:58:53+00:00

Merge remote-tracking branch 'poswald/view-description-as-promise' into view-description-as-promise

2014-09-05T22:34:16+00:00

Resolve python3 linting issue

2014-08-19T13:11:26+00:00

Code linting and added runtests.py

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

replace unicode call with force_text

2014-08-19T01:09:48+00:00

evaluate content at function start

2014-07-29T13:13:11+00:00

Evaluate content before passing to regex.sub

2014-07-28T07:59:55+00:00

Issue #1708

Merge remote-tracking branch 'origin/master' into 2.4.0

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

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

Encode django QuerySets to lists and not dicts in JSONEncoder

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