encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-08 14:24:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,867 Commits 15 Branches 134 Tags 134 MiB
1e35ce72d0
Commit Graph

6867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
1e35ce72d0 Remove print statement 2016-09-30 12:04:00 +01:00
Tom Christie
4a0bf19d55 Clean up schema tests 2016-09-30 11:47:38 +01:00
Tom Christie
657a7c5e00 Merge branch 'version-3-5' into rejig-schema-generation 2016-09-30 11:28:24 +01:00
Tom Christie
8c72112989 Clean up schema generation 2016-09-30 11:23:36 +01:00
Tom Christie
a8b46fa013 Merge branch '4463-url-pattern-not-detected' of https://github.com/marcgibbons/django-rest-framework into marcgibbons-4463-url-pattern-not-detected 2016-09-29 15:06:02 +01:00
Tom Christie
49ce3d61b7 Merge branch 'c17r-router-empty-prefix' into version-3-5 2016-09-29 14:57:20 +01:00
Tom Christie
c427144b0d Merge branch 'router-empty-prefix' of https://github.com/c17r/django-rest-framework into c17r-router-empty-prefix 2016-09-29 14:57:02 +01:00
Tom Christie
ee2b165230 Merge branch 'rpkilby-fix-deprecations' into version-3-5 2016-09-29 13:14:03 +01:00
Tom Christie
818ab45894 Merge branch 'fix-deprecations' of https://github.com/rpkilby/django-rest-framework into rpkilby-fix-deprecations 2016-09-29 12:13:40 +01:00
Tom Christie
b689a3bdaa Add note about 'User account is disabled.' vs 'Unable to log in' 2016-09-29 12:03:14 +01:00
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
Ryan P Kilby
3bdb0e9dd8 Fix deprecations for py3k 2016-09-16 13:08:26 -04:00
Ryan P Kilby
3bfb0b7168 Use TOC extension instead of header 2016-09-15 19:36:56 -04:00
Ryan P Kilby
a084924ced Fix misc django deprecations 2016-09-15 19:36:50 -04:00
Christian Sauer
a372a8edea Check for empty router prefix; adjust URL accordingly 
It's easiest to fix this issue after we have made the regex.  To try
to fix it before would require doing something different for List vs
Detail, which means we'd have to know which type of url we're
constructing before acting accordingly.
 2016-09-15 12:54:35 -04: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
Ryan P Kilby
bb37cb7992 Update django-filter & django-guardian 2016-09-15 00:48:16 -04:00
Ryan P Kilby
197b63ab85 Add django.core.urlresolvers compatibility 2016-09-15 00:48:13 -04:00
Ryan P Kilby
8609c9ca8c Fix Django 1.10 to-many deprecation 2016-09-15 00:47:51 -04:00
Christian Sauer
a556b9cb42 Router doesn't work if prefix is blank, though project urls.py handles prefix 2016-09-14 18:01:30 -04: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
Marc Gibbons
41967a9e6b Write failing test scenario to support issue #4463. 
- Demonstrate that an explicitly defined "list" view is not included in
  the schema generator Document when a "detail" view also exists.
 2016-09-04 10:39:45 -04: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