Merge branch '109-fix-error-message-when-logging-in' into 'master'

Resolve "Fix error message when logging in"

Closes #109

See merge request jankstudio/resq!137
This commit is contained in:
Kendrick Chan 2018-06-11 14:30:40 +00:00
commit 8a67d23490
2 changed files with 4 additions and 2 deletions

View file

@ -116,6 +116,9 @@
"ref": "aaddfdf43cdecd4cf91f992052d76c2cadc04543"
}
},
"setasign/fpdf": {
"version": "1.8.1"
},
"symfony/cache": {
"version": "v4.0.2"
},

View file

@ -49,7 +49,7 @@
{% if error %}
<div class="m-alert m-alert--outline alert alert-danger alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"></button>
<span>{{ error }}</span>
<span>{{ error.getMessage }}</span>
</div>
{% endif %}
<div class="form-group m-form__group">
@ -177,7 +177,6 @@
<script src="/assets/demo/default/base/scripts.bundle.js" type="text/javascript"></script>
<!--end::Base Scripts -->
<!--begin::Page Snippets -->
<script src="/assets/snippets/pages/user/login.js" type="text/javascript"></script>
<!--end::Page Snippets -->
</body>
<!-- end::Body -->