TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-11-01 06:01:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
yogesh_gohil
2019-11-14 15:51:48 +05:30
parent 4839e57791
commit 2dda0baa3f
51 changed files with 576 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/views/wizard/UserProfile.vue
View File

@ -45,6 +45,7 @@
/>
<div v-if="$v.profileData.password.$error">
<span v-if="!$v.profileData.password.required" class="text-danger">{{ $tc('validation.required') }}</span>
<span v-if="!$v.profileData.password.minLength" class="text-danger"> {{ $tc('validation.password_min_length', $v.profileData.password.$params.minLength.min, {count: $v.profileData.password.$params.minLength.min}) }} </span>
</div>
</div>
<div class="col-md-6">
@ -106,7 +107,8 @@ export default {
required
},
password: {
required
required,
minLength: minLength(5)
},
confirm_password: {
required: requiredIf('isRequired'),