merge request id	172
Titel	Feature/ll 304 checkout training from content server
Beschreibung	Anbindung von Darwin an den Content-Server + Trainings des Content-Servers werden in der Trainingsadministration in einem Katalog aufgelistet und können eingesehen werden + Ein Training auf dem Content-Servers kann in Darwin hinein importiert werden
Status	merged
Created at	2020-04-14T10:40:02.227Z
Updated at	2020-07-07T14:21:52.956Z
Source branch	feature/LL-304-checkout-training-from-content-server
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 1 commit 24a6d722 - debug cleanup Compare with previous version	Gregor Gabriel	2020-04-16T10:23:13.669Z
added 1 commit 560bc4cc - + use minified training image Compare with previous version	Gregor Gabriel	2020-04-21T12:12:35.717Z
added 384 commits 560bc4cc...1c61b436 - 383 commits from branch develop 575e8ffd - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2020-06-18T10:10:29.412Z
added 119 commits 575e8ffd...a94541d3 - 118 commits from branch develop d43bc7df - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2020-07-02T09:07:21.778Z
added 1 commit ca2189d9 - cherry picked new developer_code fields for content and training Compare with previous version	Gregor Gabriel	2020-07-02T10:35:45.205Z
merged	Sascha Immig	2020-07-07T14:21:53.030Z
mentioned in commit 52272d7382de412ba600e8c425b949d448279fde	Sascha Immig	2020-07-07T14:21:53.293Z

Merge Commits

Title	Id	Author	Created at	Message
added formating to training id in content server catalog	012aa1010365d9c0b24108f48cf26c62c3ab59a5	TUV\gabrielg	2020-04-09T15:29:48.000Z	added formating to training id in content server catalog
debug cleanup	24a6d7226839b6bd11a1481e40fd7cc5773310d2	TUV\gabrielg	2020-04-16T10:22:42.000Z	debug cleanup
+ we now can configure the content server in .env file	25c963960728a42650fd4c590bdda95390d47f02	TUV\gabrielg	2020-04-07T13:55:14.000Z	+ we now can configure the content server in .env file + we now can dispay and filter content server trainings under Admin > Trainings > Externer Katalog + we now can dispay details about a content server training under Admin > Trainings > Externer Katalog + we prepared a checkout function to transfer the content server training to local trainings - implementation of checkout is to be done
wip	2f761f93994d1edb413e924f417f8c9c36928d29	TUV\gabrielg	2020-04-09T08:29:36.000Z	wip + some roundup - still content training relation missing
wip	4881a0b3e04c3dfbd16883f444f4edbeafc25e74	TUV\gabrielg	2020-04-09T07:24:01.000Z	wip + round up trainingsimport
+ use minified training image	560bc4cccfb9b962a029adba9d34d3528137c8b6	TUV\gabrielg	2020-04-21T12:12:09.000Z	+ use minified training image + added description about fields, that are not imported + changed details button
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	575e8ffdfddd4d6735d167f229963686e44fd698	TUV\gabrielg	2020-06-18T10:10:18.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-304-checkout-training-from-content-server # Conflicts: # app/Models/Training.php # resources/lang/de.json
+ content relations to trainings are now imported	7895f74a4a21a3a5cd34daa40baa0f154c5d21c7	TUV\gabrielg	2020-04-09T13:39:04.000Z	+ content relations to trainings are now imported + title and description is missing for training Item if it is a hand created module
activated pager for Content Server Catalog Trainings	86213b01532849fcfefbe04aab783e0f2f40dc24	TUV\gabrielg	2020-04-09T15:56:51.000Z	activated pager for Content Server Catalog Trainings
we now can fully import manually create modul name and description	8bcb55d6af90665bee37c8fffd45315e1dd647b7	TUV\gabrielg	2020-04-09T15:17:14.000Z	we now can fully import manually create modul name and description
wip	9abfbe59062fe50aff490b484d211c428eeaec7b	TUV\gabrielg	2020-04-08T15:28:03.000Z	wip + we import trainings with content now - we do not assign imported contents to imorted training yet
cherry picked new developer_code fields for content and training	ca2189d9758929e9e17fd23766b3e18abb235265	TUV\gabrielg	2020-07-02T10:35:26.000Z	cherry picked new developer_code fields for content and training
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	d43bc7dfef48ff69d663b5b46e2413fe1b29efe8	TUV\gabrielg	2020-07-02T09:07:04.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-304-checkout-training-from-content-server