encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-06-27 08:53:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2755 from rouge8/tab-switching-backport

Browse Source 
Backport 7872d0acbf to 2.4.x
This commit is contained in:
Xavier Ordoquy 2015-04-08 23:17:12 +02:00
commit 58f9603f70
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/topics/release-notes.md
View File

@ -40,6 +40,12 @@ You can determine your currently installed version using `pip freeze`:
## 2.4.x series ## 2.4.x series
### 2.4.5
**Date**: 24 March 2015
* **Security fix**: Escape tab switching cookie name in browsable API. [Backported from 3.1.1](http://www.django-rest-framework.org/topics/release-notes/#311).
### 2.4.4 ### 2.4.4
**Date**: [3rd November 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.4+Release%22+). **Date**: [3rd November 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.4+Release%22+).

3
requirements-test.txt
View File

@ -2,7 +2,8 @@
pytest-django==2.6 pytest-django==2.6
pytest==2.5.2 pytest==2.5.2
pytest-cov==1.6 pytest-cov==1.6
flake8==2.2.2 pep8==1.5.7
flake8==2.4.0
# Optional packages # Optional packages
markdown>=2.1.0 markdown>=2.1.0

2
rest_framework/__init__.py
View File

@ -8,7 +8,7 @@ ______ _____ _____ _____ __
""" """
__title__ = 'Django REST framework' __title__ = 'Django REST framework'
__version__ = '2.4.4' __version__ = '2.4.5'
__author__ = 'Tom Christie' __author__ = 'Tom Christie'
__license__ = 'BSD 2-Clause' __license__ = 'BSD 2-Clause'
__copyright__ = 'Copyright 2011-2014 Tom Christie' __copyright__ = 'Copyright 2011-2014 Tom Christie'

4
rest_framework/static/rest_framework/js/default.js
View File

@ -43,6 +43,10 @@ $('a[data-toggle="tab"]').click(function(){
var selectedTab = null; var selectedTab = null;
var selectedTabName = getCookie('tabstyle'); var selectedTabName = getCookie('tabstyle');
if (selectedTabName) {
selectedTabName = selectedTabName.replace(/[^a-z-]/g, '');
}
if (selectedTabName) { if (selectedTabName) {
selectedTab = $('.form-switcher a[name=' + selectedTabName + ']'); selectedTab = $('.form-switcher a[name=' + selectedTabName + ']');
} }

3
tox.ini
View File

@ -15,7 +15,8 @@ setenv =
[testenv:flake8] [testenv:flake8]
basepython = python2.7 basepython = python2.7
deps = pytest==2.5.2 deps = pytest==2.5.2
flake8==2.2.2 pep8==1.5.7
flake8==2.4.0
commands = ./runtests.py --lintonly commands = ./runtests.py --lintonly
[testenv:py3.4-django1.7] [testenv:py3.4-django1.7]