Carlton Gibson
2451fdbf9b
Merge 8d740a11e4 into eccf7cc7ac
2015-09-22 14:39:34 +00:00
Carlton Gibson
8d740a11e4
Adjust README and Release Notes
2015-09-22 16:39:25 +02:00
Carlton Gibson
45ace5010e
Remove OrderedDict fallback
2015-09-22 16:35:38 +02:00
Carlton Gibson
0b34408172
Remove unittest.skipUnless
2015-09-22 16:24:22 +02:00
Carlton Gibson
6e86a53c92
Remove apps.get_model fallback
...
* Corrects presumed logic error in `ResolveModelWithPatchedDjangoTests`
2015-09-22 16:14:45 +02:00
Carlton Gibson
68c88e180f
Remove ContentType import fallback
2015-09-22 15:55:39 +02:00
Carlton Gibson
5c0dffa4f7
Remove Django 1.6 from test matrix
2015-09-22 15:39:51 +02:00
Tom Christie
eccf7cc7ac
Merge pull request #3427 from carltongibson/exlude-guardian
...
Exclude Guardian testing against Django master
2015-09-22 14:32:42 +01:00
Carlton Gibson
524a28c6f8
Exclude Guardian testing against Django master
2015-09-22 15:14:25 +02:00
Tom Christie
5b2b675a21
Merge pull request #3421 from carltongibson/supported-versions-2
...
Drop Django 1.5
2015-09-22 12:48:11 +01:00
Carlton Gibson
2aa33ed544
Adjust README and Release Notes
2015-09-21 20:23:39 +02:00
Carlton Gibson
8ea1606abf
Remove Django 1.5 clean_manytomany_helptext fallback
2015-09-21 20:16:52 +02:00
Carlton Gibson
25de8c960f
Remove Django 1.5 get_model_name fallback
2015-09-21 20:10:31 +02:00
Carlton Gibson
4a1ab3c18c
Fix isort errors
2015-09-21 16:29:33 +02:00
Carlton Gibson
e625cff8a5
Remove Django 1.5 URLValidator fallback
2015-09-21 16:22:46 +02:00
Carlton Gibson
9216dc9a25
Remove Django 1.5 EmailValidator fallback
2015-09-21 16:20:07 +02:00
Carlton Gibson
8edb9d3c1f
Drop testing against Django 1.5
2015-09-21 16:08:56 +02:00
Carlton Gibson
366dff4f26
Test Python 3.5 against Django master
2015-09-21 16:03:37 +02:00
Carlton Gibson
796baab86f
Drop Pythons 3.2, 3.3 for Django master
...
No longer supported
2015-09-21 15:47:11 +02:00
Tom Christie
a3067bea55
Merge branch 'master' into version-3.3
2015-09-17 16:24:46 +01: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
Tom Christie
afd2a8f8f0
Adjust ModelField.null mappings now that Django-25320 is resolved
2015-09-03 10:12:52 +01:00
