ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts.

Browse Source
This commit is contained in:
Taylor Otwell
2015-02-26 07:42:24 -06:00
parent 73e1c71e70 4929781b95
commit 338f5f1cce
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
resources/views/auth/login.blade.php
View File

@@ -18,7 +18,7 @@
</div>
@endif
<form class="form-horizontal" role="form" method="POST" action="/auth/login">
<form class="form-horizontal" role="form" method="POST" action="{{ url('/auth/login') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group">
@@ -49,6 +49,7 @@
<div class="col-md-6 col-md-offset-4">
<button type="submit" class="btn btn-primary">Login</button>
<<<<<<< HEAD
<a class="btn btn-link" href="/password/email">Forgot Your Password?</a>
</div>
</div>
@@ -57,5 +58,15 @@
</div>
</div>
</div>
=======
<a class="btn btn-link" href="{{ url('/password/email') }}">Forgot Your Password?</a>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
>>>>>>> master
</div>
@endsection

2
resources/views/auth/password.blade.php
View File

@@ -24,7 +24,7 @@
</div>
@endif
<form class="form-horizontal" role="form" method="POST" action="/password/email">
<form class="form-horizontal" role="form" method="POST" action="{{ url('/password/email') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group">

2
resources/views/auth/register.blade.php
View File

@@ -18,7 +18,7 @@
</div>
@endif
<form class="form-horizontal" role="form" method="POST" action="/auth/register">
<form class="form-horizontal" role="form" method="POST" action="{{ url('/auth/register') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group">

2
resources/views/auth/reset.blade.php
View File

@@ -18,7 +18,7 @@
</div>
@endif
<form class="form-horizontal" role="form" method="POST" action="/password/reset">
<form class="form-horizontal" role="form" method="POST" action="{{ url('/password/reset') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<input type="hidden" name="token" value="{{ $token }}">