merge request id	324
Titel	Feature/ll 724 secure conact person in unser import
Beschreibung	+ user import will never remove Client-Admin role from from primary contact person + user import now can impoer field "Aktiv" + primary contact person cannot be set inactive by user import
Status	merged
Created at	2020-11-24T11:49:54.038Z
Updated at	2020-11-27T14:22:58.640Z
Source branch	feature/LL-724-secure-conact-person-in-unser-import
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 32 commits 0b8fd671...ab3e4fb8 - 31 commits from branch develop 2be4a746 - Merge branch 'develop' into 'feature/LL-724-secure-conact-person-in-unser-import' Compare with previous version	Sascha Immig	2020-11-27T13:13:50.438Z
müssten wir das nicht immer auf `true` setzen?	Sascha Immig	2020-11-27T13:17:10.282Z
nee, Uli wollte immer schon, dass man mit dem User-Import auch User deaktivieren kann. Das geht jetzt wenn man Aktiv explizit auf 0 setzt	Gregor Gabriel	2020-11-27T14:05:39.826Z
resolved all discussions	Gregor Gabriel	2020-11-27T14:05:42.519Z
hatte das ! überlesen...	Sascha Immig	2020-11-27T14:22:53.609Z
resolved all discussions	Sascha Immig	2020-11-27T14:22:53.639Z
merged	Sascha Immig	2020-11-27T14:22:58.700Z
mentioned in commit f36ff5521c5dd3aec1eac2f80b8a23dc2993365c	Sascha Immig	2020-11-27T14:22:58.826Z

Merge Commits

Title	Id	Author	Created at	Message
+ user import now can impoer field "Aktiv"	0b8fd671cf4addcfaed03717c368e9e2e772cab1	TUV\gabrielg	2020-11-24T11:47:36.000Z	+ user import now can impoer field "Aktiv" + primary contact person cannot be set inactive by user import
user import will never remove Client-Admin role from from primary contact person	11bd6dabdd0712a15fbf3643fb94ba60bc8549b2	TUV\gabrielg	2020-11-24T09:40:52.000Z	user import will never remove Client-Admin role from from primary contact person
Merge branch 'develop' into 'feature/LL-724-secure-conact-person-in-unser-import'	2be4a7466c43bd59d493061a5f00adadae92d951	Sascha Immig	2020-11-27T13:13:48.000Z	Merge branch 'develop' into 'feature/LL-724-secure-conact-person-in-unser-import' # Conflicts: # app/Models/User.php