encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-26 11:33:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
d9c7b1c585
django-rest-framework/rest_framework
History
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
..
authtoken Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
runtests Merge remote-tracking branch 'reference/py3k' into p3k 2013-01-02 16:09:21 +01:00
static/rest_framework Make textareas in browseable API same width as everything else 2012-11-07 11:32:52 +00:00
templates/rest_framework Login page styles fix. Closes #618. Made with 🍪 2013-01-28 18:01:44 +06:00
templatetags Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
tests Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
utils Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
__init__.py Version 2.1.17 2013-01-26 20:59:15 +00:00
authentication.py Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
compat.py Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
decorators.py Raise assertion errors if @api_view decorator is applied incorrectly. Fixes #596. 2013-01-19 15:51:14 +00:00
exceptions.py Merge with master 2012-11-09 13:49:52 +00:00
fields.py Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
filters.py Fixed identation on filter_fields 2012-11-19 00:14:03 +01:00
generics.py Add .patch() method for RetrieveUpdateAPIView 2013-01-02 17:43:43 +00:00
mixins.py Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
models.py Change package name: djangorestframework -> rest_framework 2012-09-20 13:06:27 +01:00
negotiation.py Renderer negotiation: media_type specificty evaluation weak 2012-11-27 10:13:15 +01:00
pagination.py Fix issues with custom pagination serializers 2013-01-26 20:54:41 +00:00
parsers.py Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
permissions.py Version 2.1.6. AKA: I am a doofus. 2012-11-23 13:21:18 +00:00
relations.py Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
renderers.py Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
request.py Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
response.py Move the various compat things to the compat module. 2013-01-03 11:41:07 +01:00
reverse.py Fixes for urls with suffixes 2012-10-29 17:08:38 +00:00
serializers.py Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
settings.py Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 2013-02-01 11:58:55 +00:00
status.py fixed typo in html status code 2012-11-06 21:11:05 +01:00
throttling.py Fix some typos. 2012-10-30 00:30:52 +01:00
urlpatterns.py Don't do an inverted if test. 2013-01-21 17:42:39 +00:00
urls.py 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
views.py WWW-Authenticate responses 2013-01-21 21:29:49 +00:00