merge request id	139
Titel	Feature/ll 150 x domain scom package export
Beschreibung
Status	merged
Created at	2019-12-11T10:40:18.947Z
Updated at	2019-12-12T13:05:52.585Z
Source branch	feature/LL-150-x-domain-scom-package-export
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

merged	Sascha Immig	2019-12-12T13:05:52.648Z
mentioned in commit e9b0cf298de3ba6e027c7c9109b4065c7733c3e6	Sascha Immig	2019-12-12T13:05:52.863Z

Merge Commits

Title	Id	Author	Created at	Message
run cs-fixer	12a23ba8c372a1ccf1500b08889cbf2420ed124c	TUV\gabrielg	2019-11-27T08:21:57.000Z	run cs-fixer
added possibility to bypass proxy and loader for assets	2599cfd97be471637f3141707822fe592d606432	TUV\gabrielg	2019-11-27T14:04:43.000Z	added possibility to bypass proxy and loader for assets
First integration of x-domain SCORM package generation realized	3300ceb380fbb2f3ff05f113c35a242c47a52bce	TUV\gabrielg	2019-11-27T08:14:52.000Z	First integration of x-domain SCORM package generation realized
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	48532d699be67ccbd9b47a3c6ddd00b31e8af5d5	TUV\gabrielg	2019-12-11T10:38:57.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-150-x-domain-scom-package-export # Conflicts: # app/Models/Content/ContentItem.php
+ proxy now accepts already initialized scorm apis - this is not standard, but might be helpful	753cb33d80b6e5b70feae9e0b46f24e05b11a748	TUV\gabrielg	2019-11-27T12:49:36.000Z	+ proxy now accepts already initialized scorm apis - this is not standard, but might be helpful + relocated standard scorm export button to content form
small refactoring of lms action file	b0003f95401900ec4cd1e411a297dfb1863af820	TUV\gabrielg	2019-11-27T12:57:52.000Z	small refactoring of lms action file
fixed generation of content urls	f7bd2d55b3b21f2315d1fd4ec5c2aa8cb054eb67	TUV\gabrielg	2019-11-27T14:30:17.000Z	fixed generation of content urls