encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-11 04:07:39 +03:00
Code Issues Packages Projects Releases Wiki Activity
d08536ad9d
django-rest-framework/rest_framework
History
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
..
authtoken Generate random token directly 2014-02-04 22:50:11 -05:00
runtests Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
static/rest_framework Browsable API tab preferences should be site-wide 2013-08-30 09:20:12 +01:00
templates/rest_framework Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
templatetags Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
tests Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
utils Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
__init__.py It's 2014 now, dontchaknow 2014-03-06 09:25:18 +00:00
authentication.py Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
compat.py Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
decorators.py Commenting link/action decorators as pending deprecation 2013-08-19 21:02:22 +01:00
exceptions.py add a __str__ implementation to APIException 2014-04-04 10:22:02 -04:00
fields.py Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
filters.py Add SEARCH_PARAM and ORDERING_PARAM to settings 2014-03-06 21:39:44 +00:00
generics.py Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
mixins.py Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
models.py Move models.resolve_model to serializers._resolve_model 2014-01-13 11:47:44 -05:00
negotiation.py Added proper charset support 2013-05-18 17:21:43 +01:00
pagination.py Cleanup docstrings 2013-04-25 12:47:34 +01:00
parsers.py Fixed exception handling with YAML and XML parsers. 2013-10-31 15:03:50 -07:00
permissions.py it's safe to import scope and constants 2014-03-06 20:21:44 +00:00
relations.py Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
renderers.py Update documentation of render methods (obj to data) 2014-03-04 17:21:07 +01:00
request.py Fixed encoding parameter in QueryDict 2014-03-22 10:32:59 +01:00
response.py Remove Content-Type header from empty responses. Fixes #1196 2013-12-03 16:55:11 +00:00
reverse.py Cleanup imports 2013-02-04 20:55:35 +00:00
routers.py Minor tweaks to 'lookup_value_regex' work 2014-01-13 15:37:52 +00:00
serializers.py Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
settings.py Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
status.py Version 2.3.10 2013-12-06 22:13:50 +00:00
test.py Reintroduced url arguments in the urls for the tests. 2014-03-07 16:11:51 +01:00
throttling.py Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
urlpatterns.py Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
urls.py Drop 1.3 support 2013-09-25 10:30:04 +01:00
views.py Typo in keywords arguments name 2014-03-04 16:32:34 +01:00
viewsets.py minor typo 2013-10-29 15:10:06 -05:00