aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-12-16TypoTom Christie
2013-12-16Merge pull request #1298 from craigds/fix-nested-serializers-with-renamed-fieldsTom Christie
Fix nested serializers with renamed fields
2013-12-16Don't import compat.py from authtoken.models. Closes #1297Tom Christie
2013-12-16Fix expansion of writable nested serializers where the inner fields have ↵Craig de Stigter
source set.
2013-12-14Update django-oauth-plus versionTom Christie
2013-12-14Add note on pagination bugfix. Closes #1293.Tom Christie
2013-12-13Added @philipforget for work on #1232. Thanks :)Tom Christie
2013-12-13Updated release notesTom Christie
2013-12-13Compat fixes for django-oauth-plus versions 2.0-2.2.1Tom Christie
2013-12-13Merge branch 'master' of git://github.com/philipforget/django-rest-framework ↵Tom Christie
into philipforget-master
2013-12-13Links to drf-nested-routersTom Christie
2013-12-13Add notes on lookup_prefix argument and why it's there even though unused by ↵Tom Christie
the default implementations.
2013-12-13Merge pull request #1281 from alanjds/router-prefix-patchTom Christie
'lookup_prefix' on SimpleRouter.get_lookup_regex, easing code de-duplication
2013-12-13Update release notesTom Christie
2013-12-13Merge pull request #1291 from kevin-brown/issue_1101Tom Christie
Fix default values always being False for browsable API
2013-12-13Fix default values always being False for browsable APIKevin Brown
This fixes a bug that was introduced in 28ff6fb [1] for the browsable API, specifically with how it handled default values for boolean fields. Previously, it had a global default for boolean fields set to `False`, which was different than the standard None that was used elsewhere. Because this only needed to be done for the browsable API, a fix was put into place that only set the default to `False` when form data was passed into the serializer. This had the unintended side effect of overriding any default set on the boolean field. This fixes #1101 [2] by only overriding the default if the default is `None`, which is the default for all fields. [1]: https://github.com/tomchristie/django-rest-framework/commit/28ff6fb1ec02b7a04c4a0db54885f3735b6dd43f [2]: https://github.com/tomchristie/django-rest-framework/issues/1101
2013-12-13Expanded notes in quickstart. Closes #1127. Closes #1128.Tom Christie
2013-12-13Clean up implementationTom Christie
2013-12-13Merge pull request #1234 from linovia/bugfix/nested_models_without_related_nameTom Christie
Fixed the nested model serializers in case of the related_name isn’t set...
2013-12-13Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
Conflicts: docs/api-guide/routers.md
2013-12-13Merge pull request #1289 from sheppard/wqdb-routerTom Christie
third-party package: wq.db
2013-12-12third-party package: wq.dbS. Andrew Sheppard
2013-12-12Add third party packagesTom Christie
2013-12-11Merge pull request #1283 from OddBloke/masterTom Christie
Add required imports to Generating Tokens example, and update with get_user_model()
2013-12-11Use get_user_model instead of User in Generating Tokens exampleOddBloke
Because that's a better way of doing it.
2013-12-11Add full required imports to Generating Tokens exampleOddBloke
Previously we were missing User and post_save.
2013-12-11Merge pull request #1282 from daaray/patch-1Tom Christie
Update routers.md
2013-12-10Update routers.mdDavid Ray
Reference to ```DefaultRouter``` should be ```SimpleRouter```
2013-12-10SimpleRouter.get_lookup_regex got lookup_prefixAlan Justino
This allows @alanjds/drf-nested-routers to not duplicate/monkeypatch work made here
2013-12-10Merge pull request #1280 from tomchristie/fix-1205Tom Christie
Refine model manager behavior so as not to use the behavior in incorrect...
2013-12-10Remove incorrect apostropheTom Christie
2013-12-10Update release notesTom Christie
2013-12-10Refine model manager behavior so as not to use the behavior in incorrect ↵Tom Christie
cases. Closes #1205
2013-12-10Tweak REST condition text.Tom Christie
2013-12-10Merge pull request #1278 from caxap/masterTom Christie
Added REST Condition to 3rd party permissions packages list.
2013-12-09Added REST Condition to 3rd party permissions packages list.Maxim Kamenkov
2013-12-09Merge pull request #1277 from Ian-Foote/masterTom Christie
Fix typo "Not" -> "Note"
2013-12-09Fix typo "Not" -> "Note"Ian
2013-12-09Update release notesTom Christie
2013-12-09Fix compat issues for #1231Tom Christie
2013-12-09Merge branch 'issue-1231-jsonencoder' of ↵Tom Christie
git://github.com/mbox/django-rest-framework into mbox-issue-1231-jsonencoder
2013-12-09Add notes to contributing docsTom Christie
2013-12-09Add notes to contributing docsTom Christie
2013-12-09Add notes to contributing docsTom Christie
2013-12-09Add notes to contributing docsTom Christie
2013-12-08Merge pull request #1262 from tomchristie/fix-1261Tom Christie
Catch errors during parsing and set empty .DATA/.FILES before re-raising.
2013-12-08Merge pull request #1275 from qooleot/masterTom Christie
RelatedField is function of serializer class
2013-12-09Merge masterTom Christie
2013-12-08Merge pull request #1276 from lalkaka/masterTom Christie
Minor grammar fix -- 'team' is singular
2013-12-09Drop unneeded assertTom Christie