Craig de Stigter
4a134eefa2
Fix expansion of writable nested serializers where the inner fields have source set.
2013-12-16 15:55:54 +13:00
Tom Christie
69fef838cc
Update django-oauth-plus version
2013-12-14 21:05:11 +00:00
Tom Christie
6b6b255684
Add note on pagination bugfix. Closes #1293 .
2013-12-14 20:42:58 +00:00
Tom Christie
f78b3187df
Added @philipforget for work on #1232 . Thanks :)
2013-12-13 22:01:19 +00:00
Tom Christie
54d3c6a725
Updated release notes
2013-12-13 21:59:47 +00:00
Tom Christie
a87c55a93a
Compat fixes for django-oauth-plus versions 2.0-2.2.1
2013-12-13 21:57:07 +00:00
Tom Christie
fac6d1a36e
Merge branch 'master' of git://github.com/philipforget/django-rest-framework into philipforget-master
2013-12-13 20:40:11 +00:00
Tom Christie
39dbea4da4
Links to drf-nested-routers
2013-12-13 20:27:17 +00:00
Tom Christie
193af483ef
Add notes on lookup_prefix argument and why it's there even though unused by the default implementations.
2013-12-13 20:22:56 +00:00
Tom Christie
fbaba0a309
Merge pull request #1281 from alanjds/router-prefix-patch
...
'lookup_prefix' on SimpleRouter.get_lookup_regex, easing code de-duplication
2013-12-13 12:19:49 -08:00
Tom Christie
87b99d1ac8
Update release notes
2013-12-13 20:17:26 +00:00
Tom Christie
8b2f0cc3d7
Merge pull request #1291 from kevin-brown/issue_1101
...
Fix default values always being False for browsable API
2013-12-13 12:15:23 -08:00
Kevin Brown
90edcbf938
Fix default values always being False for browsable API
...
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]: 28ff6fb1ec
[2]: https://github.com/tomchristie/django-rest-framework/issues/1101
2013-12-13 13:20:29 -05:00
Tom Christie
9c41c007af
Merge branch 'master' into 2.4.0
...
Conflicts:
.travis.yml
docs/api-guide/routers.md
docs/topics/release-notes.md
rest_framework/compat.py
2013-12-13 16:32:34 +00:00
Tom Christie
ca244ad614
Expanded notes in quickstart. Closes #1127 . Closes #1128 .
2013-12-13 15:30:59 +00:00
Tom Christie
0453cbd56b
Clean up implementation
2013-12-13 11:09:54 +00:00
Tom Christie
a129bdd0f0
Merge pull request #1234 from linovia/bugfix/nested_models_without_related_name
...
Fixed the nested model serializers in case of the related_name isn’t set...
2013-12-13 03:06:14 -08:00
Tom Christie
7e7336db91
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
...
Conflicts:
docs/api-guide/routers.md
2013-12-13 09:04:54 +00:00
Tom Christie
b07eb0bf0d
Merge pull request #1289 from sheppard/wqdb-router
...
third-party package: wq.db
2013-12-13 01:02:04 -08:00
S. Andrew Sheppard
73e8536e0d
third-party package: wq.db
2013-12-12 21:45:44 -06:00
Tom Christie
ed931b90ae
Further docs tweaks
2013-12-13 00:11:59 +00:00
Tom Christie
83da4949c0
Allow NUM_PROXIES=0 and include more docs
2013-12-13 00:02:18 +00:00
Tom Christie
d6d4621c45
Merge pull request #1273 from kahnjw/add_get_ident_method_to_base_throttle
...
Add get_ident method to base throttle class
2013-12-12 15:18:35 -08:00
Tom Christie
df2d9034c2
Add third party packages
2013-12-12 23:10:31 +00:00
Tom Christie
9c0da46209
Merge pull request #1283 from OddBloke/master
...
Add required imports to Generating Tokens example, and update with get_user_model()
2013-12-11 08:42:43 -08:00
OddBloke
4f473f0b9e
Use get_user_model instead of User in Generating Tokens example
...
Because that's a better way of doing it.
2013-12-11 13:56:56 +00:00
OddBloke
5acefd3b17
Add full required imports to Generating Tokens example
...
Previously we were missing User and post_save.
2013-12-11 13:55:54 +00:00
Tom Christie
d3440f0311
Merge pull request #1282 from daaray/patch-1
...
Update routers.md
2013-12-11 01:09:20 -08:00
David Ray
7382f8c6ad
Update routers.md
...
Reference to ```DefaultRouter``` should be ```SimpleRouter```
2013-12-10 14:56:07 -05:00
Alan Justino
d3a118c728
SimpleRouter.get_lookup_regex got lookup_prefix
...
This allows @alanjds/drf-nested-routers to not duplicate/monkeypatch work made here
2013-12-10 17:14:17 -02:00
Tom Christie
462c5e3d0d
Merge pull request #1280 from tomchristie/fix-1205
...
Refine model manager behavior so as not to use the behavior in incorrect...
2013-12-10 00:54:11 -08:00
Tom Christie
c09ad1bedc
Remove incorrect apostrophe
2013-12-10 08:53:38 +00:00
Tom Christie
40164fcc62
Update release notes
2013-12-10 08:49:54 +00:00
Tom Christie
3a1c40f814
Refine model manager behavior so as not to use the behavior in incorrect cases. Closes #1205
2013-12-10 08:46:44 +00:00
Tom Christie
785a42cd5a
Tweak REST condition text.
2013-12-10 08:38:43 +00:00
Tom Christie
e6dfc06f91
Merge pull request #1278 from caxap/master
...
Added REST Condition to 3rd party permissions packages list.
2013-12-10 00:36:09 -08:00
Maxim Kamenkov
9ba7be959c
Added REST Condition to 3rd party permissions packages list.
2013-12-09 20:33:06 +02:00
Tom Christie
b599447b71
Merge pull request #1277 from Ian-Foote/master
...
Fix typo "Not" -> "Note"
2013-12-09 01:54:37 -08:00
Ian
de319f3e28
Fix typo "Not" -> "Note"
2013-12-09 09:53:16 +00:00
Tom Christie
2c898bd901
Update release notes
2013-12-09 09:27:10 +00:00
Tom Christie
ddd17c69e7
Fix compat issues for #1231
2013-12-09 09:24:10 +00:00
Tom Christie
a6ca943faa
Merge branch 'issue-1231-jsonencoder' of git://github.com/mbox/django-rest-framework into mbox-issue-1231-jsonencoder
2013-12-09 08:50:31 +00:00
Tom Christie
c1be503308
Add notes to contributing docs
2013-12-09 08:46:18 +00:00
Tom Christie
e6f6bb5c7e
Add notes to contributing docs
2013-12-09 08:42:09 +00:00
Tom Christie
23369650e3
Add notes to contributing docs
2013-12-09 08:14:21 +00:00
Tom Christie
e80b353085
Add notes to contributing docs
2013-12-09 08:10:51 +00:00
Tom Christie
712ab8e3dc
Merge pull request #1262 from tomchristie/fix-1261
...
Catch errors during parsing and set empty .DATA/.FILES before re-raising.
2013-12-08 23:52:55 -08:00
Tom Christie
5eca31d161
Merge pull request #1275 from qooleot/master
...
RelatedField is function of serializer class
2013-12-08 23:46:55 -08:00
Tom Christie
80ef2685e5
Merge master
2013-12-09 07:45:45 +00:00
Tom Christie
175b4d233d
Merge pull request #1276 from lalkaka/master
...
Minor grammar fix -- 'team' is singular
2013-12-08 23:38:32 -08:00