Merge pull request #379 from minddust/master

added changelog entry and fixed old one
This commit is contained in:
Tom Christie 2012-11-06 12:01:31 -08:00
commit a49285fe9a

View File

@ -7,6 +7,7 @@
## Master ## Master
* Support use of HTML exception templates. Eg. `403.html` * Support use of HTML exception templates. Eg. `403.html`
* HyperlinkedIdentityField optionally take `slug_field`, `slug_url_kwarg` and `pk_url_kwarg` arguments.
## 2.1.0 ## 2.1.0
@ -16,7 +17,7 @@
* **Serializer `instance` and `data` keyword args have their position swapped.** * **Serializer `instance` and `data` keyword args have their position swapped.**
* `queryset` argument is now optional on writable model fields. * `queryset` argument is now optional on writable model fields.
* Hyperlinked related fields optionally take `slug_field` and `slug_field_kwarg` arguments. * Hyperlinked related fields optionally take `slug_field` and `slug_url_kwarg` arguments.
* Support Django's cache framework. * Support Django's cache framework.
* Minor field improvements. (Don't stringify dicts, more robust many-pk fields.) * Minor field improvements. (Don't stringify dicts, more robust many-pk fields.)
* Bugfix: Support choice field in Browseable API. * Bugfix: Support choice field in Browseable API.