Commit Graph

6010 Commits

Author SHA1 Message Date
Tom Christie 721efa2817 Version 3.2.5 2015-10-27 14:30:47 +00:00
Tom Christie c81acab7e0 Use format_html in simple_tag functions 2015-10-27 14:21:03 +00:00
Tom Christie fed691a304 Escape username in optional_logout 2015-10-27 14:17:19 +00:00
Xavier Ordoquy 7661398a4a Merge pull request #3420 from linovia/release/3.2.4
Release/3.2.4
2015-09-23 01:51:07 +02:00
Tom Christie 41b796d844 Merge pull request #3426 from uruz/feature/fix-typo
Typo in test method name
2015-09-22 10:26:38 +01:00
Alexey Boriskin 0155a44aac Typo in test method name 2015-09-22 12:13:01 +03:00
Xavier Ordoquy 6ee3e29460 Add #3415 to the 3.2.4 release 2015-09-21 13:28:59 +02:00
Xavier Ordoquy 1054ea559c Fix the issue link. 2015-09-21 13:28:37 +02:00
Xavier Ordoquy 26715c2dae Merge remote-tracking branch 'origin/master' into release/3.2.4 2015-09-21 13:25:49 +02:00
Xavier Ordoquy f2c65512c6 Merge pull request #3415 from adamsc64/issue_2761
Fixed #2761 - ListField truncation on HTTP PATCH
2015-09-21 13:06:44 +02:00
Xavier Ordoquy 089b8af4c1 Update the translations. 2015-09-21 08:07:56 +02:00
Xavier Ordoquy d0510438b2 Bump version to 3.2.4. 2015-09-20 22:04:25 +02:00
Xavier Ordoquy d85e7b9ccc Update Release notes for 3.2.4. 2015-09-20 22:03:52 +02:00
Xavier Ordoquy df26614e85 Translation update. 2015-09-20 21:59:47 +02:00
Christopher Adams 9ccfc94077 Fixed #2761 - ListField truncation on HTTP PATCH
- Checked ``partial`` state when getting value in appropriate field
  classes; return ``empty`` immediately if key not submitted.
2015-09-19 10:18:04 -04:00
Christopher Adams cb42b995fa Proof of bug #2761
- When not submitting key for list fields or multiple choice, partial
  serialization should result in empty state (key not there), not an
  empty list.
2015-09-19 10:17:57 -04:00
Xavier Ordoquy b1a5294a1a Merge pull request #3411 from yiyocx/patch-1
Improved Serializer relations docs
2015-09-17 17:33:53 +02:00
Yiyo 7df11078ee Improved Serializer relations docs 2015-09-17 10:30:22 -05:00
Xavier Ordoquy 8cae462b3a Merge pull request #3401 from nryoung/update-transifex-client-reqs
Update transifex-client requirement to latest release version 0.11b3
2015-09-15 08:29:46 +02:00
Nic Young 4e7d0493db Update transifex-client requirement to latest release version 2015-09-14 21:05:28 -07:00
José Padilla fc2e98c8cb Merge pull request #3400 from James1345/master
added knox package reference to 3rd party auth apps
2015-09-14 14:49:05 -04:00
James McMahon 6baca94830 added knox package reference to 3rd party auth apps 2015-09-14 19:34:07 +01:00
Tom Christie b7d77d5bf2 Merge pull request #3396 from qqbuby/3395
fix issue #3395
2015-09-14 10:22:20 +01:00
qqbuby 1aa16caffe append a space after the comment mark to remain consistent with the other parts of the tutorial 2015-09-13 20:24:22 +08:00
José Padilla 2424ab02e8 Merge pull request #3397 from nryoung/add-serpy
Add link to serpy serialization
2015-09-13 07:38:01 -04:00
Nic Young 5c076e10bb Add link to serpy serialization, fixes #3391 2015-09-12 23:04:18 -07:00
Tom Christie 31539e1a21 Merge pull request #3393 from sloria/booleanfield-fix
Correctly handle [] and {} as invalid inputs to BooleanField
2015-09-12 07:20:56 +01:00
Steven Loria 284f9faa07 Correctly handle [] and {} as invalid inputs to BooleanField 2015-09-11 23:12:18 -04:00
qqbuby 1a8f9d0a0f fix issue #3395 to correct the output text at line 184in docs/tutorial/1-serialization.md 2015-09-12 01:36:40 +08:00
Tom Christie a67eed1466 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-09-11 13:06:18 +01:00
Tom Christie ab296ced4e Add link to django REST marshmallow 2015-09-11 13:06:09 +01:00
Tom Christie 5401440324 Merge pull request #3388 from nryoung/field-level-validation-note
Add note about field level validation, fixes #3306
2015-09-11 09:42:28 +01:00
Nic Young 4704da9a1a Add note about field level validation, fixes #3306
The documentation added warns the user that field level validation will
be skipped if the field is declared on the model with the parameter
`required=False`.
2015-09-10 22:55:55 -07:00
Xavier Ordoquy cd4c389d1f Merge pull request #3382 from outime/patch-1
Fixed typo in ScopedRateThrottle example views
2015-09-10 10:16:29 +02:00
Xavier Ordoquy b6b33b567e Merge pull request #3360 from lubomir/improve-docs-for-default
Improve documentation of default argument for fields
2015-09-10 10:15:17 +02:00
Rubén Díaz 671de792e2 Fixed typo in ScopedRateThrottle example views 2015-09-10 10:19:40 +03:00
Tom Christie a985fc521f Merge pull request #3364 from linovia/bug/3361
Don't pass `allow_empty` to `ListSerializer`'s children.
2015-09-09 09:28:25 +01:00
Xavier Ordoquy aa48182686 Add test coverage on allow_empty for nested serializers. 2015-09-07 23:11:01 +02:00
Tom Christie b57e9cf405 Test protected branches 2015-09-07 10:22:44 +01:00
Xavier Ordoquy 4404d40f60 Only pass allow_empty to the `ListSerializer` if it was in the arguments.
Helps with backward compatibility.
2015-09-06 23:02:44 +02:00
Xavier Ordoquy 7ccdd015ae Merge pull request #3368 from potpath/patch-1
Update 6-viewsets-and-routers.md
2015-09-04 11:31:24 +02:00
potpath bb95de13bf Update 6-viewsets-and-routers.md 2015-09-04 16:07:20 +07:00
Xavier Ordoquy dcdd765647 Avoid passing allow_empty to the ListSerializer children. 2015-09-03 17:27:33 +02:00
Tom Christie 39ec564ae9 Do not access settings on compat import 2015-09-03 14:22:13 +01:00
Tom Christie 7905e9f9f4 Docs tweak 2015-09-03 11:57:11 +01:00
Tom Christie e9e88cbc60 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-09-03 11:24:07 +01:00
Tom Christie f9d1a34fdd Fix nested HTML dictionaries. Closes #3314. 2015-09-03 11:23:58 +01:00
Lubomír Sedlář a57ad07674 Add link to validators
The `set_context` method there is the same as for the default field.
2015-09-03 10:35:28 +02:00
Tom Christie ec007a7e2d Merge pull request #3359 from raphaelmerx/master
DurationField accepts integers
2015-09-03 09:30:45 +01:00
Lubomír Sedlář 1c049edd8c Improve documentation of default argument for fields
The documentation now not only mentions that callables are acceptable
arguments, it also tells the reader what the callable should look like.
2015-09-03 09:46:54 +02:00