Merge fixes

This commit is contained in:
Hillel Coren 2017-04-12 17:05:03 +03:00
parent 0d4dcb2ad0
commit eccb33ab59
2 changed files with 3 additions and 2 deletions

View File

@ -160,7 +160,7 @@
<div class="panel-body">
<div id="signUpDiv" onkeyup="validateSignUp()" onclick="validateSignUp()" onkeydown="checkForEnter(event)">
{!! Former::open('signup/submit')->addClass('signUpForm')->autocomplete('on') !!}
{!! Former::open('signup/submit')->addClass('signUpForm')->autocomplete('off') !!}
@if (Auth::check() && ! Auth::user()->registered)
{!! Former::populateField('new_first_name', Auth::user()->first_name) !!}
@ -222,6 +222,7 @@
->label(' ') !!}
{!! Former::password('new_password')
->placeholder(trans('texts.password'))
->autocomplete('new-password')
->label(' ') !!}
{{ Former::setOption('TwitterBootstrap3.labelWidths.large', 4) }}

View File

@ -37,7 +37,7 @@
@if ($account->user_id == Auth::user()->id)
<b>{{ trans('texts.logged_in')}}</b>
@else
{!! Button::primary(trans('texts.unlink'))->withAttributes(['onclick'=>"return showUnlink({$account->id}, {$account->user_id})"]) !!}
{{-- Button::primary(trans('texts.unlink'))->withAttributes(['onclick'=>"return showUnlink({$account->id}, {$account->user_id})"]) --}}
@endif
</td>
</tr>