From 323f59091c83f777cb6c9919d502055ac79ca8cb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jeffcjohnson@gmail.com>
Date: Thu, 16 Mar 2017 09:03:45 -0400
Subject: [PATCH 01/13] add content block and breadcrumbs_empty block to allow
 base.html to be reused

---
 rest_framework/templates/rest_framework/base.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index ef9b026c8..bd87ba8a6 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -63,12 +63,15 @@
               {% else %}
                 <li><a href="{{ breadcrumb_url }}">{{ breadcrumb_name }}</a></li>
               {% endif %}
+            {% empty %}
+              {% block breadcrumbs_empty %}&nbsp;{% endblock breadcrumbs_empty %}
             {% endfor %}
           </ul>
         {% endblock %}
 
         <!-- Content -->
         <div id="content">
+          {% block content %}
 
           {% if 'GET' in allowed_methods %}
             <form id="get-form" class="pull-right">
@@ -252,6 +255,7 @@
                 </div>
               {% endif %}
             {% endif %}
+          {% endblock content %}
         </div><!-- /.content -->
       </div><!-- /.container -->
     </div><!-- ./wrapper -->

From 9c3edb092178efad39e63af2bc82f04ae708ce64 Mon Sep 17 00:00:00 2001
From: sol HYUN <solsol9057@gmail.com>
Date: Sat, 18 Mar 2017 04:50:01 +0900
Subject: [PATCH 02/13] DEFAULT_PAGINATION_CLASS is changed to 'None'

