Tymur Maryokhin
eeb6e34064
Docs/tutorial import fixes. Refs #2296
2014-12-17 17:28:11 +01:00
Tom Christie
418108632c
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2014-12-17 16:23:20 +00:00
Tom Christie
90b8f9221e
Use six.BytesIO in tutorial. Closes #2296 .
2014-12-17 16:23:00 +00:00
Tom Christie
5f933f575e
Merge pull request #2298 from epicserve/fix_typo
...
Fixed a typo
2014-12-17 16:20:22 +00:00
Brent O'Connor
530f7a21b3
Fixed a typo
2014-12-17 10:19:15 -06:00
Tom Christie
265ed9377e
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2014-12-17 16:19:13 +00:00
Tom Christie
c9a2ce0703
Expand permissions docs. Closes #2223 .
2014-12-17 16:19:02 +00:00
Tom Christie
ad6533e554
Merge pull request #2294 from tomchristie/fix-empty-html-values-with-default
...
Fix empty HTML values when a default is provided.
2014-12-17 15:24:01 +00:00
Tom Christie
ffc099a256
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2014-12-17 15:22:40 +00:00
Tom Christie
1ba822010d
Highlight trailing '.' in command so it wont be missed.
2014-12-17 15:22:27 +00:00
Tom Christie
3fff5cb6e0
Fix empty HTML values when a default is provided.
2014-12-17 15:13:48 +00:00
Tom Christie
76cfc5eb8a
Merge pull request #2291 from tomchristie/serializer-api-restrictions
...
Serializer API restrictions.
2014-12-17 14:46:45 +00:00
Tom Christie
c6137bbf5a
Serializer API restrictions.
2014-12-17 14:14:51 +00:00
Tom Christie
426547c61c
str() -> six.text_type(). Closes #2290 .
2014-12-17 13:39:35 +00:00
Tom Christie
65fc0d0f77
Ensure request.auth is available to response middleware.
2014-12-17 13:22:52 +00:00
Tom Christie
7fbf5b0e6b
Merge pull request #2155 from martinmaillard/set-user-on-wrapped-request
...
Set authenticated user on wrapped request
2014-12-17 13:12:01 +00:00
Martin Maillard
a68e78bd0b
Add test integrated with middleware
2014-12-16 15:41:16 +01:00
Kevin Brown
d872c8e2e7
Merge pull request #2282 from jpadilla/master
...
Closes #2281
2014-12-15 20:59:48 -05:00
José Padilla
d71ef9c6d8
Closes #2281
2014-12-15 21:48:31 -04:00
Tom Christie
a15db353bf
Minor test cleanup
2014-12-15 13:18:39 +00:00
Tom Christie
af53e34dd5
Merge pull request #2279 from tomchristie/fix-serializer-repr-unicode-bug
...
Use unicode internally everywhere for 'repr'.
2014-12-15 12:04:46 +00:00
Tom Christie
dc66cce16d
Remove erronous print
2014-12-15 12:01:29 +00:00
Tom Christie
72e08a3e8b
Use unicode internally everywhere for 'repr'
2014-12-15 11:55:17 +00:00
Tom Christie
1f6fd924fe
Merge pull request #2277 from NullSoldier/doc-fix
...
Documentation typo
2014-12-15 10:43:20 +00:00
Jason Spafford
56c09cc1f2
Doc typo
2014-12-15 02:41:39 -08:00
Tom Christie
d75b48dc35
Merge pull request #2275 from NullSoldier/doc-fix
...
Tutorial text consistency for Requests and Responses
2014-12-15 09:38:57 +00:00
Tom Christie
488b13e7b8
Better messaging for 'Field.to_representation'. Closes #2271 .
2014-12-15 09:29:54 +00:00
Jason Spafford
b951c74df2
Made docs consistent
2014-12-15 01:24:12 -08:00
Tom Christie
a72f812d80
Merge pull request #2269 from bjacobel/bjacobel/documentation-pagination-readonlyfield
...
Change serializers.Field to serializers.ReadOnlyField for 3.x compatibility
2014-12-13 19:54:19 +00:00
Brian Jacobel
2d470eef80
Change serializers.Field to serializers.ReadOnlyField for 3.x compatibility
...
Using this code snippet as-is on DRF 3.0.1 results in a NotImplementedError
being raised for to_representation due to 3.0's changed behavior with
serializers.Field. The code snippet should be updated to use
serializers.ReadOnlyField instead.
Further discussion here:
https://groups.google.com/forum/?fromgroups=#!topic/django-rest-framework/aX8mLT_v3yc
2014-12-13 14:47:11 -05:00
Tom Christie
dd712a1c26
Merge pull request #2267 from tomchristie/better-misconfigured-serializer-errors
...
Better errors when serializer has incorrectly named field.
2014-12-13 15:08:36 +00:00
Tom Christie
4fb757146a
Fix test for python2/3 compat
2014-12-13 15:04:39 +00:00
Tom Christie
aa571abb20
Better errors when serializer has incorrectly named field.
2014-12-13 14:58:04 +00:00
Tom Christie
6158285856
Merge pull request #2266 from tomchristie/improve-nested-write-checking
...
Improve error checking for nested writes.
2014-12-13 14:23:08 +00:00
Tom Christie
c0b9115bec
Improve check for nested writes
2014-12-13 14:17:24 +00:00
Tom Christie
eb78da4b54
Merge pull request #2265 from jfw/patch-2
...
documentation typo
2014-12-13 07:56:57 +00:00
Jeff Fein-Worton
00da241482
documentation typo
...
base-name -> base_name
2014-12-12 22:14:22 -08:00
Tom Christie
fd473aa905
Merge pull request #2259 from tomchristie/testclient-logout-also-cancels-force-authenticate
...
`Client.logout()` also clears any `force_authenticate`
2014-12-12 13:33:06 +00:00
Tom Christie
8825b258ca
Clean up import ordering
2014-12-12 13:22:24 +00:00
Tom Christie
e3b16c8bc6
Python 3 test fix
2014-12-12 13:16:18 +00:00
Tom Christie
78312d44d1
Client.logout() also clears any force_authenticate
2014-12-12 13:13:08 +00:00
Xavier Ordoquy
903fb5ff96
Merge pull request #2255 from mathspace/charfield-default-message
...
Update CharField default min_length message.
2014-12-12 01:54:27 +01:00
Peter Schmidt
fa1ef33bfc
Update CharField default min_length message.
2014-12-12 11:16:29 +11:00
Martin Maillard
dbd057b9a9
Add test
2014-12-11 20:20:46 +01:00
Tom Christie
73a80564e2
Merge pull request #2251 from linovia/version/3.0.1
...
Release notes & version 3.0.1
2014-12-11 15:08:07 +00:00
Xavier Ordoquy
9c37174768
Fix the ghost backtick.
2014-12-11 15:58:02 +01:00
Xavier Ordoquy
3a69182cc9
Better link representation for the issues.
2014-12-11 15:32:52 +01:00
Xavier Ordoquy
75acdc93bc
Fix the milestone link again.
2014-12-11 15:13:15 +01:00
Xavier Ordoquy
99423defd8
Add full stop to the release note items.
...
Add link to the issues
Fix the milestone link
2014-12-11 15:11:37 +01:00
Xavier Ordoquy
9a7b0755eb
Add links to the issue id.
2014-12-11 15:06:10 +01:00
