merge request id	110
Titel	Feature/add tab existing scorm bundle LL-87 + LL-120
Beschreibung
Status	merged
Created at	2019-10-04T13:24:43.766Z
Updated at	2019-11-12T11:08:24.037Z
Source branch	feature/add_tab_existing_scorm_bundle_ll-87
Target branch	develop
Author	Zoltan Schnepf
Assignee	Sascha Immig

Discussion notes

changed title from **Feature/add tab existing scorm bundle {-ll 87-}** to **Feature/add tab existing scorm bundle {+LL-87 + LL-120+}**	Zoltan Schnepf	2019-10-04T13:27:54.231Z
added 41 commits ae857ebc...285adbc0 - 40 commits from branch develop a7150902 - Merge branch 'develop' into feature/add_tab_existing_scorm_bundle_ll-87 Compare with previous version	Sascha Immig	2019-10-11T12:23:33.061Z
Warum wurde hier das obige eloquent durch eine direkte DB-ABfrage ersetzt?	Sascha Immig	2019-11-04T13:12:09.627Z
die vorherige Zeile ist mittlerweile korrekt auf laroute umgestellt worden: `contentItems: this.getSettings(laroute.route('admin.contentitems.search')),`. Dies müsste für `contents` noch nachgeholt werden. Außerdem: dass das Property `contents` mit `admin.contentItems.seach` belegt wird, erscheint mir unsauber...	Sascha Immig	2019-11-04T13:15:18.897Z
added 75 commits a7150902...66c5546a - 74 commits from branch develop 0d6ea46b - Merge branch 'develop' into feature/add_tab_existing_scorm_bundle_ll-87 Compare with previous version	Sascha Immig	2019-11-04T13:22:41.392Z
added 1 commit b39a4e98 - LL-120: Layout Compare with previous version	Sascha Immig	2019-11-04T13:34:00.672Z
LL-120 ist i.O.	Sascha Immig	2019-11-04T13:34:37.321Z
changed this line in version 5 of the diff	Sascha Immig	2019-11-05T09:33:58.749Z
added 1 commit aa6a5f31 - Layout correction and code optimization Compare with previous version	Sascha Immig	2019-11-05T09:33:58.951Z
auskommentierter Code stammte ebenfalls aus dem Update. Wurde jetzt entfernt.	Sascha Immig	2019-11-05T09:34:59.344Z
resolved all discussions	Sascha Immig	2019-11-05T09:35:17.447Z
selber behoben	Sascha Immig	2019-11-05T09:35:55.132Z
resolved all discussions	Sascha Immig	2019-11-05T09:35:57.567Z
resolved all discussions	Sascha Immig	2019-11-05T09:36:07.820Z
resolved all discussions	Zoltan Schnepf	2019-11-12T10:12:15.996Z
added 1 commit 930a8a3f - bugfix: wbt loop added Compare with previous version	Zoltan Schnepf	2019-11-12T10:12:16.395Z
merged	Sascha Immig	2019-11-12T11:08:24.099Z
mentioned in commit 0b1266954ef329609905bc2b8fc2553b95d62dd4	Sascha Immig	2019-11-12T11:08:24.264Z

Merge Commits

Title	Id	Author	Created at	Message
Merge branch 'develop' into feature/add_tab_existing_scorm_bundle_ll-87	0d6ea46b235f57db8c569b2cee1cab17555dc4f5	TUV\immigs	2019-11-04T13:21:56.000Z	Merge branch 'develop' into feature/add_tab_existing_scorm_bundle_ll-87 # Conflicts: # resources/js/admin/components/TrainingItemAssignment.vue
Merge branch 'develop' into feature/add_tab_existing_scorm_bundle_ll-87	5a7f0a53d1cf28f9222131ac7c94febab703f688	zschnepf	2019-10-03T14:04:05.000Z	Merge branch 'develop' into feature/add_tab_existing_scorm_bundle_ll-87 # Conflicts: # resources/js/messages.js
bugfix: wbt loop added	930a8a3f41c4ffd0f4213d3a74b39b87962a91fb	zschnepf	2019-11-12T10:11:51.000Z	bugfix: wbt loop added
Merge branch 'develop' into feature/add_tab_existing_scorm_bundle_ll-87	a7150902f9b2ec49c5e4bdceb245e8bb124759f9	TUV\immigs	2019-10-11T12:23:06.000Z	Merge branch 'develop' into feature/add_tab_existing_scorm_bundle_ll-87
WIP LL-87	a82f8f35c77a9f7ea8eff7254fba61d029980ac1	zschnepf	2019-10-03T13:39:37.000Z	WIP LL-87
Layout correction and code optimization	aa6a5f31bcbc2218aaea4800a1c17109054f5c54	TUV\immigs	2019-11-05T09:33:33.000Z	Layout correction and code optimization
Merge branch 'develop' into feature/add_tab_existing_scorm_bundle_ll-87	ae857ebcb47ab4c7f856015a973a7601db458c46	zschnepf	2019-10-04T12:26:34.000Z	Merge branch 'develop' into feature/add_tab_existing_scorm_bundle_ll-87
LL-120: Layout	b39a4e98647d0db82cf3bfaf64e8f922bb8a0946	TUV\immigs	2019-11-04T13:33:45.000Z	LL-120: Layout