Xavier Ordoquy
|
d08536ad9d
|
Merge remote-tracking branch 'origin/master' into 2.4.0
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
|
2014-04-13 00:05:57 +02:00 |
|
Xavier Ordoquy
|
656117814c
|
Django 1.7 has new 404 and 403 body messages.
|
2014-01-28 18:55:29 +01:00 |
|
Xavier Ordoquy
|
23a20160c4
|
Mock updated as Django’s get_template now has two arguments.
|
2014-01-28 18:54:49 +01:00 |
|
Tom Christie
|
e441f85109
|
Drop 1.3 support
|
2013-09-25 10:30:04 +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 |
|