merge request id	123
Titel	Feature/ll 133 adapt user im and export for clients
Beschreibung	Lernmanagementsystem 17LL-133 - User Im- und Export fertigstellen Nachdem die Mandantenfähigkeit integriert wurde, bitte den Im- und Export nochmals prüfen und sicherstellen, dass dieser korrekt arbeitet. Insbesondere das erneute Importieren einer exportierten Liste muss gewährleistet sein.
Status	merged
Created at	2019-11-05T11:56:12.335Z
Updated at	2019-11-25T09:38:49.039Z
Source branch	feature/LL-133-adapt-user-im-and-export-for-clients
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 8 commits a9779107...7d6bcc12 - 7 commits from branch develop 6ca76aec - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2019-11-05T16:05:03.331Z
added 1 commit 645c9f4d - Minor fix Compare with previous version	Gregor Gabriel	2019-11-06T09:39:46.309Z
added 26 commits 645c9f4d...7f0852f1 - 25 commits from branch develop 0b43de11 - Merge branch 'develop' into 'feature/LL-133-adapt-user-im-and-export-for-clients' Compare with previous version	Sascha Immig	2019-11-12T09:28:06.603Z
added 1 commit 01d840c9 - removed address from user export file and set export value for "Mailversand" to "1" Compare with previous version	Gregor Gabriel	2019-11-15T08:50:56.924Z
added 1 commit 3a1fb593 - updated composer.lock file Compare with previous version	Gregor Gabriel	2019-11-15T10:27:03.543Z
added 63 commits 3a1fb593...47cf78c3 - 62 commits from branch develop 9d0131c5 - Merge branch 'develop' into feature/LL-133-adapt-user-im-and-export-for-clients Compare with previous version	Sascha Immig	2019-11-25T09:27:14.790Z
enabled an automatic merge when the pipeline for 9d0131c5cf02cd8034ae0227658221ef563b4c0c succeeds	Sascha Immig	2019-11-25T09:37:08.728Z
mentioned in commit 98700c7a4e9c67ece99b73c021e029e57667500a	Sascha Immig	2019-11-25T09:38:48.707Z
merged	Sascha Immig	2019-11-25T09:38:49.135Z

Merge Commits

Title	Id	Author	Created at	Message
removed address from user export file and set export value for "Mailversand" to "1"	01d840c9b045ced2b5092f079c326682cb4e4fcb	TUV\gabrielg	2019-11-15T08:50:26.000Z	removed address from user export file and set export value for "Mailversand" to "1"
Merge branch 'develop' into 'feature/LL-133-adapt-user-im-and-export-for-clients'	0b43de11e55fd4a98d725636056d28fd8de2af45	Sascha Immig	2019-11-12T09:27:30.000Z	Merge branch 'develop' into 'feature/LL-133-adapt-user-im-and-export-for-clients' # Conflicts: # resources/views/admin/users/search.blade.php
updated composer.lock file	3a1fb5936d007bbe5ef2f82a6de2b1037bdb18a0	TUV\gabrielg	2019-11-15T10:26:53.000Z	updated composer.lock file
Minor fix	645c9f4d62a844d6124a05556a191d8cab7130df	TUV\gabrielg	2019-11-06T09:39:24.000Z	Minor fix
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	6ca76aec8a7432f320791bb11483414cff21afba	TUV\gabrielg	2019-11-05T16:04:55.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-133-adapt-user-im-and-export-for-clients # Conflicts: # resources/js/laroute.js
Merge branch 'develop' into feature/LL-133-adapt-user-im-and-export-for-clients	9d0131c5cf02cd8034ae0227658221ef563b4c0c	TUV\immigs	2019-11-25T09:26:52.000Z	Merge branch 'develop' into feature/LL-133-adapt-user-im-and-export-for-clients
adapted user im / export that way, that	a4f254338f001f2c64f7865afc7f49cc1fc56138	TUV\gabrielg	2019-11-04T16:48:12.000Z	adapted user im / export that way, that + clients are respected + exported fields are imported + lot of fine tuning was done
finished user im/export	a9779107a6538f4fb2e10e74528135764d0545f3	TUV\gabrielg	2019-11-05T11:52:53.000Z	finished user im/export