| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
fixed #469 - RegexField <--> BrowsableAPI Bug
 | 
 | 
 | 
 | 
 | 
 | 
https://github.com/ludwigkraatz/django-rest-framework into mergebranch#390
Conflicts:
	rest_framework/fields.py
	rest_framework/renderers.py
Manually solved
 | 
 | 
Add widgets for DateField and DateTimeField
 | 
 | 
 | 
 | 
 | 
 | 
Conflicts:
	docs/topics/release-notes.md
 | 
 | 
Serializer method field
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
on basic ModelFields
 | 
 | 
Max length for modelserializers
 | 
 | 
Fixed test_modelserializer_max_length_exceeded
 | 
 | 
file_and_image_fields
 | 
 | 
 | 
 | 
No type checking in .restore_fields()
Added missing BytesIO import.
 | 
 | 
 | 
 | 
 | 
 | 
Adjusted generics, mixins and serializers to take a `files` arg where applicable.
 | 
 | 
 | 
 | 
added SerializerField Attribute "form_field_class" and defaults for
existing Fields
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
support for passing custom slug options to HyperlinkedRelatedField
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Relationship tests
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 |