Commit Graph

6848 Commits

Author SHA1 Message Date
Tom Christie
f455c67170 Merge branch 'MobileWorks-html_cutoff_settings' into version-3-5 2016-09-29 11:53:22 +01:00
Tom Christie
24bf38297b Merge branch 'html_cutoff_settings' of https://github.com/MobileWorks/django-rest-framework into MobileWorks-html_cutoff_settings 2016-09-29 11:53:03 +01:00
Tom Christie
9a4ed1bf12 Merge branch 'should_include_link' into version-3-5 2016-09-29 11:40:40 +01:00
Tom Christie
bc9b522e37 Merge branch 'rpkilby-fix-simple-callable' into version-3-5 2016-09-29 10:29:52 +01:00
Tom Christie
61b1189049 Fix release notes 2016-09-29 10:24:30 +01:00
Tom Christie
a60ef8cec4 Merge branch 'schema-renderers-only-for-root-view' into version-3-5 2016-09-29 10:23:07 +01:00
Tom Christie
c2cec78bd4 Merge master 2016-09-29 09:58:06 +01:00
Tom Christie
37b3475e5d API client (#4424) 2016-09-29 09:46:28 +01:00
Tom Christie
b516712076 schema_renderers= should *set* the renderers, not append to them. 2016-09-28 12:15:46 +01:00
Ryan P Kilby
b3afcb25d9 Drop python 3.2 support (EOL, Dropped by Django) 2016-09-22 15:35:24 -04:00
Ryan P Kilby
adcf6536e7 Add is_simple_callable tests 2016-09-22 15:35:24 -04:00
Ryan P Kilby
a0a8b9890a Add py3k compatibility to is_simple_callable 2016-09-22 15:35:20 -04:00
Tom Christie
7ab4a587d9 Version 3.4.7 (#4501) 2016-09-21 12:24:26 +01:00
Tom Christie
be74d11165 Fallback behavior for request parsing when request.POST already accessed. (#4500) 2016-09-21 11:49:09 +01:00
Xavier Ordoquy
e82ee91078 Merge pull request #4497 from knaperek/fix-readme-token-model-name
Rename an invalid reference to BasicToken in the docs
2016-09-19 22:43:47 +02:00
Jozef Knaperek
76cc2f0319
Rename an invalid reference to BasicToken in the docs 2016-09-19 21:52:06 +02:00
Ollie Ford
fe96ceced0 fixes response rendering with empty context (#4495)
This commit allows `response.render` to be called when
`response.rendered_context == {}`. This should be allowed, since
if [the JSONRenderer, for example](https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/renderers.py#L85-L92) receives a `None` context, it
sets it to an empty dictionary itself.
2016-09-17 03:13:34 +01:00
Tanner Hobson
fe4c4fa751 Fix indentation regression in API listing (#4493)
In commit 5392be4ddb, there was a change
made when cleaning up the template for the API listing that caused 2
spaces to appear before every header item (except the first) and before
the first line of the body of the response. This meant that it often
looked like:

HTTP 200 OK
  Allow: GET, OPTIONS
  Content-Type: application/json
  Vary: Accept

  {
    "key": "value",
    "key2": "value2"
}

This change removes those leading spaces, so that it will now look like:

HTTP 200 OK
Allow: GET, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "key": "value",
    "key2": "value2"
}
2016-09-17 03:09:49 +01:00
Tom Christie
4655501d51 Fix regression of RegexField. (#4490)
* Don't deepcopy 'regex' arguments, instead treat as immutable.
2016-09-15 12:44:45 +01:00
Jeff Willette
a68b37d8bc Update to correct location of reverse relation doc (#4481) 2016-09-13 09:31:48 +01:00
Xavier Ordoquy
e91ffc87cb Ignore empty args in the MultipleFieldLookupMixin definition - Closes #4484 2016-09-13 07:21:10 +02:00
Andy Schriner
46b9e4edf9 add settings for html cutoff on related fields 2016-09-12 14:49:58 -07:00
José Padilla
6b6f319509 Add missing comma (#4473) 2016-09-08 14:01:26 +01:00
TakesxiSximada
5df54a711f Set a view function's __module__ value to the WrappedAPIView object's __module__ (#4465) 2016-09-05 11:16:41 +01:00
Tom Christie
e4f692831e Added SchemaGenerator.should_include_link 2016-09-02 18:04:19 +01:00
Mathieu Pillard
07efbdb45e Fix APIClient.get() when path contains unicode arguments (#4458) 2016-09-02 17:00:03 +01:00
Jakub Moliński
80bd3b9722 [documentation] Throttling random request code example fix (#4451) 2016-08-30 10:37:48 +01:00
Tom Christie
b683cd7afc Update sponsor info [ci skip] 2016-08-25 22:29:38 +01:00
Tom Christie
f7b4511715 Update sponsor info [ci skip] 2016-08-25 22:27:51 +01:00
Tom Christie
f064ec6ac6 Version 3.4.6 (#4436) 2016-08-23 16:59:47 +01:00
Tom Christie
97806f9724 Add missing comma 2016-08-23 09:46:03 +01:00
José Padilla
d0ed482d70 Skip HiddenField from Schema fields (#4429) 2016-08-22 16:53:53 +01:00
orf
d540f0262b Improve Create to show the original exception traceback (#3508) 2016-08-19 14:42:13 +01:00
Tom Christie
a335309b33 Add __str__ method to PKOnlyObject (#4423) 2016-08-19 14:37:27 +01:00
Tom Christie
63342e81db Version 3.4.5 (#4421) 2016-08-19 12:45:20 +01:00
Robert Jensen
59ca61abcd Add django-rest-framework-roles to third party packages in permissions docs (#4417) 2016-08-19 11:44:31 +01:00
Tom Christie
0cc3f5008f Add get_requests_client 2016-08-18 15:34:19 +01:00
Tom Christie
382ea770b5 Improve debug error handling (#4416) 2016-08-18 14:42:15 +01:00
Tom Christie
b76984d222 Allow custom CSRF_HEADER_NAME setting. (#4415) 2016-08-18 11:24:03 +01:00
nevun
966330a85a Replace utf8 character ' with its ascii counterpart, makes bdist_rpm.py happy on centos7 (#4412) 2016-08-17 19:42:40 +01:00
Tom Christie
0b3db028a2 py3 compat 2016-08-17 18:50:02 +01:00
Tom Christie
53117698e0 py3 compat 2016-08-17 18:47:01 +01:00
Tom Christie
da47c345c0 Py3 compat 2016-08-17 18:09:19 +01:00
Tom Christie
64e19c738f Tests for auth and CSRF 2016-08-17 17:54:03 +01:00
Tom Christie
049a39e060 Add cookie support 2016-08-17 15:43:12 +01:00
Tom Christie
6ede654315 Graceful fallback if requests is not installed. 2016-08-17 12:11:01 +01:00
Tom Christie
e3f8d06baf Include .action attribute on viewsets when generating schemas (#4408) 2016-08-15 17:10:55 +01:00
Tom Christie
101fd29039 Do not include uploads in request.POST (#4407) 2016-08-15 16:53:17 +01:00
Tom Christie
785b206b81 Tweak doctsring. Closes #4404 [ci skip] 2016-08-15 16:21:51 +01:00
Tom Christie
e76ca6eb88 Address typos 2016-08-15 16:06:04 +01:00