Commit 9c5dbbde authored by Oliver Falk's avatar Oliver Falk

Merge branch 'devel' into 'master'

Show mail address of the user in the user prefs

See merge request !155
parents f6520eee ff7539a5
Pipeline #1872 passed with stages
in 6 minutes and 42 seconds
......@@ -7,6 +7,11 @@
{% block content %}
<h1>{% trans 'Account settings' %}</h1>
<div class="form-group">
<label for="id_email">{% trans 'Your email' %}:</label>
<input type="text" name="email" disabled class="form-control" value="{{ }}" id="id_email" style="max-width:600px;">
<!-- TODO: Language stuff not yet fully implemented; Esp. translations are only half-way there
<h2>{% trans 'Language' %}</h2>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment