Merge branch 'hotfix-0.6.3'
commit
adfdbfa5cc
|
@ -1,5 +1,9 @@
|
|||
# Tracman Server Changelog
|
||||
###### v 0.6.2
|
||||
###### v 0.6.3
|
||||
|
||||
#### v0.6.3
|
||||
|
||||
*
|
||||
|
||||
#### v0.6.2
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# <img align="left" src="/static/img/icon/by/48.png" alt="[]" title="The Tracman Logo">Tracman
|
||||
###### v 0.6.2
|
||||
###### v 0.6.3
|
||||
|
||||
node.js application to display a sharable map with user's location.
|
||||
|
||||
|
@ -52,6 +52,11 @@ Tracman will be updated according to [this branching model](http://nvie.com/post
|
|||
|
||||
[view full changelog](CHANGELOG.md)
|
||||
|
||||
|
||||
#### v0.6.3
|
||||
|
||||
*
|
||||
|
||||
#### v0.6.2
|
||||
|
||||
* [#76](https://github.com/Tracman-org/Server/issues/76) Prevented users with no password from deleting google social login
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "tracman",
|
||||
"version": "0.6.2",
|
||||
"version": "0.6.3",
|
||||
"description": "Tracks user's GPS location",
|
||||
"main": "server.js",
|
||||
"dependencies": {
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{% extends 'templates/base.html' %}
|
||||
{% block title %}{{super()}} | Reset Password{% endblock %}
|
||||
|
||||
{% block head %}
|
||||
{{super()}}
|
||||
|
@ -13,12 +14,12 @@
|
|||
|
||||
<form method="post" role="form">
|
||||
|
||||
<div class='group'>
|
||||
<div class='form-group'>
|
||||
<label for="email">Email:</label>
|
||||
<input name="email" type="email">
|
||||
</div>
|
||||
|
||||
<input class='main btn' type="submit" value="Go">
|
||||
<input class='main btn' type="submit" value="Go" style="display:block; margin:auto">
|
||||
|
||||
</form>
|
||||
|
||||
|
|
Loading…
Reference in New Issue