merge request id	131
Titel	Feature/ll 138 radial progress
Beschreibung
Status	merged
Created at	2019-11-28T15:19:12.177Z
Updated at	2019-11-29T11:12:48.489Z
Source branch	feature/LL-138--radial-progress
Target branch	develop
Author	Sascha Immig
Assignee	Gregor Gabriel

Discussion notes

assigned to @gabrielg	Sascha Immig	2019-11-28T15:19:35.874Z
added 1 commit 8f821e1d - + removed permission generation in migration Compare with previous version	Gregor Gabriel	2019-11-29T10:49:56.719Z
added 6 commits 8f821e1d...026b9d0e - 5 commits from branch develop 08cd8629 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2019-11-29T11:02:50.807Z
enabled an automatic merge when the pipeline for 08cd862973de871bf2bc73e0d1ea388f301d6ba5 succeeds	Gregor Gabriel	2019-11-29T11:03:34.272Z
mentioned in commit 10f9afb40c54425355c8d418009275daae0b2957	Gregor Gabriel	2019-11-29T11:12:47.927Z
merged	Gregor Gabriel	2019-11-29T11:12:48.595Z

Merge Commits

Title	Id	Author	Created at	Message
moved styles to the right file and corrected variable names. Updated styles.	073beecc20c03798109fb523636c2592ba7b8e1d	TUV\immigs	2019-11-28T14:28:55.000Z	moved styles to the right file and corrected variable names. Updated styles.
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	08cd862973de871bf2bc73e0d1ea388f301d6ba5	TUV\gabrielg	2019-11-29T11:02:41.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-138--radial-progress # Conflicts: # resources/js/laroute.js
added circular training progress to training card (my-trainings)	18f2cd60ddb6e231bd7d1504c574e14252f68c2d	TUV\immigs	2019-11-28T15:16:17.000Z	added circular training progress to training card (my-trainings)
use slot props	37c5842924f6d45c3d8aba505703ee3f4840adeb	Marcel Pociot	2019-11-28T14:44:31.000Z	use slot props
added named slots	8526fc6e5eb60de8ab684eee4c9d3c819521b23f	TUV\immigs	2019-11-28T14:58:30.000Z	added named slots
+ removed permission generation in migration	8f821e1d0896bccff91ce147371473134d925ebd	TUV\gabrielg	2019-11-29T10:49:42.000Z	+ removed permission generation in migration + autogenerated laroute.js and messages.js files
WIP: animation	98c8988423392222d0754816610d7df085a83887	TUV\immigs	2019-11-27T08:04:55.000Z	WIP: animation
style tweaks	9d22f277475a19780cc6b20282a913aca45e0b62	TUV\immigs	2019-11-27T13:49:38.000Z	style tweaks
WIP: radial progress for trainings progress	a9816e884a1e259124bc6e9c45d8c95b547e9006	TUV\immigs	2019-11-26T14:53:56.000Z	WIP: radial progress for trainings progress
WIP: removed complex keyframe animation to prevent lags. Integrated rotation into vue-compoent	e18305673e6c6cf36b2cd1806d9720e8c8202988	TUV\immigs	2019-11-27T10:50:10.000Z	WIP: removed complex keyframe animation to prevent lags. Integrated rotation into vue-compoent
WIP: made Logic a mixin and transfered HTML into vue components	f41f3682d91e048e3153d0827c678a373a5d5e7e	TUV\immigs	2019-11-28T13:27:06.000Z	WIP: made Logic a mixin and transfered HTML into vue components