django-rest-framework/rest_framework/authtoken, branch 2.2.1 Web APIs for Django. Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01T11:58:55+00:00 Tom Christie 2013-02-01T11:58:55+00:00 d9c7b1c58523d63c8118d88f44ebfdf5f35e942a Conflicts: rest_framework/authentication.py rest_framework/relations.py rest_framework/serializers.py rest_framework/settings.py rest_framework/tests/authentication.py rest_framework/tests/genericrelations.py rest_framework/tests/generics.py rest_framework/tests/relations_hyperlink.py rest_framework/tests/relations_nested.py rest_framework/tests/relations_pk.py rest_framework/tests/serializer.py 
Conflicts:
	rest_framework/authentication.py
	rest_framework/relations.py
	rest_framework/serializers.py
	rest_framework/settings.py
	rest_framework/tests/authentication.py
	rest_framework/tests/genericrelations.py
	rest_framework/tests/generics.py
	rest_framework/tests/relations_hyperlink.py
	rest_framework/tests/relations_nested.py
	rest_framework/tests/relations_pk.py
	rest_framework/tests/serializer.py
ObtainAuthToken pluggable Serializer. 2013-01-08T12:20:01+00:00 Marc Tamlyn 2013-01-08T12:20:01+00:00 49cd5e59a8679004a067e2db72f8ba1d9ac5b69c It should have serializer_class in the same way as any other API view. 
It should have serializer_class in the same way as any other API view.
 Merge remote-tracking branch 'reference/py3k' into p3k 2013-01-02T15:09:21+00:00 Xavier Ordoquy 2013-01-02T15:09:21+00:00 737349d2389197d23886b72c1cb44f53c501ac9a 






Reverted #458
2012-12-07T22:25:16+00:00

Tom Christie

2012-12-07T22:25:16+00:00

c911d54ae3769243fe6c74c29b5d16c7ac6efa10

When incorrect parameters are supplied to the obtain auth token view
400 *is* the correct response.





When incorrect parameters are supplied to the obtain auth token view
400 *is* the correct response.







Merge remote-tracking branch 'reference/master' into p3k
2012-12-02T11:43:32+00:00

Xavier Ordoquy

2012-12-02T11:43:32+00:00

5fad46d7e213afed503b1533515cab96875a5936












Better to return 401 when failing to authenticate
2012-11-28T15:04:36+00:00

Pavel Savchenko

2012-11-28T15:04:36+00:00

7eec582d406b9b366f9d364b53d1fc509831d9b4












Every (base) test should now pass with python3.
2012-11-24T22:19:03+00:00

Xavier Ordoquy

2012-11-24T22:19:03+00:00

17000129e35b10c9d08497a669fd72f8233f065a












Merge pull request #424 from jonlil/master
2012-11-19T21:44:53+00:00

Tom Christie

2012-11-19T21:44:53+00:00

cafc00b8e5c87e9d4c6e250d1c77ade728036913

Support for django 1.5a (auth_user_model)




Support for django 1.5a (auth_user_model)






Complete fix for migration
2012-11-19T10:37:37+00:00

Jonas Liljestrand

2012-11-19T10:37:37+00:00

0bcc840927ab08d0e7d64844f3242036a142113d












fixed migration to support django 1.5
2012-11-18T20:12:06+00:00

Jonas Liljestrand

2012-11-18T20:12:06+00:00

91c0249c9d622670252030cb36ea872c08d91471