Commit Graph

5927 Commits

Author SHA1 Message Date
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
homm
30b36a594f use PageSizePaginationMixin for CursorPagination
tests for custom page_size in CursorPagination
2015-06-23 19:14:10 +03:00
homm
9bc0319ff4 Revert tests 2015-06-23 19:02:05 +03:00
homm
60656e9182 merge CursorPagination.decode_cursor and _decode_cursor
merge `CursorPagination.encode_cursor` and `_encode_cursor`
2015-06-23 19:00:42 +03:00
homm
9a5373d41c make PageSizePaginationMixin from all this page_size stuff 2015-06-23 18:19:38 +03:00
homm
b01e91eb71 test custom cursor format 2015-06-23 18:09:17 +03:00
homm
b3716ccb91 make MockObject, MockQuerySet and ExamplePagination visible outside of setup 2015-06-23 18:07:32 +03:00
homm
ab03729b58 allow cursor format customization 2015-06-23 18:00:26 +03:00
Tom Christie
e4b0273f76 Merge pull request #3063 from jpadilla/url-format-override
Document setting URL_FORMAT_OVERRIDE to None
2015-06-23 13:04:48 +01:00
José Padilla
83ef64dbf5 Document setting URL_FORMAT_OVERRIDE to None
This also hides the format dropdown from the
Browsable API if URL_FORMAT_OVERRIDE is disabled.

Closes #3057
2015-06-23 07:50:44 -04:00
Tom Christie
5e15edde96 Merge pull request #3062 from jpadilla/docs-version
Remove Twitter button for mobile rendering
2015-06-23 12:38:07 +01:00
José Padilla
9bdf9a510e Remove Twitter button for mobile rendering 2015-06-23 07:17:12 -04:00
Tom Christie
b1fc388f82 Merge pull request #3060 from jpadilla/docs-version
Add PyPI version badge to docs. Closes #3023
2015-06-23 12:04:55 +01:00
José Padilla
8554980c86 Add PyPI version badge to docs. Closes #3023 2015-06-23 06:22:35 -04:00
Tom Christie
1e678791de Merge pull request #2922 from thedrow/patch-11
Cache fields list for to_internal_value and to_representation
2015-06-23 08:53:32 +01:00
Tom Christie
bbca795cb7 Merge pull request #3056 from jpadilla/master
Track maximum supported 1.7 and 1.8 versions
2015-06-23 08:50:22 +01:00
José Padilla
b519407b57 Track maximum supported 1.7 and 1.8 versions 2015-06-22 16:04:52 -04:00
Tom Christie
e3b578258a Merge pull request #2769 from nonZero/patch-1
Wrong error message on bad field lookup
2015-06-22 17:04:04 +01:00
Tom Christie
15a386e85d Merge pull request #3045 from paxnovem/issue_3042
Fixed many=False issue on related fields
2015-06-22 15:40:59 +01:00
Tom Christie
894aa9b47e Merge pull request #3054 from thekorn/compat_requestfactory_secure
Compat requestfactory secure
2015-06-22 15:33:24 +01:00
Markus Korn
b42b16d0e6 compat: invert logic for checking the django version when implementing
RequestFactory.generic()
2015-06-22 16:13:42 +02:00
José Padilla
5d4bb0ef22 Merge pull request #3038 from jpadilla/dropdown
Set dynamic maximum height for dropdown widgets
2015-06-22 09:13:41 -04:00
Markus Korn
aa1ad4fb64 test_requests TestSecure: skip tests for django versions where the secure
argument is not available
2015-06-22 14:28:09 +02:00
Markus Korn
06c61fc511 compat: only add compat implementation of RequestFactory.generic() if not
provided by django
2015-06-22 14:05:56 +02:00
Markus Korn
d86e494e86 test_quests: added TestSecure for the emulation of secure connections in test cases 2015-06-22 14:04:46 +02:00
Omer Katz
1701ddae35 Fixed formatting of _readable_fields list comprehension to match the formatting of the _writable_fields list comprehension. 2015-06-20 08:51:03 +03:00
Brian Grohe
51cda112f5 Simplified if statement to one line solution
Based on feedback on the pull request, changed solution to
be simpler for issue 3042
2015-06-19 09:21:35 -04:00
Xavier Ordoquy
8c5fc2a94b Merge pull request #2732 from pquentin/patch-versioning
Document per-view versioning settings
2015-06-19 12:56:24 +02:00
Xavier Ordoquy
7cb618a09f Merge pull request #3047 from jpadilla/html-cleanup
Consistent 2 space tabbing and formatting
2015-06-18 19:29:38 +02:00
José Padilla
5e917789ec Consistent 2 space tabbing and formatting 2015-06-18 09:00:05 -04:00
Brian Grohe
d24990ece2 Fixed many=False issue in related fields
Added check to pop many from kwargs before passing to __init__
Fixed my lint issue from the previous commit
2015-06-17 13:48:34 -04:00
Brian Grohe
79736e516a Added failing test case
Adding failing test case when many=false is explicitly defined

https://github.com/tomchristie/django-rest-framework/issues/3042
2015-06-17 13:18:50 -04:00
Jannon Frank
2c415d7e03 models.TextFields get mapped to serializers.CharField too 2015-06-16 14:05:19 -07:00
Xavier Ordoquy
e368986fcf Merge pull request #3043 from accordeiro/accordeiro/docs-typo-fix
Fixed minor typo on viewsets.md
2015-06-16 22:49:41 +02:00
Xavier Ordoquy
139ba7adeb Merge pull request #3006 from osantana/master
Handle invalid characters in "Authorization: token ..." headers
2015-06-16 22:40:15 +02:00
Alexandre Cordeiro
deb2c9eb87 Fixed minor typo on viewsets.md
I'm not sure how the contribution policy for the docs is, but I thought it'd be faster to issue a pull request than reaching out to you guys/creating an issue for something so simple. Hope it's not a problem :)
2015-06-16 17:36:11 -03:00
Xavier Ordoquy
5524339e0e Merge pull request #3037 from jpadilla/master
Fix versioning urls
2015-06-16 21:34:31 +02:00
José Padilla
33a08928d7 Set dynamic maximum height for dropdown widgets 2015-06-15 21:46:08 -04:00
José Padilla
0be6d87fac Fix versioning urls 2015-06-15 16:51:37 -04:00
José Padilla
7f0acbd5a5 Merge pull request #3026 from linovia/feature/format_suffix_patterns_and_trailing_slash
`format_suffix_patterns` is applied before the trailing slash.
2015-06-15 16:38:12 -04:00
Xavier Ordoquy
be9327ad3a Merge pull request #3025 from linovia/documentation
Replace the former `get_filter_backends` by `filter_queryset`.
2015-06-15 22:28:41 +02:00
Xavier Ordoquy
49404f6977 Merge pull request #2789 from ovangle/primary_key_serialization
Primary key serialization
2015-06-15 22:23:01 +02:00