encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-29 21:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,223 Commits 18 Branches 132 Tags 105 MiB
f7646627f1
Commit Graph

6223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tom Christie
f9e53091c1 Drop handling of ImproperlyConfigured 2015-09-03 16:40:12 +01:00
Tom Christie
8b7ebb9d2c Fixed import sorting 2015-09-03 16:29:13 +01:00
Xavier Ordoquy
dcdd765647 Avoid passing allow_empty to the ListSerializer children. 2015-09-03 17:27:33 +02:00
Tom Christie
10da18b20b Access settings lazily, not at module import 2015-09-03 16:24:13 +01: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
Tom Christie
afd2a8f8f0 Adjust ModelField.null mappings now that Django-25320 is resolved 2015-09-03 10:12:52 +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
f87573ffa3 Merge pull request #3345 from jpadilla/fields 
Update ModelSerializer 'fields'/'exclude'/'__all__' behavior
 2015-08-28 14:57:05 +01:00
Tom Christie
f34777a2e9 Translations for HTML filters 2015-08-28 14:55:22 +01:00
José Padilla
9dd1b2516b Update ModelSerializer fields docs 2015-08-28 09:51:11 -04:00
Tom Christie
3a0d54c7fb Fix testing example. Closes #3346 2015-08-28 13:52:18 +01:00
Tom Christie
78632849cf Comment against model_field.null 1.98 behavior 2015-08-28 13:29:57 +01:00
José Padilla
1fe8e9a0bf Add note on deprecation path 2015-08-28 08:11:07 -04:00
José Padilla
f3ef13ab59 Update to match docs on ModelForm fields 2015-08-28 08:05:20 -04:00
Tom Christie
8db6367188 Deal with 1.9's differing null behavior on reverse relationships and m2m 2015-08-28 12:08:32 +01:00
Tom Christie
b51c1ff0b0 Django 1.9's test case HttpResponse.json() is not cachable. 2015-08-28 11:55:23 +01:00
Tom Christie
7560e8381f Drop unused patterns 2015-08-28 10:53:44 +01:00
Tom Christie
6fa534f214 Fix urlpatterns in test 2015-08-28 10:44:49 +01:00
Tom Christie
a5ddd90df0 Log in and log out require escape and mark_safe 2015-08-28 10:27:49 +01:00
Tom Christie
24a2c3f5c3 Resolve unittest compat 2015-08-28 10:19:18 +01:00
Tom Christie
25c4c7f9fd Pep8 fix 2015-08-28 10:03:16 +01:00
Tom Christie
e70da5ac6b Compat for GenericForeignKey, GenericRelation 2015-08-28 10:03:08 +01:00
José Padilla
654e0e4527 Update ModelSerializer fields behavior 2015-08-27 13:09:08 -04:00
Tom Christie
4f27697467 Fix get_model import 2015-08-27 17:28:12 +01:00
Tom Christie
f691006f2c Resolve generic fields import 2015-08-27 17:16:19 +01:00
Tom Christie
48540f180a unittest compat fallback 2015-08-27 17:11:53 +01:00
Tom Christie
9aca6442a7 Add to the roadmap 2015-08-27 15:31:21 +01:00