Merge branch 'develop' into feature/api-v1

2018-01-01 13:33:06 -06:00 · 2018-01-01 13:33:06 -06:00 · d21f70c04b
commit d21f70c04b
parent 8a38a8af4a 0ec5a4e08c
20 changed files with 205 additions and 231 deletions
--- a/app/Models/User.php
+++ b/app/Models/User.php
@ -115,6 +115,7 @@ class User extends Model implements
     * @var array
     */
    protected static $applicationRules = [
+        'uuid' => 'required',
        'email' => 'required',
        'username' => 'required',
        'name_first' => 'required',
@ -130,6 +131,7 @@ class User extends Model implements
     * @var array
     */
    protected static $dataIntegrityRules = [
+        'uuid' => 'string|size:36|unique:users,uuid',
        'email' => 'email|unique:users,email',
        'username' => 'alpha_dash|between:1,255|unique:users,username',
        'name_first' => 'string|between:1,255',