From 888ce790eb9c4c3ad859314c51e530e85cdde4bf Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Fri, 5 May 2017 23:00:18 -0400
Subject: [PATCH 1/2] Added changes from last hotfix

---
 CHANGELOG.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6b041d..600330f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 #### v0.6.3
 
-* 
+* [#84](https://github.com/Tracman-org/Server/issues/84) Fixed password reset page
 
 #### v0.6.2
 
diff --git a/README.md b/README.md
index 1eb18f1..63c07d3 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ Tracman will be updated according to [this branching model](http://nvie.com/post
 
 #### v0.6.3
 
-* 
+* [#84](https://github.com/Tracman-org/Server/issues/84) Fixed password reset page
 
 #### v0.6.2
 

From 0bcb5bfc12487093c2927575847aac791617ff21 Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Sat, 6 May 2017 14:51:02 -0400
Subject: [PATCH 2/2] Replaced instances of obsolete 'text/javacript' with
 'application/javascript'

---
 views/admin.html            | 4 ++--
 views/login.html            | 2 +-
 views/map.html              | 8 ++++----
 views/password.html         | 6 +++---
 views/settings.html         | 2 +-
 views/templates/base.html   | 2 +-
 views/templates/footer.html | 2 +-
 views/templates/header.html | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/views/admin.html b/views/admin.html
index d9df9a4..b9da0e4 100644
--- a/views/admin.html
+++ b/views/admin.html
@@ -49,8 +49,8 @@
 		</div>
 	</section>
 
-	<script type="text/javascript" src="/static/js/.moment.min.js"></script>
-	<script type="text/javascript">
+	<script type="application/javascript" src="/static/js/.moment.min.js"></script>
+	<script type="application/javascript">
 	
 		/* DATE/TIME FORMATS */ {
 			
diff --git a/views/login.html b/views/login.html
index 46f2ce8..d63814e 100644
--- a/views/login.html
+++ b/views/login.html
@@ -72,7 +72,7 @@
 {% endblock %}
 
 {% block javascript %}
-<script type="text/javascript">
+<script type="application/javascript">
 /* global $ */
 
 	// On page load
diff --git a/views/map.html b/views/map.html
index 890af57..1fabb19 100644
--- a/views/map.html
+++ b/views/map.html
@@ -77,10 +77,10 @@
 {% block javascript %}
 {{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="text/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>
-	{% if user.id == mapuser.id %}<script type="text/javascript" src="/static/js/.map-controls.min.js"></script>{% endif %}
+	<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="application/javascript" src="https://maps.googleapis.com/maps/api/js?key={{mapApi}}&callback=gmapsCb" async defer></script>
+	<script type="application/javascript" src="/static/js/.map.min.js"></script>
+	{% if user.id == mapuser.id %}<script type="application/javascript" src="/static/js/.map-controls.min.js"></script>{% endif %}
 	<script> /* Variables from server */
 		
 		const mapuser = JSON.parse('{{mapuser |dump|safe}}'),
diff --git a/views/password.html b/views/password.html
index f5102bb..d74729c 100644
--- a/views/password.html
+++ b/views/password.html
@@ -53,7 +53,7 @@
 
 {% block javascript %}
 {{super()}}
-	<script type="text/javascript" src="/static/js/.mellt.min.js"></script>
-	<script type="text/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/.mellt.min.js"></script>
+	<script type="application/javascript" src="/static/js/.common-passwords.min.js"></script>
+	<script type="application/javascript" src="/static/js/.password.min.js"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/views/settings.html b/views/settings.html
index a0d073e..67e0159 100644
--- a/views/settings.html
+++ b/views/settings.html
@@ -150,5 +150,5 @@
 
 {% block javascript %}
 {{super()}}
-	<script type="text/javascript" src="/static/js/.settings.min.js"></script>
+	<script type="application/javascript" src="/static/js/.settings.min.js"></script>
 {% endblock %}
diff --git a/views/templates/base.html b/views/templates/base.html
index c6942ac..d9e34b1 100644
--- a/views/templates/base.html
+++ b/views/templates/base.html
@@ -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://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">
-		<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 %}
 	{% if not noHeader %}<link href="/static/css/.header.min.css" rel="stylesheet">{% endif %}
diff --git a/views/templates/footer.html b/views/templates/footer.html
index 1beecbe..4fc45b6 100644
--- a/views/templates/footer.html
+++ b/views/templates/footer.html
@@ -13,4 +13,4 @@
 	</div>
 </footer>
 
-<script type="text/javascript" src="/static/js/.footer.min.js"></script>
\ No newline at end of file
+<script type="application/javascript" src="/static/js/.footer.min.js"></script>
\ No newline at end of file
diff --git a/views/templates/header.html b/views/templates/header.html
index c39221a..1164e80 100644
--- a/views/templates/header.html
+++ b/views/templates/header.html
@@ -56,4 +56,4 @@
 </div>
 {% endfor %}
 
-<script type="text/javascript" src="/static/js/.header.min.js"></script>
\ No newline at end of file
+<script type="application/javascript" src="/static/js/.header.min.js"></script>
\ No newline at end of file