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

Merge branch 'build210' into 'master'

Browse Source 
fix installation issue & build 210

See merge request mohit.panjvani/crater-web!143
This commit is contained in:
Mohit Panjwani
2019-12-14 13:27:26 +00:00
parent 1dfa36e396 75ddc51b1e
commit 3617032735
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/ProfileRequest.php
View File

@ -30,7 +30,7 @@ class ProfileRequest extends FormRequest
case 'POST':
return [
'name' => 'required',
'password' => 'required',
'password' => 'required|min:8',
'address_street_1' => 'max:255',
'address_street_2' => 'max:255',
'email' => [

2
public/assets/js/app.js
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/assets/js/app.js": "/assets/js/app.js?id=5e2defab289e20b6776c",
"/assets/js/app.js": "/assets/js/app.js?id=a9f802b3fe774e87bf0c",
"/assets/css/crater.css": "/assets/css/crater.css?id=193e5770a0e7a8604f35"
}

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

@ -54,7 +54,7 @@
/>
<div v-if="$v.profileData.email.$error">
<span v-if="!$v.profileData.email.required" class="text-danger">{{ $tc('validation.required') }}</span>
<span v-if="!$v.profileData.email.email" class="text-danger">{{ $tc('validation.required') }}</span>
<span v-if="!$v.profileData.email.email" class="text-danger">{{ $tc('validation.email_incorrect') }}</span>
</div>
</div>
</div>
@ -145,7 +145,7 @@ export default {
},
password: {
required,
minLength: minLength(5)
minLength: minLength(8)
},
confirm_password: {
required: requiredIf('isRequired'),