merge request id	179
Titel	Feature/ll 148 sortable tables
Beschreibung	Sortierung sollte jetzt so weit passen Stellen mit "TBD" wurde korrigiert Organisationseinheiten wurden um vollen Namen (incl. Parent Name) ergänzt
Status	merged
Created at	2020-05-04T11:44:02.221Z
Updated at	2020-05-06T18:15:22.659Z
Source branch	feature/LL-148--sortable-tables
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

merged	Sascha Immig	2020-05-06T18:15:22.759Z
mentioned in commit 6dd37223fae1bcaeef391ab169ae6664185e067a	Sascha Immig	2020-05-06T18:15:22.924Z

Merge Commits

Title	Id	Author	Created at	Message
WIP	0e2d550c5e26e5d62f242730c24fb14a3cbc5916	zschnepf	2020-02-13T09:56:13.000Z	WIP
Merge branch 'feature/LL-148_make__tables_sortable' into feature/LL-148--sortable-tables	52a140b76f45b5b8dc3d775427329d3763f26895	zschnepf	2020-01-10T13:11:39.000Z	Merge branch 'feature/LL-148_make__tables_sortable' into feature/LL-148--sortable-tables # Conflicts: # resources/views/admin/users/table.blade.php
WIP	5c868951f2ebe4827e78c6f5340368ac8f987cef	zschnepf	2020-02-19T11:20:19.000Z	WIP
Merge branch 'develop' into feature/LL-148--sortable-tables	5e84a67f3310de72cc402d0792d622405c2d1db6	zschnepf	2020-02-07T13:27:32.000Z	Merge branch 'develop' into feature/LL-148--sortable-tables # Conflicts: # app/Http/Controllers/Admin/CatalogController.php # resources/views/admin/catalogs/table.blade.php
Merge branch 'develop' into feature/LL-148--sortable-tables	6a90539458abe161d0bbeb0ec6694366397e3bf6	zschnepf	2020-02-07T13:52:13.000Z	Merge branch 'develop' into feature/LL-148--sortable-tables # Conflicts: # app/Http/Controllers/Admin/RoleController.php # resources/views/admin/roles/table.blade.php
wip	7d00fbcf3b01cc448b69abcbf346504bda9755ad	zschnepf	2020-01-07T10:36:15.000Z	wip
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	a3f6278346a8837c4332dd37aba1b2bdaf65d790	TUV\gabrielg	2020-05-04T06:07:06.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-148--sortable-tables # Conflicts: # app/Http/Controllers/Admin/ParticipationCertificateController.php # resources/views/admin/users/edit.blade.php # resources/views/admin/users/includes/trainings.blade.php
Merge branch 'develop' into feature/LL-148--sortable-tables	acf9e847f4ee44d48a5fff94222b5a6807825114	zschnepf	2020-02-19T12:11:26.000Z	Merge branch 'develop' into feature/LL-148--sortable-tables # Conflicts: # app/Http/Controllers/InboxController.php # resources/views/admin/groups/table.blade.php
WIP: Prepared classes for sorting	d2c757839eb0e55be2d546ea42facd882c590ff7	TUV\immigs	2019-12-17T13:09:16.000Z	WIP: Prepared classes for sorting
+ did some smaller corrections	f7ab52d2115bdea43c934483bfbdad7e52abf92d	TUV\gabrielg	2020-05-04T11:35:10.000Z	+ did some smaller corrections + added sorting by full_name (=full name contains full name of parent) of organization_units