| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
HyperlinkedIdentityField
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
https://github.com/grimborg/django-rest-framework into improved-options-support
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
* cleanup
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
parameters like e.g. filter or paginate
 | 
 | 
that it sets them up.
 | 
 | 
field metadata via OPTIONS :)
 | 
 | 
into issue-192-expose-fields-for-options
 | 
 | 
git://github.com/grimborg/django-rest-framework into issue-192-expose-fields-for-options
Conflicts:
	rest_framework/tests/fields.py
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Issue 747 lazy strings serialized
 | 
 | 
Fix missing min values
 | 
 | 
https://github.com/nschlemm/django-rest-framework/commit/a42afa04c38afe25c9032b8ce37b572678b02cf1#commitcomment-3241476
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
into issue-192-expose-fields-for-options
 | 
 | 
Conflicts:
	rest_framework/serializers.py
	rest_framework/tests/serializer.py
Fixed conflicts
 | 
 | 
 | 
 | 
 |