Merge master.

Fix FAT statistics generation.
This commit is contained in:
Adarnof
2017-04-07 00:21:14 -04:00
23 changed files with 232 additions and 242 deletions

View File

@@ -7,9 +7,6 @@
{% block title %}{% trans "Alliance Auth - Structure Timer Create" %}{% endblock %}
{% block page_title %}{% trans "Timer Create" %}{% endblock page_title %}
{% block extra_css %}
{% include 'bundles/jquery-datetimepicker-css.html' %}
{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
@@ -30,17 +27,3 @@
</div>
{% endblock content %}
{% block extra_javascript %}
{% include 'bundles/jquery-datetimepicker-js.html' %}
{% endblock %}
{% block extra_script %}
$('#id_eve_time').datetimepicker({
lang: '{{ LANGUAGE_CODE }}',
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}