Skip to content

Commit 5f386f5

Browse files
tomchristietomchristie
authored
Merge pull request encode#5133 from encode/version-3-6-3
Version 3.6.3
2 parents a251b93 + a99f12f commit 5f386f5

File tree

4 files changed

+115
-13
lines changed

4 files changed

+115
-13
lines changed

‎docs/topics/release-notes.md

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,33 @@ You can determine your currently installed version using `pip freeze`:
4040

4141
## 3.6.x series
4242

43+
### 3.6.3
44+
45+
**Date**: [12th May 2017][3.6.3-milestone]
46+
47+
* Raise 404 if a URL lookup results in ValidationError. ([#5126][gh5126])
48+
* Honor http_method_names on class based view, when generating API schemas. ([#5085][gh5085])
49+
* Allow overridden `get_limit` in LimitOffsetPagination to return all records. ([#4437][gh4437])
50+
* Fix partial update for the ListSerializer. ([#4222][gh4222])
51+
* Render JSONField control correctly in browsable API. ([#4999][gh4999], [#5042][gh5042])
52+
* Raise validation errors for invalid datetime in given timezone. ([#4987][gh4987])
53+
* Support restricting doc & schema shortcuts to a subset of urls. ([#4979][gh4979])
54+
* Resolve SchemaGenerator error with paginators that have no `page_size` attribute. ([#5086][gh5086], [#3692][gh3692])
55+
* Resolve HyperlinkedRelatedField exception on string with %20 instead of space. ([#4748][gh4748], [#5078][gh5078])
56+
* Customizable schema generator classes. ([#5082][gh5082])
57+
* Update existing vary headers in response instead of overwriting them. ([#5047][gh5047])
58+
* Support passing `.as_view()` to view instance. ([#5053][gh5053])
59+
* Use correct exception handler when settings overridden on a view. ([#5055][gh5055], [#5054][gh5054])
60+
* Update Boolean field to support 'yes' and 'no' values. ([#5038][gh5038])
61+
* Fix unique validator for ChoiceField. ([#5004][gh5004], [#5026][gh5026], [#5028][gh5028])
62+
* JavaScript cleanups in API Docs. ([#5001][gh5001])
63+
* Include URL path regexs in API schemas where valid. ([#5014][gh5014])
64+
* Correctly set scheme in coreapi TokenAuthentication. ([#5000][gh5000], [#4994][gh4994])
65+
* HEAD requests on ViewSets should not return 405. ([#4705][gh4705], [#4973][gh4973], [#4864][gh4864])
66+
* Support usage of 'source' in `extra_kwargs`. ([#4688][gh4688])
67+
* Fix invalid content type for schema.js ([#4968][gh4968])
68+
* Fix DjangoFilterBackend inheritance issues. ([#5089][gh5089], [#5117][gh5117])
69+
4370
### 3.6.2
4471

4572
**Date**: [10th March 2017][3.6.2-milestone]
@@ -653,6 +680,44 @@ For older release notes, [please see the version 2.x documentation][old-release-
653680
[old-release-notes]: https://github.com/encode/django-rest-framework/blob/version-2.4.x/docs/topics/release-notes.md
654681
[3.6-release]: 3.6-announcement.md
655682

683+
<<<<<<< HEAD
684+
[3.0.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22
685+
[3.0.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.2+Release%22
686+
[3.0.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.3+Release%22
687+
[3.0.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.4+Release%22
688+
[3.0.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.5+Release%22
689+
[3.1.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.0+Release%22
690+
[3.1.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.1+Release%22
691+
[3.1.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.2+Release%22
692+
[3.1.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.3+Release%22
693+
[3.2.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.0+Release%22
694+
[3.2.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.1+Release%22
695+
[3.2.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.2+Release%22
696+
[3.2.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.3+Release%22
697+
[3.2.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.4+Release%22
698+
[3.2.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.5+Release%22
699+
[3.3.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.0+Release%22
700+
[3.3.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.1+Release%22
701+
[3.3.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.2+Release%22
702+
[3.3.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.3+Release%22
703+
[3.4.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.0+Release%22
704+
[3.4.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.1+Release%22
705+
[3.4.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.2+Release%22
706+
[3.4.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.3+Release%22
707+
[3.4.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.4+Release%22
708+
[3.4.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.5+Release%22
709+
[3.4.6-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.6+Release%22
710+
[3.4.7-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.7+Release%22
711+
[3.5.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.0+Release%22
712+
[3.5.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.1+Release%22
713+
[3.5.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.2+Release%22
714+
[3.5.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.3+Release%22
715+
[3.5.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.4+Release%22
716+
[3.6.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.6.0+Release%22
717+
[3.6.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.6.1+Release%22
718+
[3.6.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.6.2+Release%22
719+
[3.6.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.6.3+Release%22
720+
=======
656721
[3.0.1-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22
657722
[3.0.2-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.0.2+Release%22
658723
[3.0.3-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.0.3+Release%22
@@ -688,6 +753,7 @@ For older release notes, [please see the version 2.x documentation][old-release-
688753
[3.6.0-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.6.0+Release%22
689754
[3.6.1-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.6.1+Release%22
690755
[3.6.2-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.6.2+Release%22
756+
>>>>>>> master
691757
692758
<!-- 3.0.1 -->
693759
[gh2013]: https://github.com/encode/django-rest-framework/issues/2013
@@ -1298,3 +1364,37 @@ For older release notes, [please see the version 2.x documentation][old-release-
12981364
[gh4955]: https://github.com/encode/django-rest-framework/issues/4955
12991365
[gh4956]: https://github.com/encode/django-rest-framework/issues/4956
13001366
[gh4949]: https://github.com/encode/django-rest-framework/issues/4949
1367+
<!-- 3.6.3 -->
1368+
1369+
[gh5126]: https://github.com/encode/django-rest-framework/issues/5126
1370+
[gh5085]: https://github.com/encode/django-rest-framework/issues/5085
1371+
[gh4437]: https://github.com/encode/django-rest-framework/issues/4437
1372+
[gh4222]: https://github.com/encode/django-rest-framework/issues/4222
1373+
[gh4999]: https://github.com/encode/django-rest-framework/issues/4999
1374+
[gh5042]: https://github.com/encode/django-rest-framework/issues/5042
1375+
[gh4987]: https://github.com/encode/django-rest-framework/issues/4987
1376+
[gh4979]: https://github.com/encode/django-rest-framework/issues/4979
1377+
[gh5086]: https://github.com/encode/django-rest-framework/issues/5086
1378+
[gh3692]: https://github.com/encode/django-rest-framework/issues/3692
1379+
[gh4748]: https://github.com/encode/django-rest-framework/issues/4748
1380+
[gh5078]: https://github.com/encode/django-rest-framework/issues/5078
1381+
[gh5082]: https://github.com/encode/django-rest-framework/issues/5082
1382+
[gh5047]: https://github.com/encode/django-rest-framework/issues/5047
1383+
[gh5053]: https://github.com/encode/django-rest-framework/issues/5053
1384+
[gh5055]: https://github.com/encode/django-rest-framework/issues/5055
1385+
[gh5054]: https://github.com/encode/django-rest-framework/issues/5054
1386+
[gh5038]: https://github.com/encode/django-rest-framework/issues/5038
1387+
[gh5004]: https://github.com/encode/django-rest-framework/issues/5004
1388+
[gh5026]: https://github.com/encode/django-rest-framework/issues/5026
1389+
[gh5028]: https://github.com/encode/django-rest-framework/issues/5028
1390+
[gh5001]: https://github.com/encode/django-rest-framework/issues/5001
1391+
[gh5014]: https://github.com/encode/django-rest-framework/issues/5014
1392+
[gh5000]: https://github.com/encode/django-rest-framework/issues/5000
1393+
[gh4994]: https://github.com/encode/django-rest-framework/issues/4994
1394+
[gh4705]: https://github.com/encode/django-rest-framework/issues/4705
1395+
[gh4973]: https://github.com/encode/django-rest-framework/issues/4973
1396+
[gh4864]: https://github.com/encode/django-rest-framework/issues/4864
1397+
[gh4688]: https://github.com/encode/django-rest-framework/issues/4688
1398+
[gh4968]: https://github.com/encode/django-rest-framework/issues/4968
1399+
[gh5089]: https://github.com/encode/django-rest-framework/issues/5089
1400+
[gh5117]: https://github.com/encode/django-rest-framework/issues/5117

‎rest_framework/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"""
99

1010
__title__ = 'Django REST framework'
11-
__version__ = '3.6.2'
11+
__version__ = '3.6.3'
1212
__author__ = 'Tom Christie'
1313
__license__ = 'BSD 2-Clause'
1414
__copyright__ = 'Copyright 2011-2017 Tom Christie'

‎rest_framework/static/rest_framework/docs/js/api.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function formEntries (form) {
2323
// Polyfill for new FormData(form).entries()
2424
var formData = new FormData(form)
2525
if (formData.entries !== undefined) {
26-
return formData.entries()
26+
return Array.from(formData.entries())
2727
}
2828

2929
var entries = []
@@ -59,6 +59,8 @@ $(function () {
5959
var $selectedAuthentication = $('#selected-authentication')
6060
var $authControl = $('#auth-control')
6161
var $authTokenModal = $('#auth_token_modal')
62+
var $authBasicModal = $('#auth_basic_modal')
63+
var $authSessionModal = $('#auth_session_modal')
6264

6365
// Language Control
6466
$('#language-control li').click(function (event) {
@@ -260,8 +262,8 @@ $(function () {
260262
event.preventDefault()
261263
window.auth = null
262264
$selectedAuthentication.text('none')
263-
$authControl.children().removeClass('active')
264-
$authControl.find("[data-auth='none']").addClass('active')
265+
$authControl.find("[data-auth]").closest('li').removeClass('active')
266+
$authControl.find("[data-auth='none']").closest('li').addClass('active')
265267
})
266268

267269
// Authentication: token
@@ -276,8 +278,8 @@ $(function () {
276278
'token': token
277279
}
278280
$selectedAuthentication.text('token')
279-
$authControl.children().removeClass('active')
280-
$authControl.find("[data-auth='token']").addClass('active')
281+
$authControl.find("[data-auth]").closest('li').removeClass('active')
282+
$authControl.find("[data-auth='token']").closest('li').addClass('active')
281283
$authTokenModal.modal('hide')
282284
})
283285

@@ -293,9 +295,9 @@ $(function () {
293295
'password': password
294296
}
295297
$selectedAuthentication.text('basic')
296-
$authControl.children().removeClass('active')
297-
$authControl.find("[data-auth='basic']").addClass('active')
298-
$authTokenModal.modal('hide')
298+
$authControl.find("[data-auth]").closest('li').removeClass('active')
299+
$authControl.find("[data-auth='basic']").closest('li').addClass('active')
300+
$authBasicModal.modal('hide')
299301
})
300302

301303
// Authentication: session
@@ -305,8 +307,8 @@ $(function () {
305307
'type': 'session'
306308
}
307309
$selectedAuthentication.text('session')
308-
$authControl.children().removeClass('active')
309-
$authControl.find("[data-auth='session']").addClass('active')
310-
$authTokenModal.modal('hide')
310+
$authControl.find("[data-auth]").closest('li').removeClass('active')
311+
$authControl.find("[data-auth='session']").closest('li').addClass('active')
312+
$authSessionModal.modal('hide')
311313
})
312314
})

‎rest_framework/templates/rest_framework/docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
};
5050
$('#selected-authentication').text('session');
5151
$('#auth-control').children().removeClass('active');
52-
$('#auth-control').find("[data-auth='session']").addClass('active');
52+
$('#auth-control').find("[data-auth='session']").closest('li').addClass('active');
5353
{% endif %}
5454
</script>
5555
</body>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy