DGNum/gestioCOF
16
2
Fork 2
Code Issues 78 Pull requests 15 Projects Releases 12 Packages Wiki Activity

Merge branch 'thubrecht/date-js' into 'master'

Browse source 
Thubrecht/date js

See merge request klub-dev-ens/gestioCOF!518
This commit is contained in:
Tom Hubrecht 2023-05-19 17:34:27 +02:00
commit 83078d4726
8 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -5,6 +5,7 @@ cof/settings.py
settings.py
*~
venv/
.venv/
.vagrant
/src
media/

1
kfet/static/kfet/vendor/moment/moment-timezone-with-data-2012-2022.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
kfet/static/kfet/vendor/moment/moment-timezone-with-data.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

2
kfet/templates/kfet/account_read.html
View file

@ -8,7 +8,7 @@
<script type="text/javascript" src="{% url 'js_reverse' %}" ></script>
<script type="text/javascript" src="{% static 'kfet/vendor/moment/moment.min.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/vendor/moment/fr.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/vendor/moment/moment-timezone-with-data-2012-2022.min.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/vendor/moment/moment-timezone-with-data.min.js' %}"></script>
{% if account.user == request.user %}
<script type="text/javascript" src="{% static 'kfet/vendor/Chart.min.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/js/statistic.js' %}"></script>

2
kfet/templates/kfet/history.html
View file

@ -7,7 +7,7 @@
{{ filter_form.media }}
<script type="text/javascript" src="{% url 'js_reverse' %}" ></script>
<script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/vendor/moment/moment-timezone-with-data-2012-2022.min.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/vendor/moment/moment-timezone-with-data.min.js' %}"></script>
{% endblock %}
{% block title %}Historique{% endblock %}

2
kfet/templates/kfet/kpsul.html
View file

@ -4,7 +4,7 @@
{% block extra_head %}
<link rel="stylesheet" style="text/css" href="{% static 'kfet/css/kpsul_grid.css' %}">
<script type="text/javascript" src="{% static 'vendor/jquery/jquery.autocomplete-light.min.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/vendor/moment/moment-timezone-with-data-2012-2022.min.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/vendor/moment/moment-timezone-with-data.min.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>
<script type="text/javascript" src="{% url 'js_reverse' %}" ></script>
<script type="text/javascript" src="{% static 'kfet/vendor/underscore-min.js' %}"></script>

2
kfet/templates/kfet/transfers.html
View file

@ -8,7 +8,7 @@
{% block extra_head %}
<script type="text/javascript" src="{% url 'js_reverse' %}" ></script>
<script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/vendor/moment/moment-timezone-with-data-2012-2022.min.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/vendor/moment/moment-timezone-with-data.min.js' %}"></script>
{% endblock %}
{% block fixed %}

2
shell.nix
View file

@ -6,6 +6,8 @@ pkgs.mkShell {
virtualenv .venv
source .venv/bin/activate
pip install -r requirements-devel.txt | grep -v 'Requirement already satisfied:'
'';
packages = with pkgs; [