diff options
| author | Stephan Groß | 2012-11-05 11:45:49 +0100 |
|---|---|---|
| committer | Stephan Groß | 2012-11-05 11:45:49 +0100 |
| commit | 44449fa1f5f2d68740c9fb6a13c8e0a0eb41434c (patch) | |
| tree | c4b6d8ed8af239dd5651d9f6a18ddbfe2079bc07 /docs/topics | |
| parent | ff7725f05e8ca624e54d707f7c655e3d5c8b8888 (diff) | |
| parent | 5b397e50ddb999f85949a7359d0a26c3531c78a9 (diff) | |
| download | django-rest-framework-44449fa1f5f2d68740c9fb6a13c8e0a0eb41434c.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/credits.md | 10 | ||||
| -rw-r--r-- | docs/topics/release-notes.md | 22 |
2 files changed, 31 insertions, 1 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 69d57802..ee00fc8b 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -51,6 +51,10 @@ The following people have helped make REST framework great. * Daniel Vaca Araujo - [diviei] * Madis Väin - [madisvain] * Stephan Groß - [minddust] +* Pavel Savchenko - [asfaltboy] +* Otto Yiu - [ottoyiu] +* Jacob Magnusson - [jmagnusson] +* Osiloke Harold Emoekpere - [osiloke] Many thanks to everyone who's contributed to the project. @@ -136,4 +140,8 @@ To contact the author directly: [rdobson]: https://github.com/rdobson [diviei]: https://github.com/diviei [madisvain]: https://github.com/madisvain -[minddust]: https://github.com/minddust
\ No newline at end of file +[minddust]: https://github.com/minddust +[asfaltboy]: https://github.com/asfaltboy +[ottoyiu]: https://github.com/OttoYiu +[jmagnusson]: https://github.com/jmagnusson +[osiloke]: https://github.com/osiloke diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index a466f4b1..14d910bd 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -4,8 +4,30 @@ > > — Eric S. Raymond, [The Cathedral and the Bazaar][cite]. +## Master + +* Support Django's cache framework. +* Minor field improvements. (Don't stringify dicts, more robust many-pk fields.) +* Bugfixes (Support choice field in Browseable API) + +## 2.0.2 + +**Date**: 2nd Nov 2012 + +* Fix issues with pk related fields in the browsable API. + +## 2.0.1 + +**Date**: 1st Nov 2012 + +* Add support for relational fields in the browsable API. +* Added SlugRelatedField and ManySlugRelatedField. +* If PUT creates an instance return '201 Created', instead of '200 OK'. + ## 2.0.0 +**Date**: 30th Oct 2012 + * **Fix all of the things.** (Well, almost.) * For more information please see the [2.0 migration guide][migration]. |