ki9
/
tracman-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged develop into master

master
Keith Irwin 2017-05-06 22:55:47 -04:00
parent adfdbfa5cc 0bcb5bfc12
commit e00bb54e7d
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -3,7 +3,7 @@
#### v0.6.3 #### v0.6.3
* * [#84](https://github.com/Tracman-org/Server/issues/84) Fixed password reset page
#### v0.6.2 #### v0.6.2

2
README.md
View File

@ -55,7 +55,7 @@ Tracman will be updated according to [this branching model](http://nvie.com/post
#### v0.6.3 #### v0.6.3
* * [#84](https://github.com/Tracman-org/Server/issues/84) Fixed password reset page
#### v0.6.2 #### v0.6.2

4
views/admin.html
View File

@ -49,8 +49,8 @@
</div> </div>
</section> </section>
<script type="text/javascript" src="/static/js/.moment.min.js"></script> <script type="application/javascript" src="/static/js/.moment.min.js"></script>
<script type="text/javascript"> <script type="application/javascript">
/* DATE/TIME FORMATS */ { /* DATE/TIME FORMATS */ {

2
views/login.html
View File

@ -72,7 +72,7 @@
{% endblock %} {% endblock %}
{% block javascript %} {% block javascript %}
<script type="text/javascript"> <script type="application/javascript">
/* global $ */ /* global $ */
// On page load // On page load

8
views/map.html
View File

@ -77,10 +77,10 @@
{% block javascript %} {% block javascript %}
{{super()}} {{super()}}
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js" integrity="sha256-WKvqiY0jZHWQZIohYEmr9KUC5rEaYEOFTq+ByllJK8w=" crossorigin="anonymous"></script> <script type="application/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js" integrity="sha256-WKvqiY0jZHWQZIohYEmr9KUC5rEaYEOFTq+ByllJK8w=" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key={{mapApi}}&callback=gmapsCb" async defer></script> <script type="application/javascript" src="https://maps.googleapis.com/maps/api/js?key={{mapApi}}&callback=gmapsCb" async defer></script>
<script type="text/javascript" src="/static/js/.map.min.js"></script> <script type="application/javascript" src="/static/js/.map.min.js"></script>
{% if user.id == mapuser.id %}<script type="text/javascript" src="/static/js/.map-controls.min.js"></script>{% endif %} {% if user.id == mapuser.id %}<script type="application/javascript" src="/static/js/.map-controls.min.js"></script>{% endif %}
<script> /* Variables from server */ <script> /* Variables from server */
const mapuser = JSON.parse('{{mapuser |dump|safe}}'), const mapuser = JSON.parse('{{mapuser |dump|safe}}'),

6
views/password.html
View File

@ -53,7 +53,7 @@
{% block javascript %} {% block javascript %}
{{super()}} {{super()}}
<script type="text/javascript" src="/static/js/.mellt.min.js"></script> <script type="application/javascript" src="/static/js/.mellt.min.js"></script>
<script type="text/javascript" src="/static/js/.common-passwords.min.js"></script> <script type="application/javascript" src="/static/js/.common-passwords.min.js"></script>
<script type="text/javascript" src="/static/js/.password.min.js"></script> <script type="application/javascript" src="/static/js/.password.min.js"></script>
{% endblock %} {% endblock %}

2
views/settings.html
View File

@ -150,5 +150,5 @@
{% block javascript %} {% block javascript %}
{{super()}} {{super()}}
<script type="text/javascript" src="/static/js/.settings.min.js"></script> <script type="application/javascript" src="/static/js/.settings.min.js"></script>
{% endblock %} {% endblock %}

2
views/templates/base.html
View File

@ -45,7 +45,7 @@
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"> <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:300,600"> <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:300,600">
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Merriweather:300,700"> <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Merriweather:300,700">
<script type="text/javascript" src="https://code.jquery.com/jquery-1.11.3.min.js"></script> <script type="application/javascript" src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
{% endblock %} {% endblock %}
{% if not noHeader %}<link href="/static/css/.header.min.css" rel="stylesheet">{% endif %} {% if not noHeader %}<link href="/static/css/.header.min.css" rel="stylesheet">{% endif %}

2
views/templates/footer.html
View File

@ -13,4 +13,4 @@
</div> </div>
</footer> </footer>
<script type="text/javascript" src="/static/js/.footer.min.js"></script> <script type="application/javascript" src="/static/js/.footer.min.js"></script>

2
views/templates/header.html
View File

@ -56,4 +56,4 @@
</div> </div>
{% endfor %} {% endfor %}
<script type="text/javascript" src="/static/js/.header.min.js"></script> <script type="application/javascript" src="/static/js/.header.min.js"></script>