encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-09-17 01:32:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'encode:master' into patch-1

Browse Source
This commit is contained in:
ddelange 2023-04-03 11:23:06 +02:00 committed by GitHub
commit d579b50089
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
requirements/requirements-packaging.txt
View File

@ -1,8 +1,8 @@
# Wheel for PyPI installs.
wheel>=0.35.1,<0.36
wheel>=0.36.2,<0.40.0
# Twine for secured PyPI uploads.
twine>=3.2.0,<3.3
twine>=3.4.2,<4.0.2
# Transifex client for managing translation resources.
transifex-client

2
rest_framework/static/rest_framework/js/jquery-3.6.4.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
rest_framework/templates/rest_framework/admin.html
View File

@ -250,7 +250,7 @@
"csrfToken": "{{ csrf_token }}"
}
</script>
<script src="{% static "rest_framework/js/jquery-3.5.1.min.js" %}"></script>
<script src="{% static "rest_framework/js/jquery-3.6.4.min.js" %}"></script>
<script src="{% static "rest_framework/js/ajax-form.js" %}"></script>
<script src="{% static "rest_framework/js/csrf.js" %}"></script>
<script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>

2
rest_framework/templates/rest_framework/base.html
View File

@ -293,7 +293,7 @@
"csrfToken": "{% if request %}{{ csrf_token }}{% endif %}"
}
</script>
<script src="{% static "rest_framework/js/jquery-3.5.1.min.js" %}"></script>
<script src="{% static "rest_framework/js/jquery-3.6.4.min.js" %}"></script>
<script src="{% static "rest_framework/js/ajax-form.js" %}"></script>
<script src="{% static "rest_framework/js/csrf.js" %}"></script>
<script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>

2
rest_framework/templates/rest_framework/docs/error.html
View File

@ -66,6 +66,6 @@ at <code>rest_framework/docs/error.html</code>.</p>
<script src="{% static 'rest_framework/js/jquery-3.5.1.min.js' %}"></script>
<script src="{% static 'rest_framework/js/jquery-3.6.4.min.js' %}"></script>
</body>
</html>

2
rest_framework/templates/rest_framework/docs/index.html
View File

@ -38,7 +38,7 @@
{% include "rest_framework/docs/auth/basic.html" %}
{% include "rest_framework/docs/auth/session.html" %}
<script src="{% static 'rest_framework/js/jquery-3.5.1.min.js' %}"></script>
<script src="{% static 'rest_framework/js/jquery-3.6.4.min.js' %}"></script>
<script src="{% static 'rest_framework/js/bootstrap.min.js' %}"></script>
<script src="{% static 'rest_framework/docs/js/jquery.json-view.min.js' %}"></script>
<script src="{% static 'rest_framework/docs/js/api.js' %}"></script>

2
tox.ini
View File

@ -21,7 +21,7 @@ deps =
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
django41: Django>=4.1,<4.2
django42: Django>=4.2b1,<5.0
django42: Django>=4.2rc1,<5.0
djangomain: https://github.com/django/django/archive/main.tar.gz
-rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt