Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/resources/views/app/users/editpass.blade.php
This commit is contained in:
Anders
2020-08-03 09:43:51 +02:00
4 changed files with 46 additions and 14 deletions
@@ -7,7 +7,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mt-0">Konto</h1>
<form method="post" action="{{ route("users.update", ['user' => Auth::user()]) }}">
<form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}">
@csrf
@method("put")
<span>Navn:</span>
@@ -7,7 +7,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mt-0">Konto</h1>
<form method="post" action="{{ route("users.update", ['user' => Auth::user()]) }}">
<form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}" style="display: inline-table;">
@csrf
@method("put")
<span>Nuværende Password:</span>