Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 68
TitelFeature/add successor callback to wbt list
Beschreibung
Statusmerged
Created at 2019-01-21T13:56:11.303Z
Updated at 2019-01-24T09:43:36.732Z
Source branchfeature/add_successor_callback_to_wbt_list
Target branchdevelop
AuthorZoltan Schnepf
AssigneeMarcel Pociot

Discussion notes

added 31 commits
  • dd4b48d5...2aeb477c - 30 commits from branch develop
  • 14f64a1d - Merge branch 'develop' into feature/add_successor_callback_to_wbt_list
Compare with previous version
Sascha Immig 2019-01-22T08:29:57.598Z
added 5 commits
  • 14f64a1d...3dda878d - 4 commits from branch develop
  • 6321e2ef - Merge branch 'develop' into feature/add_successor_callback_to_wbt_list
Compare with previous version
Sascha Immig 2019-01-22T09:15:53.750Z
Müsste das nicht `$chapterIds` sein? Die `$chIds` variable scheint es nicht zu geben. Marcel Pociot 2019-01-22T09:39:57.895Z
Hier müsste es dann auch `$chapterIds` sein. Marcel Pociot 2019-01-22T09:40:17.578Z
changed this line in version 4 of the diff Sascha Immig 2019-01-22T09:48:24.393Z
changed this line in version 4 of the diff Sascha Immig 2019-01-22T09:48:27.380Z
resolved all discussions Sascha Immig 2019-01-22T09:48:28.358Z
added 1 commit
  • be00ab33 - fixed variable name
Compare with previous version
Sascha Immig 2019-01-22T09:48:29.121Z
@schnepfz Wird diese Funktion überhaupt benutzt? Im Template finde ich nur die Javascript Variante. Marcel Pociot 2019-01-23T19:48:13.147Z
changed this line in version 5 of the diff Zoltan Schnepf 2019-01-24T08:37:28.734Z
resolved all discussions Zoltan Schnepf 2019-01-24T08:37:28.823Z
added 1 commit
  • 29e99282 - discussion resolved
Compare with previous version
Zoltan Schnepf 2019-01-24T08:37:29.055Z
Wird nicht mehr benötigt, das war ein anderer Ansatz - danach habe ich die js-variante entwickelt; habe ich mitsamt getNextChapter entfernt. Zoltan Schnepf 2019-01-24T08:37:59.508Z
resolved all discussions Zoltan Schnepf 2019-01-24T08:38:00.937Z
added 18 commits
  • 29e99282...c4d98975 - 17 commits from branch develop
  • 5f179db6 - Merge branch 'develop' into 'feature/add_successor_callback_to_wbt_list'
Compare with previous version
Marcel Pociot 2019-01-24T09:33:51.784Z
enabled an automatic merge when the pipeline for 5f179db6c37a91c393658afa7ce11e64bde6d9f0 succeeds Marcel Pociot 2019-01-24T09:34:22.573Z
merged Marcel Pociot 2019-01-24T09:43:36.793Z
mentioned in commit 3c010f1381f5b6d4bfb227e7d4aa7efb09c78cad Marcel Pociot 2019-01-24T09:43:36.899Z

Merge Commits

Title Id Author Created at Message
UCP update 095e9827cea4954bde9e4c2f65e8f1b52030da40 zschnepf 2019-01-21T12:31:54.000Z UCP update
WIP 0e8bd6fdebb64badfc93f9430a03dba63d4f96e0 zschnepf 2019-01-16T13:22:16.000Z WIP
WIP: bilt in new UCP 1483d34c7d7cc68e56c3e08180cff10f33fdee15 zschnepf 2019-01-18T09:01:50.000Z WIP: bilt in new UCP
Merge branch 'develop' into feature/add_successor_callback_to_wbt_list 14f64a1d9f2c804aeeecc9d895e3f55aa98d79f1 TUV\immigs 2019-01-22T08:29:37.000Z Merge branch 'develop' into feature/add_successor_callback_to_wbt_list
removed debug logs 1ac1b31315a7409c2644a3142619fd9b21c63db3 TUV\immigs 2019-01-18T14:47:36.000Z removed debug logs
discussion resolved 29e99282edb51fa78fcb39c7caf491323ac6c482 zschnepf 2019-01-24T08:36:55.000Z discussion resolved
updated ucp-code and generation of list 54e9493aff87579bbb55823c10d81b761b85fe38 TUV\immigs 2019-01-18T14:42:47.000Z updated ucp-code and generation of list
WIP - added ucp close before restart of next module 5dec7918cac490d7397179d901903e84faaf8f17 TUV\gabrielg 2019-01-18T12:10:31.000Z WIP - added ucp close before restart of next module
Merge branch 'develop' into 'feature/add_successor_callback_to_wbt_list' 5f179db6c37a91c393658afa7ce11e64bde6d9f0 Marcel Pociot 2019-01-24T09:33:36.000Z Merge branch 'develop' into 'feature/add_successor_callback_to_wbt_list' # Conflicts: # resources/views/trainings/includes/section_learning_content.blade.php
Merge branch 'develop' into feature/add_successor_callback_to_wbt_list 6321e2eff264de23a6d275f07c4434fb7998b0f7 TUV\immigs 2019-01-22T09:15:04.000Z Merge branch 'develop' into feature/add_successor_callback_to_wbt_list
removed debug log abcd7918ae83e54a369a560d617caacc6f7433b4 TUV\immigs 2019-01-18T12:23:25.000Z removed debug log
fixed variable name be00ab33174c2effb8a5847e3cb3555a14c6afba TUV\immigs 2019-01-22T09:46:53.000Z fixed variable name
Merge branch 'feature/add_successor_callback_to_wbt_list' of… dd4b48d57b8630369a724be5f712de4a422c464e zschnepf 2019-01-21T13:39:25.000Z Merge branch 'feature/add_successor_callback_to_wbt_list' of https://gitlab.learningsystem.de/lms/seventeen into feature/add_successor_callback_to_wbt_list # Conflicts: # resources/views/trainings/includes/section_learning_content.blade.php
fixed errors with minified versions ed166386a0d34e8ccf1f05738854ff0cf413df3f TUV\immigs 2019-01-18T09:37:35.000Z fixed errors with minified versions
updated minified version fbe3576be9a5166c919a851b3caaecd244dab203 TUV\immigs 2019-01-18T14:44:40.000Z updated minified version