merge request id	203
Titel	Feature/ll 425 update user datasheet
Beschreibung
Status	merged
Created at	2020-06-17T11:24:02.898Z
Updated at	2020-06-17T11:52:06.010Z
Source branch	feature/LL-425--update-user-datasheet
Target branch	develop
Author	Sascha Immig
Assignee	Marcel Pociot

Discussion notes

merged

Sascha Immig

2020-06-17T11:52:06.067Z

Merge Commits

Title	Id	Author	Created at	Message
cleaned up controller	000369d8dd38746dee5917715ac0cd9c016bcb35	TUV\immigs	2020-06-17T09:29:26.000Z	cleaned up controller
changd confirmation field and optimized phone (cherry pick form develop)	12587ce0c6bb630c70d4d9fb720e2b5c9bfb2e7f	TUV\immigs	2020-06-17T09:19:57.000Z	changd confirmation field and optimized phone (cherry pick form develop)
Merge branch 'feature/LL-432-update-usercontroller' into 'feature/LL-425--update-user-datasheet'	2c1655240e61cdd1af212a2dcc4c57e21c42da8e	Sascha Immig	2020-06-16T11:24:52.000Z	Merge branch 'feature/LL-432-update-usercontroller' into 'feature/LL-425--update-user-datasheet' Rechte im Kontroller abfangen, zusätzlich zu einer Frontend Prüfung See merge request lms/seventeen!200
Merge branch 'feature/LL-425--update-user-datasheet' into 'feature/LL-432-update-usercontroller'	8443903d26ea72fe25fcbefadb4ba4fe0fa077db	Richard Klings	2020-06-16T07:08:48.000Z	Merge branch 'feature/LL-425--update-user-datasheet' into 'feature/LL-432-update-usercontroller' # Conflicts: # app/Http/Controllers/Admin/UserController.php
resorted fields (LL-431) and started with Controller (LL-432)	beea5ce0753b6061cc673971bed73262385b6d94	TUV\immigs	2020-06-10T08:18:25.000Z	resorted fields (LL-431) and started with Controller (LL-432)
Rechte im Kontroller abfangen, zusätzlich zu einer Frontend Prüfung	c5c47478e70385f8f81e890b54e4453193daef29	Richard Klings	2020-06-15T12:14:16.000Z	Rechte im Kontroller abfangen, zusätzlich zu einer Frontend Prüfung
added "optional" and some annotations	c9ecc11cbb8e29bc4647caf39ddb0ca8f45efcdf	TUV\immigs	2020-06-17T10:10:28.000Z	added "optional" and some annotations