diff options
| author | Robert Romano | 2012-11-18 21:07:44 -0800 |
|---|---|---|
| committer | Robert Romano | 2012-11-18 21:07:44 -0800 |
| commit | f5f1ac49ec9d9cb180a00c791f2701c3f5a2d65b (patch) | |
| tree | 663e254f3125d1281035d471fc4fa38d7ca3ee3d /docs/topics | |
| parent | d541e0c42326443b613df764cbe26a68b852b71d (diff) | |
| parent | d1472740bc5f08871343d1a63e409e34d05504cb (diff) | |
| download | django-rest-framework-f5f1ac49ec9d9cb180a00c791f2701c3f5a2d65b.tar.bz2 | |
Update robromano fork with upstream master
Conflicts:
docs/topics/credits.md
docs/topics/release-notes.md
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/credits.md | 3 | ||||
| -rw-r--r-- | docs/topics/release-notes.md | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 0669d88a..34590109 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -61,6 +61,7 @@ The following people have helped make REST framework great. * Marc Aymerich - [glic3rinu] * Ludwig Kraatz - [ludwigkraatz] * Rob Romano - [robromano] +* Eugene Mechanism - [mechanism] Many thanks to everyone who's contributed to the project. @@ -157,3 +158,5 @@ To contact the author directly: [glic3rinu]: https://github.com/glic3rinu [ludwigkraatz]: https://github.com/ludwigkraatz [robromano]: https://github.com/robromano +[mechanism]: https://github.com/mechanism + diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index daacc76f..d43f892f 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -4,10 +4,18 @@ > > — Eric S. Raymond, [The Cathedral and the Bazaar][cite]. -## Master +* Add convenience login view to get tokens when using `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. -* Add convenience login view to get tokens when using `TokenAuthentication` +* 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 |