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
2adfb6c3aa
Cleanup extra newline
2014-12-17 16:00:49 +00:00
Tom Christie
bbd55fafc5
Version 3.0.2
2014-12-17 15:58:30 +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
Tom Christie
47fe697707
Merge pull request #2285 from tomchristie/versioning
...
Versioning
2014-12-17 12:54:31 +00:00
Tom Christie
05a6eaec8a
More docs, plus 'ALLOWED_VERSIONS' setting.
2014-12-17 12:41:46 +00:00
Tom Christie
70bd3a32f7
Minor comment tweak
2014-12-16 20:01:01 +00:00
Tom Christie
fe9647ce92
AcceptHeaderVersioning to return unicode strings.
2014-12-16 16:37:32 +00:00
Tom Christie
4e91ec6133
Added NamespaceVersioning
2014-12-16 16:14:08 +00:00
Tom Christie
7cfa0e0306
Merge lateset version-3.1
2014-12-16 15:35:25 +00:00
Tom Christie
74483338ab
Merge branch 'master' into version-3.1
2014-12-16 15:34:28 +00:00
Tom Christie
6e51e4f5cd
Versioning first pass
2014-12-16 15:34:19 +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
b6ee784240
Merge master
2014-12-15 12:18:55 +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
8934e61b67
Merge branch 'jpadilla-exception-handler-context' into version-3.1
2014-12-15 09:20:27 +00:00
Tom Christie
d232c5739e
Merge branch 'exception-handler-context' of git://github.com/jpadilla/django-rest-framework into version-3.1
2014-12-15 09:19:53 +00:00
Tom Christie
4778463e32
Merge branch 'master' into version-3.1
2014-12-15 09:18:11 +00:00
Tom Christie
d22c0007b3
Merge branch 'exception-handler-context' of git://github.com/jpadilla/django-rest-framework into jpadilla-exception-handler-context
2014-12-15 09:13:27 +00:00
Tom Christie
5e7c9687c7
First pass at serializer repr bug
2014-12-15 09:13:02 +00:00
José Padilla
4ebd8770b9
Update excepteion_handler signature
2014-12-14 20:47:33 -04:00
José Padilla
26c223a34f
Add get_exception_handler_context()
2014-12-14 16:43:58 -04:00
José Padilla
89e9fc98d6
Reuse exception_handler variable throughout
2014-12-14 15:20:44 -04:00
José Padilla
fd003fcefa
Add pending deprecation warning message
2014-12-14 15:03:20 -04:00
José Padilla
478c8d724b
Update docs
2014-12-14 10:16:52 -04:00
José Padilla
3f85b476fa
Remove test
2014-12-14 10:15:13 -04:00
José Padilla
e8c0766568
Support handlers with and without context
2014-12-13 20:54:35 -04:00
José Padilla
0d109c90a7
Add context to exception handler #2236
...
Same context as renderers which include: the view,
args, kwargs, and request.
This provides enough contextual information to the
exception handlers to handle errors better.
In a use case like #1671 , a custom handler
would allow Sentry to log the request properly.
2014-12-13 18:18:00 -04: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