merge request id	10
Titel	Feature/watchlist and basket bubbles
Beschreibung
Status	merged
Created at	2018-08-15T12:20:39.624Z
Updated at	2018-08-15T13:14:29.026Z
Source branch	feature/watchlist_and_basket_bubbles
Target branch	develop
Author	Sascha Immig
Assignee	Sascha Immig

Discussion notes

merged

Sascha Immig

2018-08-15T13:14:29.076Z

Merge Commits

Title	Id	Author	Created at	Message
Merge branch 'develop' of https://gitlab.learningsystem.de:/lms/seventeen into develop	39d42bbec9af56451d7f301de0d3b9c7dbf095f2	schnepfz	2018-08-13T08:44:24.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de:/lms/seventeen into develop # Conflicts: # public/css/app.css.map # public/js/admin/app.js.map # public/js/app.js.map
updated generated files	4040d36fc4ffacc866b2fc70ac9c68f5ed508349	TUV\immigs	2018-08-15T12:07:07.000Z	updated generated files
Merge branch 'feature/grouping_of_training_items' into develop	5219848516eda88349715e1a84b0268019abfc7b	schnepfz	2018-08-10T12:45:29.000Z	Merge branch 'feature/grouping_of_training_items' into develop # Conflicts: # public/css/app.css.map # public/js/admin/app.js.map # public/js/app.js.map
corrected menu indents	59a3685d31ce9cb1eb4611f8d8ffbde33a10a713	TUV\immigs	2018-08-15T12:06:30.000Z	corrected menu indents
Added a generic badge component	865b4819747db94dcc482896c7c0db75a3bf700d	Marcel Pociot	2018-08-15T09:59:24.000Z	Added a generic badge component
changed badge style	8ef2c0876ae13414f3740178da6813c29f7b8992	TUV\immigs	2018-08-15T12:05:56.000Z	changed badge style
Item count bubbles for watchlist & basket (submenu)	c0cecd5e2ebd0527a66b062e8dcdddf2ae861629	schnepfz	2018-08-14T07:58:35.000Z	Item count bubbles for watchlist & basket (submenu)
removed old styles on body	d5f9ec8e364dd5f8e1bfa57afc5c7ed6451c2567	TUV\immigs	2018-08-15T10:05:35.000Z	removed old styles on body