| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | git://github.com/mhsparks/django-rest-framework into mhsparks-validator-pollution | 
|  | This makes a ChoiceField optional in HTML if
model field has `blank=True` set. | 
|  |  | 
|  |  | 
|  |  | 
|  | Raise error if `fields` on serializer is not a list of strings. | 
|  | Clean up compat code | 
|  | Escape \u2028 and \u2029 in JSON output. | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | Closes #2169. | 
|  | underlying Django model. | 
|  | Not allow to pass an empty actions to viewset.as_view() | 
|  | run for the active set. Closes #2109. | 
|  |  | 
|  | git://github.com/gregmuellegger/django-rest-framework into gregmuellegger-fixes/2013 | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini | 
|  |  |