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
85faebbb75
django-rest-framework/rest_framework
History
Markus Törnqvist 85faebbb75 Merge branch 'mikee2185-master' into mjtorn-master 
Conflicts:
	rest_framework/fields.py
	rest_framework/serializers.py
	rest_framework/tests/models.py
	rest_framework/tests/serializer.py

Fixed all the conflicts.
2013-05-18 13:24:36 +03:00
..
authtoken authtoken abstract if not installed. 2013-03-08 20:56:30 +00:00
runtests Merge OAuth2 work. 2013-03-07 17:43:13 +00:00
static/rest_framework Minimal appearance fixes in addition to #663 2013-02-22 17:49:10 +06:00
templates/rest_framework Remove trailing unmatched </div> in login_base.html template. Reformat indentation and label all closing tags for consistency. 2013-05-13 07:51:23 +02:00
templatetags Fixed comma detection in break_long_headers templatetag 2013-04-04 14:01:47 +02:00
tests Merge branch 'mikee2185-master' into mjtorn-master 2013-05-18 13:24:36 +03:00
utils Fix breadcrumb rendering issue 2013-05-07 14:11:48 +01:00
__init__.py Version 2.3.3 2013-05-16 15:08:12 +01:00
authentication.py Cleanup docstrings 2013-04-25 12:47:34 +01:00
compat.py Merge branch 'master' into 2.3 2013-05-05 16:48:46 +01:00
decorators.py Cleanup docstrings 2013-04-25 12:47:34 +01:00
exceptions.py Cleanup imports 2013-02-04 20:55:35 +00:00
fields.py Merge branch 'mikee2185-master' into mjtorn-master 2013-05-18 13:24:36 +03:00
filters.py Fix searchfilter issues 2013-05-15 10:29:51 +01:00
generics.py Support for multiple filter classes 2013-05-07 13:00:44 +01:00
mixins.py Minor mixin refactoring 2013-05-17 22:09:23 +01:00
models.py Change package name: djangorestframework -> rest_framework 2012-09-20 13:06:27 +01:00
negotiation.py Cleanup docstrings 2013-04-25 12:47:34 +01:00
pagination.py Cleanup docstrings 2013-04-25 12:47:34 +01:00
parsers.py Allow None filename on uploaded files 2013-05-08 20:07:51 +01:00
permissions.py Version 2.3.3 2013-05-16 15:08:12 +01:00
relations.py HyperlinkedIdentityField uses lookup_field kwarg. 2013-05-16 11:48:35 -04:00
renderers.py Forms in Broseable API support dynamic serializers based on request method 2013-05-18 09:36:09 +01:00
request.py Cleanup docstrings 2013-04-25 12:47:34 +01:00
response.py Cleanup docstrings 2013-04-25 12:47:34 +01:00
reverse.py Cleanup imports 2013-02-04 20:55:35 +00:00
routers.py Version 2.3.3 2013-05-16 15:08:12 +01:00
serializers.py Merge branch 'mikee2185-master' into mjtorn-master 2013-05-18 13:24:36 +03:00
settings.py Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings. Closes #798 2013-05-08 20:38:50 +01:00
six.py Py3k cleanup 2013-02-01 15:07:51 +00:00
status.py Cleanup imports 2013-02-04 20:55:35 +00:00
throttling.py Cleanup docstrings 2013-04-25 12:47:34 +01:00
urlpatterns.py Cleanup imports 2013-02-04 20:55:35 +00:00
urls.py Cleanup imports 2013-02-04 20:55:35 +00:00
views.py Cleanup docstrings 2013-04-25 12:47:34 +01:00
viewsets.py Tweak inheritance 2013-05-09 13:35:01 +01:00