merge request id	184
Titel	Feature/ll 282 improve user administration
Beschreibung	Filter für Positionen und Abteilungen hinzugefügt bitte checken ob die User-Experience des Abteilungsfilters ok ist
Status	merged
Created at	2020-05-08T08:55:43.831Z
Updated at	2020-05-26T12:45:48.068Z
Source branch	feature/LL-282-improve-user-administration
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 53 commits 95e40100...e7baf124 - 52 commits from branch develop 2209189e - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2020-05-14T09:52:00.385Z
added 1 commit d4a63ad6 - + sorting & filtering work now smooth together Compare with previous version	Gregor Gabriel	2020-05-14T14:28:07.860Z
added 1 commit 9d2140c8 - added style correction Compare with previous version	Sascha Immig	2020-05-19T14:04:33.363Z
added 63 commits 9d2140c8...9d5f5f9e - 62 commits from branch develop b0dabbed - Merge branch 'develop' into 'feature/LL-282-improve-user-administration' Compare with previous version	Sascha Immig	2020-05-26T12:36:50.497Z
enabled an automatic merge when the pipeline for b0dabbedd76ce5308b9e3e52030d5d64dcfd39bd succeeds	Sascha Immig	2020-05-26T12:37:09.342Z
merged	Sascha Immig	2020-05-26T12:45:48.134Z
mentioned in commit be1168eed83af85bcc3284420efccf630e85b834	Sascha Immig	2020-05-26T12:45:48.344Z

Merge Commits

Title	Id	Author	Created at	Message
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	2209189e98c8b26569a86ccebb28bcc8f2d410fc	TUV\gabrielg	2020-05-14T09:51:53.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-282-improve-user-administration
+ made sure vue component's input element triggers onchange event	95e401001b689cc7f07db07577614e36ec1b5b78	TUV\gabrielg	2020-05-08T08:49:41.000Z	+ made sure vue component's input element triggers onchange event + added title to checkbox
added style correction	9d2140c8a1b273d3221e7209804fea115a31b45b	TUV\immigs	2020-05-19T14:01:25.000Z	added style correction
Merge branch 'develop' into 'feature/LL-282-improve-user-administration'	b0dabbedd76ce5308b9e3e52030d5d64dcfd39bd	Sascha Immig	2020-05-26T12:36:48.000Z	Merge branch 'develop' into 'feature/LL-282-improve-user-administration' # Conflicts: # resources/js/messages.js
added filter for organization unit and position in user administration	d3228250852c18d13255ad1583032984fecbed2f	TUV\gabrielg	2020-05-07T16:24:18.000Z	added filter for organization unit and position in user administration
+ sorting & filtering work now smooth together	d4a63ad62448f69cf93401700861003ab787b1f1	TUV\gabrielg	2020-05-14T14:28:02.000Z	+ sorting & filtering work now smooth together + removed triggerig change event when selecting an organization unit + removed sortById as first sort condition