Tom Christie
4b4130e8b2
Fix request cloning, so method becomes set
2015-09-17 16:34:03 +01:00
Tom Christie
566812ac0b
Remove method and content overriding
2015-09-17 15:17:29 +01: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
raphaelmerx
b9782b6850
DurationField accepts integers
2015-09-02 16:47:50 -07:00
Tom Christie
d48ec83688
Merge pull request #3358 from brittdawn/3357-self-tag-name-to-generic-relationships-docs
...
Replacing self.tag with self.tag_name in Generic Relationships documentation.
2015-09-02 18:19:41 +01:00
Britt Dawn
7c12a988fa
Replacing self.tag with self.tag_name in Generic Relationships documentation.
2015-09-02 09:25:00 -07:00
Xavier Ordoquy
4dfc66e45d
Merge pull request #3352 from miki725/url-filter
...
Added django-url-filter to 3rd party libraries
2015-09-01 08:52:57 +02:00
Miroslav Shubernetskiy
6926c71699
added django-url-filter to 3rd party libraries
2015-08-31 21:23:11 -04:00
Tom Christie
3a0d54c7fb
Fix testing example. Closes #3346
2015-08-28 13:52:18 +01:00
Tom Christie
8264222497
Merge branch 'master' of github.com:tomchristie/django-rest-framework
2015-08-25 13:32:42 +01:00
Tom Christie
086115c7b8
Clean up after publishing to PyPI
2015-08-25 13:32:35 +01:00
Tom Christie
3666b3f975
Merge pull request #3325 from slava-sh/patch-1
...
Fix typo
2015-08-24 19:45:19 +01:00
Slava Shklyaev
49d799c454
Fix typo
2015-08-24 21:09:08 +03:00
Tom Christie
1ba879278a
Merge pull request #3324 from Rikuoja/master
...
Don't error on missing `search_fields` attribute.
2015-08-24 15:20:52 +01:00
Rikuoja
65df9fd5c6
Fix #3323
2015-08-24 17:02:49 +03:00
Tom Christie
0198bce34f
Release 3.2.3
2015-08-24 10:59:52 +01:00
Tom Christie
b271946b31
Merge pull request #3321 from tomchristie/empty-charfield-html
...
Resolve empty HTML charfield behavior.
2015-08-24 10:41:36 +01:00
Tom Christie
9ac646385f
Resolve empty HTML charfield behavior. Closes #3318 .
2015-08-24 10:13:16 +01:00
Tom Christie
9758838d86
Merge pull request #3320 from jpadilla/master
...
Bump up maximum supported Django versions
2015-08-22 16:38:40 +01:00
José Padilla
01fa2647c9
Bump up maximum supported Django versions
2015-08-22 08:49:05 -04:00
Tom Christie
8527a2c9d2
Merge pull request #3316 from purple-sunrise/iregexp_search
...
Regex search option
2015-08-21 17:01:03 +01:00
borzdyko
f0782b9451
Doc for regex search filter
2015-08-21 18:26:23 +03:00
borzdyko
21d0e51831
Test for regex search filter
2015-08-21 18:23:39 +03:00
borzdyko
314daaedfa
Using https://docs.djangoproject.com/en/1.8/ref/models/querysets/#regex for search filter by starting field with '$'
2015-08-21 18:13:13 +03:00
Tom Christie
f601c6c1c3
Merge pull request #3313 from tomchristie/limit-selects
...
Limit rendering of relational selects to max 1000 items by default.
2015-08-21 11:41:55 +01:00
Tom Christie
c271568bf5
Remove erronous checkin
2015-08-21 10:57:46 +01:00
Tom Christie
314c0095aa
iter_options function should have no cutoff by deault
2015-08-21 10:56:22 +01:00
Tom Christie
99beeb80e1
No cutoff for default ChoiceField, only for relationships
2015-08-21 10:53:10 +01:00
Tom Christie
f4412d0827
Docs for select cutoffs
2015-08-21 10:52:44 +01:00
Tom Christie
490f0c9f34
Merge branch 'callorico-master'
2015-08-20 12:39:25 +01:00
