aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics/release-notes.md
diff options
context:
space:
mode:
authorStephan Groß2012-11-21 11:56:34 +0100
committerStephan Groß2012-11-21 11:56:34 +0100
commit6ba4df8a27016fd5e60a3852eea6c97231a03281 (patch)
tree935bb3d51a9c3f4307d2d83d4b4c2e4d884886e3 /docs/topics/release-notes.md
parented713d0354b67bdc64de9346b9a72e1adfced76e (diff)
parent3268c67343f6fc6364a0127a7bfabeb907a4751d (diff)
downloaddjango-rest-framework-6ba4df8a27016fd5e60a3852eea6c97231a03281.tar.bz2
Merge remote-tracking branch 'upstream/master' into regex_field
Conflicts: docs/topics/release-notes.md
Diffstat (limited to 'docs/topics/release-notes.md')
-rw-r--r--docs/topics/release-notes.md16
1 files changed, 15 insertions, 1 deletions
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index e4e67635..c641a1b3 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -6,8 +6,22 @@
## Master
-* Support for `read_only_fields` on `ModelSerializer` classes.
* Added `RegexField`.
+* Added `SerializerMethodField`.
+* Serializer performance improvements.
+* Added `obtain_token_view` to get tokens when using `TokenAuthentication`.
+* Bugfix: Django 1.5 configurable user support for `TokenAuthentication`.
+
+## 2.1.3
+
+**Date**: 16th Nov 2012
+
+* Added `FileField` and `ImageField`. For use with `MultiPartParser`.
+* Added `URLField` and `SlugField`.
+* Support for `read_only_fields` on `ModelSerializer` classes.
+* Support for clients overriding the pagination page sizes. Use the `PAGINATE_BY_PARAM` setting or set the `paginate_by_param` attribute on a generic view.
+* 201 Responses now return a 'Location' header.
+* Bugfix: Serializer fields now respect `max_length`.
## 2.1.2