Tom Christie
132eab7bbd
Raise helpful error when erronously including nested data in multipart post requests with test client. Closes #2919 .
2015-07-14 14:49:44 +01:00
Tom Christie
c14ad7add7
Handle .choices for related fields when queryset argument is actually a mamanger instance. Closes #3145 .
2015-07-14 13:31:24 +01:00
Tom Christie
1b51bcdbae
Merge branch 'master' of github.com:tomchristie/django-rest-framework
2015-07-14 13:21:20 +01:00
Tom Christie
bca2ea35df
Ensure that realtionship fields '.choices' returns an empty dict when accessed with a read-only field. Closes #2910 .
2015-07-14 13:21:08 +01:00
Tom Christie
9c952dcfe9
Merge pull request #3147 from tomchristie/uploadcare-cursor-limits
...
Add `get_page_size` hook to `CursorPagination`
2015-07-14 12:44:13 +01:00
Tom Christie
468361425d
page_size should be local, not overwriting class attribute.
2015-07-14 12:32:27 +01:00
Tom Christie
3c57e08f62
Clarifications to read_only fields. Closes #3064 .
2015-07-14 12:22:51 +01:00
Tom Christie
586c3350d4
Writable Nested Serializer example in relationships docs. Closes #2924 .
2015-07-14 12:10:40 +01:00
Tom Christie
2b51d5594b
Remove whitespace and comment changes
2015-07-14 11:41:25 +01:00
Tom Christie
14a32ae32d
Add get_page_size hook to CursorPagination. Closes #3068 .
2015-07-14 11:40:15 +01:00
Tom Christie
1d012aeb93
Merge branch 'cursor-limits' of https://github.com/uploadcare/django-rest-framework into uploadcare-cursor-limits
2015-07-14 11:37:18 +01:00
Tom Christie
209bcb9087
Added url_field_name class attribute to ModelSerializer. Closes #3106 .
2015-07-14 11:21:33 +01:00
Tom Christie
538ffaf6c7
Store self.action='metadata' for OPTIONS requests on viewsets. Closes #3115 .
2015-07-14 11:13:26 +01:00
Xavier Ordoquy
11e3cfbf6e
Merge pull request #3142 from peleccom/patch-1
...
Fixed typo in docs
2015-07-13 16:07:06 +02:00
Alexander Pitkin
6d4ae2c40f
Fixed type in docs
...
Fixed typo in Miscellaneous notes of 3.0 release announcement docs
2015-07-13 16:46:14 +03:00
homm
a3afcfb6d3
duplicate get_page_size
and related properties from PageNumberPagination
2015-07-13 14:44:48 +03:00
homm
59905e9335
revert BasePageSizePagination class and CursorPagination inheritance
2015-07-13 14:36:47 +03:00
Carlton Gibson
6ff5385996
Merge pull request #3140 from dptechdev/patch-1
...
Update rest-hypermedia-hateoas.md
2015-07-11 23:54:17 +02:00
Derek Pauley
387dfd5dc3
Update rest-hypermedia-hateoas.md
...
There was a typo under ## What REST framework doesn't provide.
Original: What REST framework doesn't do is give you is machine readable hypermedia formats such as [HAL][hal],
Fixed: What REST framework doesn't do is give you machine readable hypermedia formats such as [HAL][hal],
2015-07-11 13:23:57 -05:00
Xavier Ordoquy
061081c732
Merge pull request #3133 from YuriHeupa/patch-2
...
Changed typo in Renderer docs of BrowsableAPIRenderer
2015-07-10 08:15:35 +02:00
Yuri Hernani Heupa
c04c8808c6
Changed typo in Renderer docs
...
The BrowsableAPIRenderer was misspelled with an extra 'e' letter
2015-07-09 22:41:53 -03:00
Xavier Ordoquy
f33ca01511
Merge pull request #3112 from juannyG/master
...
Fix nested serializer required=False multipart data validation bug
2015-07-08 15:15:14 +02:00
Juan Gutierrez
2887fc4a0b
update QueryDict initialization to satisfy older versions of Django
2015-07-08 08:25:12 -04:00
Juan Gutierrez
35db2b142f
remove FakeMultiDict definition in nested serializer tests and replace with django QueryDict
2015-07-08 08:19:42 -04:00
José Padilla
8e6db16e91
Merge pull request #3118 from dealertrack/master
...
Added django-rest-framework-braces in Misc list of 3rd party tools
2015-07-06 18:07:59 -04:00
Miroslav Shubernetskiy
3bb9e251d7
added django-rest-framework-braces in Misc list of 3rd party tools
2015-07-06 17:35:21 -04:00
Xavier Ordoquy
b24741ae89
Merge pull request #3114 from jpadilla/master
...
Fix custom parser example
2015-07-06 10:22:09 +02:00
José Padilla
f161241e07
Fix custom parser example
2015-07-05 16:48:33 -04:00
Juan Gutierrez
b0c5f9db2f
allow a non-required nested serializer to validate correctly when receiving multipart data
2015-07-03 12:28:48 -04:00
José Padilla
c091addb83
Merge pull request #3105 from MattBroach/broach
...
added link to Django Rest Multiple Models to Third Party Packages on Generic Views API docs
2015-07-02 18:35:45 -04:00
Matt Broach
b9e09e2f90
Added django-rest-multiple-models link to general Third Party resources page as well
2015-07-02 18:18:30 -04:00
Matt Broach
9e58bf6500
added link to Django Rest Multiple Models to Third Party Packages
2015-07-02 17:20:41 -04:00
Tom Christie
c3507552d5
Merge pull request #3104 from Seraf/master
...
Adding recursion on child of List Field
2015-07-02 13:30:28 +01:00
Julien Syx
2b979d4356
Adding recursion on child of List Field
2015-07-02 14:15:43 +02:00
Tom Christie
8d69c4c068
Improve OPTIONS descriptions for lists dicts and nested serializers
2015-07-02 12:55:42 +01:00
Tom Christie
21ec3b506a
Merge pull request #3103 from tomchristie/trollknurr-master
...
Ensure no duplication of results with SearchFilter with Oracle databases.
2015-07-02 12:23:31 +01:00
Tom Christie
e6ca0fcb4c
Remove erronous newline
2015-07-02 11:53:05 +01:00
Tom Christie
37815920e3
Update to master and tweak remaining issues
2015-07-02 11:50:40 +01:00
Tom Christie
055986b5b0
More helpful exception when URL cannot reverse and field value was empty. Closes #2698 .
2015-07-02 11:36:14 +01:00
Tom Christie
c4f908d4ee
Introduce datetime_parser as class level attribute on all date/time fields. Refs #3093 .
2015-07-02 11:23:52 +01:00
Tom Christie
6ce9e3baf0
Remove datetime_parser argument from DateTimeField
2015-07-02 11:22:18 +01:00
Tom Christie
6d79ea2cde
Merge pull request #3093 from sorreltree/master
...
Ability to customize DateTimeField with a custom datetime_parser
2015-07-02 11:21:25 +01:00
Tom Christie
fb4233736f
Empty settings should also be coerced to lists. Closes #3087 .
2015-07-02 10:28:46 +01:00
Tom Christie
a03b89f326
Restrict isort to rest_framework and tests directories
2015-07-02 10:18:08 +01:00
Tom Christie
d979dc6522
Tweak exception message
2015-07-02 10:16:43 +01:00
Tom Christie
e3c3d8826f
Merge pull request #3071 from antonyc/patch-1
...
Made exception message more verbose
2015-07-02 10:14:01 +01:00
Tom Christie
39ed03c21c
Merge pull request #3088 from atleta/master
...
Handle AttributeError as well (when the imported module exists but the specified function/class does not).
2015-07-02 09:52:53 +01:00
Tom Christie
5fd346a8d3
Merge pull request #3102 from linovia/feature/update_django_filter
...
Upgrade django-filter to 0.10.0
2015-07-02 09:19:08 +01:00
Xavier Ordoquy
4b5f18d293
Upgrade django-filter to 0.10.0
2015-07-01 23:19:50 +02:00
Xavier Ordoquy
c5a1427c7a
Merge pull request #3100 from bitterjug/fixdocs
...
Remove unused import from docs example
2015-07-01 21:50:28 +02:00