merge request id	128
Titel	LL-151: mandatory trainings
Beschreibung
Status	merged
Created at	2019-11-20T15:57:20.589Z
Updated at	2019-11-29T13:59:31.870Z
Source branch	feature/mandatory-trainings
Target branch	develop
Author	Sebastian Schlein
Assignee	Sascha Immig

Discussion notes

changed title from **{-Feature/-}mandatory trainings** to **{+LL-151: +}mandatory trainings**	Sascha Immig	2019-11-27T14:16:21.147Z
added 82 commits 683b6088...fa796633 - 81 commits from branch develop 35369725 - Merge branch 'develop' into 'feature/mandatory-trainings' Compare with previous version	Marcel Pociot	2019-11-29T13:49:22.523Z
enabled an automatic merge when the pipeline for 35369725a7ce2cf81a160b8939e0a47bec634c21 succeeds	Marcel Pociot	2019-11-29T13:49:31.809Z
mentioned in commit 2a1808c9705af0825089405c11910458d21cb551	Marcel Pociot	2019-11-29T13:59:33.747Z
merged	Marcel Pociot	2019-11-29T13:59:36.343Z

Merge Commits

Title	Id	Author	Created at	Message
Fix controller	2b55d277161d3daaafc5bac40fb238ca89f3ecf7	Marcel Pociot	2019-11-20T11:20:53.000Z	Fix controller
Merge branch 'develop' into 'feature/mandatory-trainings'	35369725a7ce2cf81a160b8939e0a47bec634c21	Marcel Pociot	2019-11-29T13:49:19.000Z	Merge branch 'develop' into 'feature/mandatory-trainings' # Conflicts: # resources/lang/de.json
ui + test	54897964a7b2cea5f690a2ac0e01d61e39bf7e38	Sebastian Schlein	2019-11-20T15:06:03.000Z	ui + test
add check if the user has no training assignment without a timerange	656c707d27d7129a2b51a9a9b7534833df2f691c	Marcel Pociot	2019-11-20T15:51:05.000Z	add check if the user has no training assignment without a timerange
Merge branch 'feature/mandatory-trainings' of…	683b60886f7786f6be89b1b00162613382017e0f	Marcel Pociot	2019-11-20T15:51:17.000Z	Merge branch 'feature/mandatory-trainings' of gitlab.learningsystem.de:lms/seventeen into feature/mandatory-trainings
wip	b97be6a7f5583a2f24eb8f9d917a5fc4bcdd8fe0	Marcel Pociot	2019-11-18T16:02:39.000Z	wip
Fix controller	bac89c1c21674b9b9dab081ab11e2c71e6bb4d4c	Marcel Pociot	2019-11-20T11:37:42.000Z	Fix controller