because the default value was specified, it did not work properly in API
Document
---
 rest_framework/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index b699d7caf..f7d9a0919 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -50,7 +50,7 @@ DEFAULTS = {
     'DEFAULT_VERSIONING_CLASS': None,
 
     # Generic view behavior
-    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
+    'DEFAULT_PAGINATION_CLASS': None,
     'DEFAULT_FILTER_BACKENDS': (),
 
     # Throttling

From 16aad894592e17965371806d0550f82b22ccee76 Mon Sep 17 00:00:00 2001
From: sol HYUN <solsol9057@gmail.com>
Date: Sat, 18 Mar 2017 06:01:08 +0900
Subject: [PATCH 03/13] reverted to fix the issue without changing setting

---
 rest_framework/schemas.py  | 3 ++-
 rest_framework/settings.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py
index ecfe835a9..98dd37207 100644
--- a/rest_framework/schemas.py
+++ b/rest_framework/schemas.py
@@ -600,7 +600,8 @@ class SchemaGenerator(object):
         if not is_list_view(path, method, view):
             return []
 
-        if not getattr(view, 'pagination_class', None):
+        pagination = getattr(view, 'pagination_class', None)
+        if not pagination or not pagination.page_size:
             return []
 
         paginator = view.pagination_class()
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index f7d9a0919..b699d7caf 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -50,7 +50,7 @@ DEFAULTS = {
     'DEFAULT_VERSIONING_CLASS': None,
 
     # Generic view behavior
-    'DEFAULT_PAGINATION_CLASS': None,
+    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
     'DEFAULT_FILTER_BACKENDS': (),
 
     # Throttling

From 7e76cd8695dbbe40b4a7c3209038fdf0ab8fedaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Fri, 17 Mar 2017 20:27:36 -0400
Subject: [PATCH 04/13] Correctly set scheme in coreapi TokenAuthentication

---
 rest_framework/static/rest_framework/docs/js/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/static/rest_framework/docs/js/api.js b/rest_framework/static/rest_framework/docs/js/api.js
index 131c7f814..cac67efbb 100644
--- a/rest_framework/static/rest_framework/docs/js/api.js
+++ b/rest_framework/static/rest_framework/docs/js/api.js
@@ -163,7 +163,7 @@ $('form.api-interaction').submit(function(event) {
     if (window.auth && window.auth.type === 'token') {
       // Header authentication
       options.auth = new coreapi.auth.TokenAuthentication({
-        prefix: window.auth.scheme,
+        scheme: window.auth.scheme,
         token: window.auth.token
       })
     } else if (window.auth && window.auth.type === 'basic') {

From be0e196e65cf50ab8be1e6aa8d56e5f4d13def7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Fri, 17 Mar 2017 21:43:20 -0400
Subject: [PATCH 05/13] Remove unused base.js script

---
 .../static/rest_framework/docs/js/base.js     | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 rest_framework/static/rest_framework/docs/js/base.js

diff --git a/rest_framework/static/rest_framework/docs/js/base.js b/rest_framework/static/rest_framework/docs/js/base.js
deleted file mode 100644
index 081650cff..000000000
--- a/rest_framework/static/rest_framework/docs/js/base.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function getSearchTerm()
-{
-    var sPageURL = window.location.search.substring(1);
-    var sURLVariables = sPageURL.split('&');
-    for (var i = 0; i < sURLVariables.length; i++)
-    {
-        var sParameterName = sURLVariables[i].split('=');
-        if (sParameterName[0] == 'q')
-        {
-            return sParameterName[1];
-        }
-    }
-}
-
-$(document).ready(function() {
-
-    var search_term = getSearchTerm(),
-        $search_modal = $('#mkdocs_search_modal');
-
-    if(search_term){
-        $search_modal.modal();
-    }
-
-    // make sure search input gets autofocus everytime modal opens.
-    $search_modal.on('shown.bs.modal', function () {
-        $search_modal.find('#mkdocs-search-query').focus();
-    });
-
-    // Highlight.js
-    hljs.initHighlightingOnLoad();
-    $('table').addClass('table table-striped table-hover');
-});
-
-
-$('body').scrollspy({
-    target: '.bs-sidebar',
-});
-
-/* Prevent disabled links from causing a page reload */
-$("li.disabled a").click(function() {
-    event.preventDefault();
-});

From d8507d3f9c9781f24f225d63894842e0769198c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Fri, 17 Mar 2017 21:44:11 -0400
Subject: [PATCH 06/13] Move bootstrap modal data attrs to anchor

---
 rest_framework/templates/rest_framework/docs/sidebar.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rest_framework/templates/rest_framework/docs/sidebar.html b/rest_framework/templates/rest_framework/docs/sidebar.html
index 452d5c20f..c6ac26f66 100644
--- a/rest_framework/templates/rest_framework/docs/sidebar.html
+++ b/rest_framework/templates/rest_framework/docs/sidebar.html
@@ -22,10 +22,10 @@
                 <a><i class="fa fa-user fa-lg"></i> Authentication</a> <span id="selected-authentication">{% if user.is_authenticated %}session{% else %}none{% endif %}</span>
             </li>
             <ul class="sub-menu collapse out" id="auth-control">
-                <li data-auth="none" {% if not user.is_authenticated %}class="active"{% endif %}><a href="#" data-language="none">none</a></li>
-                <li data-auth="token" data-toggle="modal" data-target="#auth_token_modal"><a href="#">token</a></li>
-                <li data-auth="basic" data-toggle="modal" data-target="#auth_basic_modal"><a href="#">basic</a></li>
-                <li data-auth="session"  data-toggle="modal" data-target="#auth_session_modal" {% if user.is_authenticated %}class="active"{% endif %}><a href="#">session</a></li>
+                <li {% if not user.is_authenticated %}class="active"{% endif %}><a data-auth="none" href="#">none</a></li>
+                <li><a data-auth="token" data-toggle="modal" data-target="#auth_token_modal" href="#">token</a></li>
+                <li><a data-auth="basic" data-toggle="modal" data-target="#auth_basic_modal" href="#">basic</a></li>
+                <li {% if user.is_authenticated %}class="active"{% endif %}><a data-auth="session" data-toggle="modal" data-target="#auth_session_modal" href="#">session</a></li>
             </ul>
 
             <li data-toggle="collapse" data-target="#language-control" class="collapsed">

From b0f2ec785eb41f29e559e94420ac05cb3ab2c2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Fri, 17 Mar 2017 21:44:40 -0400
Subject: [PATCH 07/13] Cleanup and refactor docs api.js script

---
 .../static/rest_framework/docs/js/api.js      | 407 ++++++++++--------
 1 file changed, 217 insertions(+), 190 deletions(-)

diff --git a/rest_framework/static/rest_framework/docs/js/api.js b/rest_framework/static/rest_framework/docs/js/api.js
index cac67efbb..c9ff5c085 100644
--- a/rest_framework/static/rest_framework/docs/js/api.js
+++ b/rest_framework/static/rest_framework/docs/js/api.js
@@ -1,33 +1,24 @@
+var responseDisplay = 'data'
+var coreapi = window.coreapi
+var schema = window.schema
+
 function normalizeHTTPHeader (str) {
   // Capitalize HTTP headers for display.
   return (str.charAt(0).toUpperCase() + str.substring(1))
-    .replace(/-(.)/g, function ($1) { return $1.toUpperCase() })
-    .replace(/(Www)/g, function ($1) { return 'WWW' })
-    .replace(/(Xss)/g, function ($1) { return 'XSS' })
-    .replace(/(Md5)/g, function ($1) { return 'MD5' })
+    .replace(/-(.)/g, function ($1) {
+      return $1.toUpperCase()
+    })
+    .replace(/(Www)/g, function ($1) {
+      return 'WWW'
+    })
+    .replace(/(Xss)/g, function ($1) {
+      return 'XSS'
+    })
+    .replace(/(Md5)/g, function ($1) {
+      return 'MD5'
+    })
 }
 
-var responseDisplay = 'data'
-const coreapi = window.coreapi
-const schema = window.schema
-
-// Language Control
-$('#language-control li').click(function (event) {
-    event.preventDefault();
-    const languageMenuItem = $(this).find('a');
-    var language = languageMenuItem.data("language")
-
-    var languageControls = $(this).closest('ul').find('li');
-    languageControls.find('a').not('[data-language="' + language +'"]').parent().removeClass("active")
-    languageControls.find('a').filter('[data-language="' + language +'"]').parent().addClass("active")
-
-    $('#selected-language').text(language)
-
-    var codeBlocks = $('pre.highlight')
-    codeBlocks.not('[data-language="' + language +'"]').addClass("hide")
-    codeBlocks.filter('[data-language="' + language +'"]').removeClass("hide")
-})
-
 function formEntries (form) {
   // Polyfill for new FormData(form).entries()
   var formData = new FormData(form)
@@ -37,7 +28,7 @@ function formEntries (form) {
 
   var entries = []
 
-  for (var {name, type, value, files, checked, selectedOptions} of Array.from(form.elements)) {
+  for (var { name, type, value, files, checked, selectedOptions } of Array.from(form.elements)) {
     if (!name) {
       continue
     }
@@ -58,105 +49,138 @@ function formEntries (form) {
       entries.push([name, value])
     }
   }
+
   return entries
 }
 
-// API Explorer
-$('form.api-interaction').submit(function(event) {
-    event.preventDefault();
+$(function () {
+  var $selectedAuthentication = $('#selected-authentication')
+  var $authControl = $('#auth-control')
+  var $authTokenModal = $('#auth_token_modal')
 
-    const form = $(this).closest("form");
-    const key = form.data("key");
-    var params = {};
+  // Language Control
+  $('#language-control li').click(function (event) {
+    event.preventDefault()
+    var $languageMenuItem = $(this).find('a')
+    var $languageControls = $(this).closest('ul').find('li')
+    var $languageControlLinks = $languageControls.find('a')
+    var language = $languageMenuItem.data('language')
+
+    $languageControlLinks.not('[data-language="' + language + '"]').parent().removeClass('active')
+    $languageControlLinks.filter('[data-language="' + language + '"]').parent().addClass('active')
+
+    $('#selected-language').text(language)
+
+    var $codeBlocks = $('pre.highlight')
+    $codeBlocks.not('[data-language="' + language + '"]').addClass('hide')
+    $codeBlocks.filter('[data-language="' + language + '"]').removeClass('hide')
+  })
+
+  // API Explorer
+  $('form.api-interaction').submit(function (event) {
+    event.preventDefault()
+
+    var $form = $(this).closest('form')
+    var $requestMethod = $form.find('.request-method')
+    var $requestUrl = $form.find('.request-url')
+    var $toggleView = $form.closest('.modal-content').find('.toggle-view')
+    var $responseStatusCode = $form.find('.response-status-code')
+    var $meta = $form.find('.meta')
+    var $responseRawResponse = $form.find('.response-raw-response')
+    var $requestAwaiting = $form.find('.request-awaiting')
+    var $responseRaw = $form.find('.response-raw')
+    var $responseData = $form.find('.response-data')
+    var key = $form.data('key')
+    var params = {}
+    var entries = formEntries($form.get()[0])
 
-    const entries = formEntries(form.get()[0]);
     for (var [paramKey, paramValue] of entries) {
-        var elem = form.find("[name=" + paramKey + "]")
-        var dataType = elem.data('type') || 'string'
+      var $elem = $form.find('[name=' + paramKey + ']')
+      var dataType = $elem.data('type') || 'string'
 
-        if (dataType === 'integer' && paramValue) {
-            var value = parseInt(paramValue)
-            if (!isNaN(value)) {
-              params[paramKey] = value
-            }
-        } else if (dataType === 'number' && paramValue) {
-            var value = parseFloat(paramValue)
-            if (!isNaN(value)) {
-              params[paramKey] = value
-            }
-        } else if (dataType === 'boolean' && paramValue) {
-            var value = {
-                'true': true,
-                'false': false
-            }[paramValue.toLowerCase()]
-            if (value !== undefined) {
-              params[paramKey]
-            }
-        } else if (dataType === 'array' && paramValue) {
-            try {
-              params[paramKey] = JSON.parse(paramValue)
-            } catch (err) {
-              // Ignore malformed JSON
-            }
-        } else if (dataType === 'object' && paramValue) {
-            try {
-              params[paramKey] = JSON.parse(paramValue)
-            } catch (err) {
-              // Ignore malformed JSON
-            }
-        } else if (dataType === 'string' && paramValue) {
-            params[paramKey] = paramValue
+      if (dataType === 'integer' && paramValue) {
+        var value = parseInt(paramValue)
+        if (!isNaN(value)) {
+          params[paramKey] = value
         }
+      } else if (dataType === 'number' && paramValue) {
+        var value = parseFloat(paramValue)
+        if (!isNaN(value)) {
+          params[paramKey] = value
+        }
+      } else if (dataType === 'boolean' && paramValue) {
+        var value = {
+          'true': true,
+          'false': false
+        }[paramValue.toLowerCase()]
+        if (value !== undefined) {
+          params[paramKey]
+        }
+      } else if (dataType === 'array' && paramValue) {
+        try {
+          params[paramKey] = JSON.parse(paramValue)
+        } catch (err) {
+          // Ignore malformed JSON
+        }
+      } else if (dataType === 'object' && paramValue) {
+        try {
+          params[paramKey] = JSON.parse(paramValue)
+        } catch (err) {
+          // Ignore malformed JSON
+        }
+      } else if (dataType === 'string' && paramValue) {
+        params[paramKey] = paramValue
+      }
     }
 
-    form.find(":checkbox").each(function( index ) {
-        // Handle unselected checkboxes
-        var name = $(this).attr("name");
-        if (!params.hasOwnProperty(name)) {
-            params[name] = false
-        }
+    $form.find(':checkbox').each(function (index) {
+      // Handle unselected checkboxes
+      var name = $(this).attr('name')
+      if (!params.hasOwnProperty(name)) {
+        params[name] = false
+      }
     })
 
-    function requestCallback(request) {
-        // Fill in the "GET /foo/" display.
-        var parser = document.createElement('a');
-        parser.href = request.url;
-        const method = request.options.method
-        const path = parser.pathname + parser.hash + parser.search
+    function requestCallback (request) {
+      // Fill in the "GET /foo/" display.
+      var parser = document.createElement('a')
+      parser.href = request.url
+      var method = request.options.method
+      var path = parser.pathname + parser.hash + parser.search
 
-        form.find(".request-method").text(method)
-        form.find(".request-url").text(path)
+      $requestMethod.text(method)
+      $requestUrl.text(path)
     }
 
-    function responseCallback(response, responseText) {
-        // Display the 'Data'/'Raw' control.
-        form.closest(".modal-content").find(".toggle-view").removeClass("hide")
+    function responseCallback (response, responseText) {
+      // Display the 'Data'/'Raw' control.
+      $toggleView.removeClass('hide')
 
-        // Fill in the "200 OK" display.
-        form.find(".response-status-code").removeClass("label-success").removeClass("label-danger")
-        if (response.ok) {
-            form.find(".response-status-code").addClass("label-success")
-        } else {
-            form.find(".response-status-code").addClass("label-danger")
-        }
-        form.find(".response-status-code").text(response.status)
-        form.find(".meta").removeClass("hide")
+      // Fill in the "200 OK" display.
+      $responseStatusCode.removeClass('label-success').removeClass('label-danger')
+      if (response.ok) {
+        $responseStatusCode.addClass('label-success')
+      } else {
+        $responseStatusCode.addClass('label-danger')
+      }
+      $responseStatusCode.text(response.status)
+      $meta.removeClass('hide')
 
-        // Fill in the Raw HTTP response display.
-        var panelText = 'HTTP/1.1 ' + response.status + ' ' + response.statusText + '\n';
-        response.headers.forEach(function(header, key) {
-            panelText += normalizeHTTPHeader(key) + ': ' + header + '\n'
-        })
-        if (responseText) {
-            panelText += '\n' + responseText
-        }
-        form.find(".response-raw-response").text(panelText)
+      // Fill in the Raw HTTP response display.
+      var panelText = 'HTTP/1.1 ' + response.status + ' ' + response.statusText + '\n'
+      response.headers.forEach(function (header, key) {
+        panelText += normalizeHTTPHeader(key) + ': ' + header + '\n'
+      })
+      if (responseText) {
+        panelText += '\n' + responseText
+      }
+      $responseRawResponse.text(panelText)
     }
 
     // Instantiate a client to make the outgoing request.
     var options = {
-        requestCallback: requestCallback,
-        responseCallback: responseCallback,
+      requestCallback: requestCallback,
+      responseCallback: responseCallback
     }
 
     // Setup authentication options.
@@ -180,101 +204,104 @@ $('form.api-interaction').submit(function(event) {
       })
     }
 
-    const client = new coreapi.Client(options)
+    var client = new coreapi.Client(options)
 
     client.action(schema, key, params).then(function (data) {
-        var response = JSON.stringify(data, null, 2);
-        form.find(".request-awaiting").addClass("hide")
-        form.find(".response-raw").addClass("hide")
-        form.find(".response-data").addClass("hide")
-        form.find(".response-data").text('')
-        form.find(".response-data").jsonView(response)
+      var response = JSON.stringify(data, null, 2)
+      $requestAwaiting.addClass('hide')
+      $responseRaw.addClass('hide')
+      $responseData.addClass('hide').text('').jsonView(response)
 
-        if (responseDisplay === 'data') {
-            form.find(".response-data").removeClass("hide")
-        } else {
-            form.find(".response-raw").removeClass("hide")
-        }
+      if (responseDisplay === 'data') {
+        $responseData.removeClass('hide')
+      } else {
+        $responseRaw.removeClass('hide')
+      }
     }).catch(function (error) {
-        var response = JSON.stringify(error.content, null, 2);
-        form.find(".request-awaiting").addClass("hide")
-        form.find(".response-raw").addClass("hide")
-        form.find(".response-data").addClass("hide")
-        form.find(".response-data").text('')
-        form.find(".response-data").jsonView(response)
+      var response = JSON.stringify(error.content, null, 2)
+      $requestAwaiting.addClass('hide')
+      $responseRaw.addClass('hide')
+      $responseData.addClass('hide').text('').jsonView(response)
 
-        if (responseDisplay === 'data') {
-            form.find(".response-data").removeClass("hide")
-        } else {
-            form.find(".response-raw").removeClass("hide")
-        }
+      if (responseDisplay === 'data') {
+        $responseData.removeClass('hide')
+      } else {
+        $responseRaw.removeClass('hide')
+      }
     })
-});
+  })
+
+  // 'Data'/'Raw' control
+  $('.toggle-view button').click(function () {
+    var $modalContent = $(this).closest('.modal-content')
+    var $modalResponseRaw = $modalContent.find('.response-raw')
+    var $modalResponseData = $modalContent.find('.response-data')
+
+    responseDisplay = $(this).data('display-toggle')
+
+    $(this).removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info')
 
-// 'Data'/'Raw' control
-$('.toggle-view button').click(function() {
-    responseDisplay = $(this).data("display-toggle");
-    $(this).removeClass("btn-default").addClass('btn-info').siblings().removeClass('btn-info');
     if (responseDisplay === 'raw') {
-        $(this).closest(".modal-content").find(".response-raw").removeClass("hide");
-        $(this).closest(".modal-content").find(".response-data").addClass("hide");
+      $modalResponseRaw.removeClass('hide')
+      $modalResponseData.addClass('hide')
     } else {
-        $(this).closest(".modal-content").find(".response-data").removeClass("hide");
-        $(this).closest(".modal-content").find(".response-raw").addClass("hide");
+      $modalResponseData.removeClass('hide')
+      $modalResponseRaw.addClass('hide')
     }
-});
+  })
 
-// Authentication: none
-$('#auth-control').find("[data-auth='none']").click(function (event) {
-    event.preventDefault();
-    window.auth = null;
-    $('#selected-authentication').text('none');
-    $('#auth-control').children().removeClass('active');
-    $('#auth-control').find("[data-auth='none']").addClass('active');
+  // Authentication: none
+  $authControl.find("[data-auth='none']").click(function (event) {
+    event.preventDefault()
+    window.auth = null
+    $selectedAuthentication.text('none')
+    $authControl.children().removeClass('active')
+    $authControl.find("[data-auth='none']").addClass('active')
+  })
+
+  // Authentication: token
+  $('form.authentication-token-form').submit(function (event) {
+    event.preventDefault()
+    var $form = $(this).closest('form')
+    var scheme = $form.find('input#scheme').val()
+    var token = $form.find('input#token').val()
+    window.auth = {
+      'type': 'token',
+      'scheme': scheme,
+      'token': token
+    }
+    $selectedAuthentication.text('token')
+    $authControl.children().removeClass('active')
+    $authControl.find("[data-auth='token']").addClass('active')
+    $authTokenModal.modal('hide')
+  })
+
+  // Authentication: basic
+  $('form.authentication-basic-form').submit(function (event) {
+    event.preventDefault()
+    var $form = $(this).closest('form')
+    var username = $form.find('input#username').val()
+    var password = $form.find('input#password').val()
+    window.auth = {
+      'type': 'basic',
+      'username': username,
+      'password': password
+    }
+    $selectedAuthentication.text('basic')
+    $authControl.children().removeClass('active')
+    $authControl.find("[data-auth='basic']").addClass('active')
+    $authTokenModal.modal('hide')
+  })
+
+  // Authentication: session
+  $('form.authentication-session-form').submit(function (event) {
+    event.preventDefault()
+    window.auth = {
+      'type': 'session'
+    }
+    $selectedAuthentication.text('session')
+    $authControl.children().removeClass('active')
+    $authControl.find("[data-auth='session']").addClass('active')
+    $authTokenModal.modal('hide')
+  })
 })
-
-// Authentication: token
-$('form.authentication-token-form').submit(function(event) {
-    event.preventDefault();
-    const form = $(this).closest("form");
-    const scheme = form.find('input#scheme').val();
-    const token = form.find('input#token').val();
-    window.auth = {
-        'type': 'token',
-        'scheme': scheme,
-        'token': token
-    };
-    $('#selected-authentication').text('token');
-    $('#auth-control').children().removeClass('active');
-    $('#auth-control').find("[data-auth='token']").addClass('active');
-    $('#auth_token_modal').modal('hide');
-});
-
-// Authentication: basic
-$('form.authentication-basic-form').submit(function(event) {
-    event.preventDefault();
-    const form = $(this).closest("form");
-    const username = form.find('input#username').val();
-    const password = form.find('input#password').val();
-    window.auth = {
-        'type': 'basic',
-        'username': username,
-        'password': password
-    };
-    $('#selected-authentication').text('basic');
-    $('#auth-control').children().removeClass('active');
-    $('#auth-control').find("[data-auth='basic']").addClass('active');
-    $('#auth_basic_modal').modal('hide');
-});
-
-// Authentication: session
-$('form.authentication-session-form').submit(function(event) {
-    event.preventDefault();
-    window.auth = {
-        'type': 'session',
-    };
-    $('#selected-authentication').text('session');
-    $('#auth-control').children().removeClass('active');
-    $('#auth-control').find("[data-auth='session']").addClass('active');
-    $('#auth_session_modal').modal('hide');
-});

From 9e18d005d11f442f34065b7c403da6a1a5cf04ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Fri, 17 Mar 2017 22:21:14 -0400
Subject: [PATCH 08/13] Try to improve browser support

---
 .../static/rest_framework/docs/js/api.js      | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/rest_framework/static/rest_framework/docs/js/api.js b/rest_framework/static/rest_framework/docs/js/api.js
index c9ff5c085..0a4fb7e6c 100644
--- a/rest_framework/static/rest_framework/docs/js/api.js
+++ b/rest_framework/static/rest_framework/docs/js/api.js
@@ -28,25 +28,27 @@ function formEntries (form) {
 
   var entries = []
 
-  for (var { name, type, value, files, checked, selectedOptions } of Array.from(form.elements)) {
-    if (!name) {
+  for (var i = 0; i < form.elements.length; i++) {
+    var element = form.elements[i]
+
+    if (!element.name) {
       continue
     }
 
-    if (type === 'file') {
-      for (var file of files) {
-        entries.push([name, file])
+    if (element.type === 'file') {
+      for (var j = 0; j < element.files.length; j++) {
+        entries.push([element.name, element.files[j]])
       }
-    } else if (type === 'select-multiple' || type === 'select-one') {
-      for (var elm of Array.from(selectedOptions)) {
-        entries.push([name, elm.value])
+    } else if (element.type === 'select-multiple' || element.type === 'select-one') {
+      for (var j = 0; j < element.selectedOptions.length; j++) {
+        entries.push([element.name, element.selectedOptions[j].value])
       }
-    } else if (type === 'checkbox') {
-      if (checked) {
-        entries.push([name, value])
+    } else if (element.type === 'checkbox') {
+      if (element.checked) {
+        entries.push([element.name, element.value])
       }
     } else {
-      entries.push([name, value])
+      entries.push([element.name, element.value])
     }
   }
 
@@ -94,7 +96,10 @@ $(function () {
     var params = {}
     var entries = formEntries($form.get()[0])
 
-    for (var [paramKey, paramValue] of entries) {
+    for (var i = 0; i < entries.length; i++) {
+      var entry = entries[i]
+      var paramKey = entry[0]
+      var paramValue = entry[1]
       var $elem = $form.find('[name=' + paramKey + ']')
       var dataType = $elem.data('type') || 'string'
 

From 51c6d23a056317aa6c77ed9dc99d247710d6586b Mon Sep 17 00:00:00 2001
From: Nick Timkovich <prometheus235@gmail.com>
Date: Sun, 19 Mar 2017 17:17:37 -0500
Subject: [PATCH 09/13] Mention where the mixins live

Ctrl-F on the ViewSets page doesn't show where the `mixins.SomeMixin...` classes come from.
---
 docs/api-guide/viewsets.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index e6df17f51..a1666c011 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -235,6 +235,8 @@ You may need to provide custom `ViewSet` classes that do not have the full set o
 
 To create a base viewset class that provides `create`, `list` and `retrieve` operations, inherit from `GenericViewSet`, and mixin the required actions:
 
+    from rest_framework import mixins
+
     class CreateListRetrieveViewSet(mixins.CreateModelMixin,
                                     mixins.ListModelMixin,
                                     mixins.RetrieveModelMixin,

From c7e2d1d9760e543810130b058f2866486e7d9f98 Mon Sep 17 00:00:00 2001
From: Dariusz Czech <darek@usebench.com>
Date: Mon, 20 Mar 2017 22:21:07 +0100
Subject: [PATCH 10/13] Do not hint BigAutoField as integer (outside of range)

---
 rest_framework/schemas.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py
index ecfe835a9..802942d04 100644
--- a/rest_framework/schemas.py
+++ b/rest_framework/schemas.py
@@ -1,6 +1,6 @@
-import re
 from collections import OrderedDict
 from importlib import import_module
+import re
 
 from django.conf import settings
 from django.contrib.admindocs.views import simplify_regex
@@ -23,6 +23,7 @@ from rest_framework.utils import formatting
 from rest_framework.utils.model_meta import _get_pk
 from rest_framework.views import APIView
 
+
 header_regex = re.compile('^[a-zA-Z][0-9A-Za-z_]*:')
 
 
@@ -541,7 +542,8 @@ class SchemaGenerator(object):
                 elif model_field is not None and model_field.primary_key:
                     description = get_pk_description(model, model_field)
 
-                if isinstance(model_field, models.AutoField):
+                # BigAutoField is outside of Integer range
+                if isinstance(model_field, models.AutoField) and not isinstance(model_field, models.BigAutoField):
                     schema_cls = coreschema.Integer
 
             field = coreapi.Field(

From 9074e3e478e00974d17013d7eabb41f7ee38c197 Mon Sep 17 00:00:00 2001
From: Dariusz Czech <darek@usebench.com>
Date: Tue, 21 Mar 2017 08:40:59 +0100
Subject: [PATCH 11/13] restored original formatting

---
 rest_framework/schemas.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py
index 802942d04..f89f347ac 100644
--- a/rest_framework/schemas.py
+++ b/rest_framework/schemas.py
@@ -1,6 +1,6 @@
+import re
 from collections import OrderedDict
 from importlib import import_module
-import re
 
 from django.conf import settings
 from django.contrib.admindocs.views import simplify_regex
@@ -23,7 +23,6 @@ from rest_framework.utils import formatting
 from rest_framework.utils.model_meta import _get_pk
 from rest_framework.views import APIView
 
-
 header_regex = re.compile('^[a-zA-Z][0-9A-Za-z_]*:')
 
 

From 54d0901f381b9fdd95dfeb5b9b26f6839eaba433 Mon Sep 17 00:00:00 2001
From: Dariusz Czech <darek@usebench.com>
Date: Tue, 21 Mar 2017 15:15:20 +0100
Subject: [PATCH 12/13] Leave parameters with regex pattern as String

---
 rest_framework/schemas.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py
index f89f347ac..c15ed0bfd 100644
--- a/rest_framework/schemas.py
+++ b/rest_framework/schemas.py
@@ -526,6 +526,7 @@ class SchemaGenerator(object):
             title = ''
             description = ''
             schema_cls = coreschema.String
+            kwargs = {}
             if model is not None:
                 # Attempt to infer a field description if possible.
                 try:
@@ -541,15 +542,16 @@ class SchemaGenerator(object):
                 elif model_field is not None and model_field.primary_key:
                     description = get_pk_description(model, model_field)
 
-                # BigAutoField is outside of Integer range
-                if isinstance(model_field, models.AutoField) and not isinstance(model_field, models.BigAutoField):
+                if hasattr(view, 'lookup_value_regex') and view.lookup_field == variable:
+                    kwargs['pattern'] = view.lookup_value_regex
+                elif isinstance(model_field, models.AutoField):
                     schema_cls = coreschema.Integer
 
             field = coreapi.Field(
                 name=variable,
                 location='path',
                 required=True,
-                schema=schema_cls(title=title, description=description)
+                schema=schema_cls(title=title, description=description, **kwargs)
             )
             fields.append(field)
 

From db4dd0c9777bd51f8da41a9dd31d275222fe8604 Mon Sep 17 00:00:00 2001
From: Asif Saifuddin Auvi <auvipy@users.noreply.github.com>
Date: Wed, 22 Mar 2017 14:40:23 +0600
Subject: [PATCH 13/13] use django 1.11rc1 in tox

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index b1be1a83c..ba9b5825b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ deps =
         django18: Django>=1.8,<1.9
         django19: Django>=1.9,<1.10
         django110: Django>=1.10,<1.11
-        django111: Django>=1.11b1,<2.0
+        django111: Django>=1.11rc1,<2.0
         djangomaster: https://github.com/django/django/archive/master.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt