Merge branch 'master' into user_handling

Conflicts: app/main.py app/requirements.txt
2016-04-18 21:43:01 +02:00
parent 6ed4110ce9 1d449cb0ab
commit 2e0fc3b772
7 changed files with 84 additions and 110 deletions
--- a/app/templates/security/login_user.html
+++ b/app/templates/security/login_user.html
@@ -2,7 +2,6 @@
 {% from "security/_macros.html" import render_field_with_errors, render_field %}

 {% block body %}
-{% include "security/_messages.html" %}
 <form class='form-horizontal' action="{{ url_for_security('login') }}" method="POST" name="login_user_form">
  {{ login_user_form.hidden_tag() }}
  {{ render_field_with_errors(login_user_form.email) }}