Skip to content

Use single copy of static assets. Update jQuery #5823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 12, 2018
Merged

Use single copy of static assets. Update jQuery #5823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28302ae
Move font-awesome to top level.
carltongibson Feb 9, 2018
cb97d1b
Use top-level jQuery & Bootstrap
carltongibson Feb 9, 2018
6662e25
Update to jQuery v3.3.1
carltongibson Feb 9, 2018
e8178fa
Re-add bootstrap-theme
carltongibson Feb 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ramework/docs/css/bootstrap-theme.min.css → ...est_framework/css/bootstrap-theme.min.css
View file
Open in desktop
File renamed without changes.
0 ...framework/docs/css/font-awesome-4.0.3.css → ...rest_framework/css/font-awesome-4.0.3.css
View file
Open in desktop
File renamed without changes.
6 changes: 0 additions & 6 deletions rest_framework/static/rest_framework/docs/css/bootstrap.min.css
View file
Open in desktop

This file was deleted.

Binary file removed rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.eot
View file
Open in desktop
Binary file not shown.
288 changes: 0 additions & 288 deletions rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.svg
View file
Open in desktop

This file was deleted.

Binary file removed rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.woff
View file
Open in desktop
Binary file not shown.
Binary file removed rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.woff2
View file
Open in desktop
Binary file not shown.
7 changes: 0 additions & 7 deletions rest_framework/static/rest_framework/docs/js/bootstrap.min.js
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions rest_framework/static/rest_framework/docs/js/jquery-1.10.2.min.js
View file
Open in desktop

This file was deleted.

0 ...mework/docs/fonts/fontawesome-webfont.eot → ...t_framework/fonts/fontawesome-webfont.eot
View file
Open in desktop
File renamed without changes.
0 ...mework/docs/fonts/fontawesome-webfont.svg → ...t_framework/fonts/fontawesome-webfont.svg
View file
Open in desktop
File renamed without changes
0 ...mework/docs/fonts/fontawesome-webfont.ttf → ...t_framework/fonts/fontawesome-webfont.ttf
View file
Open in desktop
File renamed without changes.
0 ...ework/docs/fonts/fontawesome-webfont.woff → ..._framework/fonts/fontawesome-webfont.woff
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions rest_framework/static/rest_framework/js/jquery-1.12.4.min.js
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions rest_framework/static/rest_framework/js/jquery-3.3.1.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ <h4 class="modal-title" id="myModalLabel">{{ error_title }}</h4>
csrfCookieName: "{{ csrf_cookie_name|default:'csrftoken' }}"
};
</script>
<script src="{% static "rest_framework/js/jquery-1.12.4.min.js" %}"></script>
<script src="{% static "rest_framework/js/jquery-3.3.1.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>
Expand Down
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ <h1>{{ name }}</h1>
csrfCookieName: "{{ csrf_cookie_name|default:'csrftoken' }}"
};
</script>
<script src="{% static "rest_framework/js/jquery-1.12.4.min.js" %}"></script>
<script src="{% static "rest_framework/js/jquery-3.3.1.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>
Expand Down
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/docs/error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ <h2>Overriding this template</h2>



<script src="{% static 'rest_framework/docs/js/jquery-1.10.2.min.js' %}"></script>
<script src="{% static 'rest_framework/js/jquery-3.3.1.min.js' %}"></script>
</body>
</html>
10 changes: 5 additions & 5 deletions rest_framework/templates/rest_framework/docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

<title>{{ document.title }}</title>

<link href="{% static 'rest_framework/docs/css/bootstrap.min.css' %}" rel="stylesheet">
<link href="{% static 'rest_framework/docs/css/bootstrap-theme.min.css' %}" rel="stylesheet">
<link href="{% static 'rest_framework/docs/css/font-awesome-4.0.3.css' %}" rel="stylesheet">
<link href="{% static 'rest_framework/css/bootstrap.min.css' %}" rel="stylesheet">
<link href="{% static 'rest_framework/css/bootstrap-theme.min.css' %}" rel="stylesheet">
<link href="{% static 'rest_framework/css/font-awesome-4.0.3.css' %}" rel="stylesheet">
<link href="{% static 'rest_framework/docs/css/base.css' %}" rel="stylesheet">
<link href="{% static 'rest_framework/docs/css/jquery.json-view.min.css' %}" rel="stylesheet">

Expand Down Expand Up @@ -38,8 +38,8 @@
{% include "rest_framework/docs/auth/basic.html" %}
{% include "rest_framework/docs/auth/session.html" %}

<script src="{% static 'rest_framework/docs/js/jquery-1.10.2.min.js' %}"></script>
<script src="{% static 'rest_framework/docs/js/bootstrap.min.js' %}"></script>
<script src="{% static 'rest_framework/js/jquery-3.3.1.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>
<script>
Expand Down