merge request id	380
Titel	Feature/ll 790 adfs
Beschreibung
Status	merged
Created at	2021-03-01T11:25:34.867Z
Updated at	2021-03-03T14:47:18.109Z
Source branch	feature/LL-790-adfs
Target branch	develop
Author	Richard Klings
Assignee	Sascha Immig

Discussion notes

added 1 commit 1451df05 - code style Compare with previous version	Sascha Immig	2021-03-01T15:06:01.485Z
added 9 commits 1451df05...bfbcdb04 - 8 commits from branch develop 5fe56f27 - Merge branch 'develop' into 'feature/LL-790-adfs' Compare with previous version	Sascha Immig	2021-03-01T16:51:24.907Z
added 1 commit 80b250e2 - fixed merge error Compare with previous version	Sascha Immig	2021-03-01T17:05:05.141Z
added 1 commit 212ba90c - Update UI and added permission instead of check for superadmin Compare with previous version	Sascha Immig	2021-03-02T10:29:49.861Z
added 2 commits 5f68a988 - added missing composer lock a875f4f3 - added vendor's migrations to the project Compare with previous version	Sascha Immig	2021-03-02T16:20:22.452Z
added 1 commit ecf4e5c3 - LL-790 - removed dublicated migrations, as they are already automatically… Compare with previous version	Gregor Gabriel	2021-03-03T12:57:26.253Z
merged	Sascha Immig	2021-03-03T14:47:18.195Z
mentioned in commit e04566586a65a6372b9c204b177b02f24ba7ef95	Sascha Immig	2021-03-03T14:47:18.320Z

Merge Commits

Title	Id	Author	Created at	Message
code style	1451df051b34104d149f2d151ff72ded7f207ddf	TUV\immigs	2021-03-01T14:56:19.000Z	code style
Update UI and added permission instead of check for superadmin	212ba90c4831d52d652e37ed2359a5213215e52a	TUV\immigs	2021-03-02T10:19:26.000Z	Update UI and added permission instead of check for superadmin
added missing composer lock	5f68a9889bf5806cab4d4280edf74043be6dfef9	TUV\immigs	2021-03-02T15:44:34.000Z	added missing composer lock
Merge branch 'develop' into 'feature/LL-790-adfs'	5fe56f27225416a46b3a84ca7aaf043959b4a3a4	Sascha Immig	2021-03-01T16:51:18.000Z	Merge branch 'develop' into 'feature/LL-790-adfs' # Conflicts: # resources/lang/de.json
fixed merge error	80b250e211182edb9f35fe6bdb0b01a6e61a8f10	TUV\immigs	2021-03-01T17:04:50.000Z	fixed merge error
Merge branch 'develop' into feature/LL-790-adfs	8ab5887eb162c201588f6872aac75ae1f3d2c9c8	Richard Klings	2021-02-26T11:31:12.000Z	Merge branch 'develop' into feature/LL-790-adfs
LL-790: ADFS mit verschiedenen Tenants, konfiguriert im Mandanten	93e5075b129cbe89de575af2c64a6c0ef7b2aa0c	Ubuntu	2021-02-26T11:16:16.000Z	LL-790: ADFS mit verschiedenen Tenants, konfiguriert im Mandanten
added vendor's migrations to the project	a875f4f3b71f289eb1dedcc5f2255ef3a0b468e8	TUV\immigs	2021-03-02T16:19:58.000Z	added vendor's migrations to the project
LL-790 - removed dublicated migrations, as they are already automatically…	ecf4e5c3d890eb5356474c40ad502e49d85b7ab0	TUV\gabrielg	2021-03-03T12:57:11.000Z	LL-790 - removed dublicated migrations, as they are already automatically providede by vendor code and thus there is a exception