Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into nutrition-diary
Roland Geider393f132d93e9
diff --cc wger/core/templates/template.htmlindex cacbe200c,f305a5d44..9cb8d809a--- a/wger/core/templates/template.html+++ b/wger/core/templates/template.html@@@ -61,13 -61,14 +61,15 @@@{% compress js %}<script src="{% static 'bower_components/jquery/dist/jquery.js' %}"></script>- <script src="{% static 'js/jquery-ui.js' %}"></script>+ <script src="{% static 'bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script>+ <script src="{% static 'js/Sortable.min.js' %}"></script><script src="{% static 'bower_components/d3/d3.js' %}"></script>+ <script src="{% static 'bower_components/metrics-graphics/dist/metricsgraphics.min.js' %}"></script>+ <script src="{% static 'bower_components/devbridge-autocomplete/dist/jquery.autocomplete.min.js' %}"></script><script src="{% static 'js/wger-core.js' %}"></script>- <script src="{% static 'bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script><script src="{% static 'js/exercises.js' %}"></script><script src="{% static 'js/nutrition.js' %}"></script>+ <script src="{% static 'bower_components/metrics-graphics/dist/metricsgraphics.min.js' %}"></script>{% endcompress %}{% block header %}{% endblock %}