Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2017-04-17 15:30:50 -05:00
parent c989b23f36 17ec5c51d6
commit 2f111d54ba
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Auth/RegisterController.php
View File

@ -48,9 +48,9 @@ public function __construct()
protected function validator(array $data) protected function validator(array $data)
{ {
return Validator::make($data, [ return Validator::make($data, [
'name' => 'required|max:255', 'name' => 'required|string|max:255',
'email' => 'required|email|max:255|unique:users', 'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|min:6|confirmed', 'password' => 'required|string|min:6|confirmed',
]); ]);
} }

2
resources/assets/js/app.js vendored
View File

@ -7,6 +7,8 @@
require('./bootstrap'); require('./bootstrap');
window.Vue = require('vue');
/** /**
* Next, we will create a fresh Vue application instance and attach it to * Next, we will create a fresh Vue application instance and attach it to
* the page. Then, you may begin adding components to this application * the page. Then, you may begin adding components to this application

8
resources/assets/js/bootstrap.js vendored
View File

@ -11,14 +11,6 @@ window.$ = window.jQuery = require('jquery');
require('bootstrap-sass'); require('bootstrap-sass');
/**
* Vue is a modern JavaScript library for building interactive web interfaces
* using reactive data binding and reusable components. Vue's API is clean
* and simple, leaving you to focus on building your next great project.
*/
window.Vue = require('vue');
/** /**
* We'll load the axios HTTP library which allows us to easily issue requests * We'll load the axios HTTP library which allows us to easily issue requests
* to our Laravel back-end. This library automatically handles sending the * to our Laravel back-end. This library automatically handles sending the