aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-12-23Simplified some examples in tutorialamatellanes
2013-12-22Simplified some functionsamatellanes
2013-12-21Merge pull request #1309 from lukaszb/errors-for-renamed-fieldsTom Christie
Should it be that way?
2013-12-21Additional test for 'source' behaviour. Refs #1302Tom Christie
2013-12-21Less brittle through relationship testing. Closes #1292.Tom Christie
2013-12-21Added example of using APIException class. Closes #1300Tom Christie
2013-12-21Docs tweaksTom Christie
2013-12-21Merge pull request #1310 from ↵Tom Christie
vbabiy/adding-djangorestframework-camel-case-to-docs djangorestframework-camel-case in docs
2013-12-21Added links to djangorestframework-camel-case in the third partyVitaly Babiy
sections of the docs for both parsers and renderers.
2013-12-20Should it be that way?Lukasz Balcerzak
2013-12-20Merge pull request #1308 from lukaszb/missing-custom-validation-method-testTom Christie
Added missing custom validation method test
2013-12-20Added missing custom validation method testLukasz Balcerzak
2013-12-20Merge pull request #1307 from lukaszb/test-class-name-duplicatedTom Christie
Updated test class name to be unique
2013-12-20Updated test class name to be uniqueLukasz Balcerzak
2013-12-17Add note on compat import in tutorialTom Christie
2013-12-17Merge pull request #1301 from linovia/bugfix/tutorial_for_python3Tom Christie
Fix tutorial's step 1 for Python 3
2013-12-17Use the BytesIO for buffering bytes and import the one from the compat module.Xavier Ordoquy
2013-12-16Merge branch 'nullbooleanfield_testcase' of ↵Tom Christie
git://github.com/dpetzel/django-rest-framework into dpetzel-nullbooleanfield_testcase Conflicts: rest_framework/tests/test_serializer.py
2013-12-16Merge pull request #1184 from dpetzel/nullbooleanfield_fixTom Christie
Fix infered field type for models.NullBooleanField
2013-12-16Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2013-12-16Add CONTRIBUTING.mdTom Christie
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