| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
https://github.com/ludwigkraatz/django-rest-framework into mergebranch#390
Conflicts:
	rest_framework/fields.py
	rest_framework/renderers.py
Manually solved
 | 
 | 
 | 
 | 
 | 
 | 
updated to buildin status codes
 | 
 | 
 | 
 | 
file_and_image_fields
 | 
 | 
 | 
 | 
 | 
 | 
added SerializerField Attribute "form_field_class" and defaults for
existing Fields
 | 
 | 
Form Fields than CharField
moved field_mapping
from local serializer_to_form_fields var
to BrowsableAPIRenderer class attr
 | 
 | 
from local serializer_to_form_fields var
to BrowsableAPIRenderer class attr
in order to - allow customization when subclassing
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Add slug relational fields.
Add quickstart.
 | 
 | 
might as well have jsonp return unicode
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
BrowsableAPIRenderer
Conflicts:
	rest_framework/renderers.py - manually resolved conflict
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
not otherwise)
 | 
 | 
 | 
 | 
BrowseableAPIRenderer
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 |