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
Mark Skipper
b743818430
Remove unused import from docs example
2015-07-01 20:39:05 +01:00
Tom Christie
a63fd55067
Merge pull request #3099 from tredzko/master
...
Update extra_kwargs on model serializer for required and read_only
2015-07-01 16:30:01 +01:00
Tyler Redzko
af08c70242
Update extra_kwargs on model serializer
...
Ensures that the 'read_only' and 'required' keys from `extra_kwargs` are
retained when present. Closes #3091 .
2015-07-01 10:10:18 -04:00
José Padilla
5bb02cc7b9
Merge pull request #3094 from linovia/bug/2893
...
Update `get_serializer` signature (fix #2893 )
2015-06-30 18:53:53 -04:00
Xavier Ordoquy
b6e46a6483
Update get_serializer signature
...
- remove the `files` and `allow_add_remove` arguments that were part of the 2.x API.
2015-07-01 00:26:54 +02:00
Michael Bacon
5f40ab53de
Ability to customize DateTimeField with a custom datetime_parser
2015-06-30 14:51:47 -04:00
José Padilla
ca455fc80f
Merge pull request #3090 from alasdairnicol/2900
...
Fixed #2900 -- Made example validator class in docs inherit from object
2015-06-30 13:03:14 -04:00
Alasdair Nicol
061cc5a42b
Fixed #2900 -- Made example validator class in docs inherit from object
2015-06-30 16:33:01 +01:00
Laszlo Marai
f0bced6413
Handle AttributeError as well (when the imported module exists but
...
the specified function/class does not).
2015-06-30 05:49:44 +02:00
Tom Christie
5833a1847f
Merge pull request #3086 from vstoykov/fix-manyrelated-choices
...
Fix ManyRelatedField.choices
2015-06-29 14:21:47 +01:00
Venelin Stoykov
c3c9a712fa
Fix ManyRelatedField.choices
...
Use choices from self.child_relation.
We don't need to repeat ourself because can get out of sync.
2015-06-29 15:35:55 +03:00
Tom Christie
36e4f20111
Update runtests.py
2015-06-29 09:39:27 +01:00
Tom Christie
af1a4bd683
Merge pull request #3085 from jpadilla/import-cleanup
...
Print helpful command if isort fails
2015-06-29 09:38:34 +01:00
José Padilla
0f1d9217f0
Print helpful command if isort fails
2015-06-27 16:06:53 -04:00
Tom Christie
3e1687282b
Merge pull request #3048 from jpadilla/import-cleanup
...
Cleanup import following PEP 8 style guide
2015-06-26 14:55:28 +01:00
José Padilla
b4ba8ef4d7
Setup isort for code style linting
2015-06-26 09:16:33 -04:00
José Padilla
7351a3f6ca
Sort imports with isort
2015-06-25 16:55:51 -04:00
José Padilla
83c9136c90
Cleanup import following PEP 8 style guide
2015-06-25 16:10:17 -04:00
Shtarev
e8b23c4789
thin logic
2015-06-25 21:14:00 +03:00
Tom Christie
47765bc429
Merge pull request #3034 from m-vellinga/master
...
Use get_queryset() for RelatedField choices property
2015-06-25 16:41:43 +01:00
Tom Christie
df7c114490
Merge pull request #3076 from jpadilla/issues/2704
...
Progressing #2704
2015-06-25 14:49:15 +01:00
José Padilla
d6e30c75ff
Add test and fix for #2704
2015-06-25 09:35:36 -04:00
Tom Christie
cd0c9b7555
Merge pull request #3074 from tomchristie/unsaved_file_objects_serialize_to_none
...
Unsaved file objects may not have an associated URL.
2015-06-24 14:33:56 +01:00
Tom Christie
321133242f
Unsaved file objects may not have an associated URL.
2015-06-24 14:24:19 +01:00
Tom Christie
9b8f966e06
Merge pull request #3073 from tomchristie/support_trim_whitespace_with_allow_blank_false
...
Support allow_blank=False with trim_whitespace=True.
2015-06-24 13:43:12 +01:00
Tom Christie
39ece9bee0
Support allow_blank=False with trim_whitespace=True.
2015-06-24 13:32:54 +01:00
Tom Christie
d5609979ca
Merge pull request #3072 from tomchristie/fix-link-headers
...
Fix link headers in examples, as per RFC5988.
2015-06-24 13:16:19 +01:00
Tom Christie
632fc98f77
Fix link headers in examples, as per RFC5988.
2015-06-24 12:57:23 +01:00
Tom Christie
8329411cc3
Merge pull request #2539 from donewell/permission-detail
...
add message to custom permission
2015-06-24 11:32:02 +01:00
Tom Christie
8d4c96ecd6
Merge pull request #3012 from jannon/fix-allow-blank-mapping
...
only include 'allow_blank' on supported fields
2015-06-24 11:01:10 +01:00
Anton Chaporgin
47acec0f9d
Made exception message more verbose
...
This exception helps you to upgrade from 2 -> 3 and since a lot of fields may be in 2 using serializers.Field as parent class, this message should contain at least name of upgraded field to help user to grep and fix the codebase faster.
2015-06-24 11:59:49 +03:00
Tom Christie
a17270589c
Merge pull request #3067 from uploadcare/cursor-hooks
...
Cursor hooks
2015-06-23 21:59:50 +01:00
