Tom Christie
|
d9c7b1c585
|
Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working
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
|
2013-02-01 11:58:55 +00:00 |
|
Juan Riaza
|
a061e3d9e2
|
deprecate simplejson
|
2013-01-05 13:40:02 +01:00 |
|
Xavier Ordoquy
|
60250f22c8
|
Move the various compat things to the compat module.
|
2013-01-03 11:41:07 +01:00 |
|
Xavier Ordoquy
|
737349d238
|
Merge remote-tracking branch 'reference/py3k' into p3k
|
2013-01-02 16:09:21 +01:00 |
|
Mark Hughes
|
125f027d2d
|
Added setter to the auth property
|
2012-12-20 23:48:10 +00:00 |
|
Tom Christie
|
a493c83248
|
urls, patterns, include imports move to compat to support incoming 1.3 thru 1.6 import compatability
|
2012-12-19 23:12:27 +00:00 |
|
Xavier Ordoquy
|
17000129e3
|
Every (base) test should now pass with python3.
|
2012-11-24 23:19:03 +01:00 |
|
Mark Hughes
|
85a921c7ef
|
Added setter to user property
|
2012-11-24 17:18:32 +00:00 |
|
Tom Christie
|
fb56f215ae
|
Added media_type to .parse() - Consistency with renderer API.
|
2012-10-17 22:39:07 +01:00 |
|
Tom Christie
|
99d48f9003
|
Drop .parse_string_or_stream() - keep API minimal.
|
2012-10-17 22:07:56 +01:00 |
|
Tom Christie
|
9c1fba3483
|
Tweak parsers to take parser_context
|
2012-10-15 13:27:50 +01:00 |
|
Tom Christie
|
551c86c43a
|
Documentation for parsers
|
2012-10-14 22:43:07 +01:00 |
|
Tom Christie
|
4a21b3557e
|
Fix fiddly content-overloading bug
|
2012-10-08 17:10:50 +01:00 |
|
Tom Christie
|
9d8bce8f5b
|
Remove Parser.can_handle_request()
|
2012-10-05 14:48:33 +01:00 |
|
Tom Christie
|
91b3fb0b05
|
Remove RequestFactory from compat (Now 1.2 is not supported)
|
2012-09-27 13:06:04 +01:00 |
|
Tom Christie
|
fe666a14ee
|
Add test for request.POST
|
2012-09-27 12:50:18 +01:00 |
|
Tom Christie
|
4b691c4027
|
Change package name: djangorestframework -> rest_framework
|
2012-09-20 13:06:27 +01:00 |
|