merge request id	356
Titel	Feature/ll 114 rework content blocks
Beschreibung	Zuordnungs-Formmular bitte noch schön machen
Status	merged
Created at	2021-01-18T17:34:35.126Z
Updated at	2021-12-02T10:17:11.452Z
Source branch	feature/LL-114-rework-content-blocks
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 1 commit 2ab351ea - did some internationalization Compare with previous version	Gregor Gabriel	2021-01-19T11:11:57.121Z
added 1 commit ad2dbc97 - finished translation Compare with previous version	Gregor Gabriel	2021-01-19T11:25:48.001Z
added 19 commits ad2dbc97...ef5cd768 - 13 commits from branch develop 32a0edae - Merge branch 'develop' into feature/LL-114-rework-content-blocks 330b1768 - translation b2051916 - configured Blocks 56b8476d - updated layout 00cc41f8 - Updated form to add blocks to position d551a73f - fixed breadcrumb Compare with previous version	Sascha Immig	2021-01-20T10:58:28.942Z
added 1 commit 0ea18ca3 - finalized Layout Compare with previous version	Sascha Immig	2021-01-20T13:20:27.238Z
added 1 commit 9c47b9f0 - Code Style Compare with previous version	Sascha Immig	2021-01-20T15:09:16.617Z
enabled an automatic merge when the pipeline for 9c47b9f0d7eb65eb69d5cdc256c7a4954375ee2b succeeds	Sascha Immig	2021-01-20T15:19:47.606Z
merged	Sascha Immig	2021-01-20T15:21:07.833Z
mentioned in commit 5476111e90d122f871cdf850f58425e49dd2965d	Sascha Immig	2021-01-20T15:21:08.036Z

Merge Commits

Title	Id	Author	Created at	Message
Updated form to add blocks to position	00cc41f839631b5610329d8383b51528dd4e7a26	TUV\immigs	2021-01-20T10:57:58.000Z	Updated form to add blocks to position
finalized Layout	0ea18ca3602853b3890408e613e9d387836310e5	TUV\immigs	2021-01-20T13:20:12.000Z	finalized Layout
did some internationalization	2ab351ead591d102e48c5b14f7e98eda7c43478d	TUV\gabrielg	2021-01-19T11:11:50.000Z	did some internationalization
Merge branch 'develop' into feature/LL-114-rework-content-blocks	32a0edae30d5b6416b490dd229a36707076fc33b	TUV\immigs	2021-01-19T13:31:46.000Z	Merge branch 'develop' into feature/LL-114-rework-content-blocks
translation	330b17685a6cf96df4e4223c968b191e57634269	TUV\immigs	2021-01-20T08:42:48.000Z	translation
updated layout	56b8476d4bd1096061eded7ce93ba8607356c555	TUV\immigs	2021-01-20T10:24:33.000Z	updated layout
WIP	690ccd10a1edfff18c85aab6d837cc40a889345e	TUV\gabrielg	2021-01-15T11:48:51.000Z	WIP + implemented sorting of positions
+ now all available positions for content block placement are listed	77f638486ec45d6e135451d070938f3a6cfbd1f0	TUV\gabrielg	2021-01-18T11:07:51.000Z	+ now all available positions for content block placement are listed
+ Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	86058f8a058526aef5b79fb02f74191b4bc4c791	TUV\gabrielg	2021-01-18T11:32:38.000Z	+ Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-114-rework-content-blocks + fiexes security bug
Code Style	9c47b9f0d7eb65eb69d5cdc256c7a4954375ee2b	TUV\immigs	2021-01-20T15:09:05.000Z	Code Style
implemented creation of content block positions	a5edb477203050b4a1eb2fab4ec33a6f796f16a8	TUV\gabrielg	2021-01-18T17:33:26.000Z	implemented creation of content block positions
finished translation	ad2dbc976bfa34ecc9d17c8d399969a7ec1b23d4	TUV\gabrielg	2021-01-19T11:25:41.000Z	finished translation
configured Blocks	b20519165fd90e74595853755c7f0110e81b2841	TUV\immigs	2021-01-20T10:24:13.000Z	configured Blocks
WIP	b4efd1777dce2d02e432dc709c831d78c05c6699	TUV\gabrielg	2021-01-14T11:54:54.000Z	WIP + administration ui now distinguish between content blocks and content block positions + content block form adapted (removed fields) so that content blocks can be created and updated now + on deleting a content block all assigned positions are deleted as well
WIP	bab57c3cb9e2be2712accb1da10ef654161c4da6	TUV\gabrielg	2021-01-15T12:41:36.000Z	WIP + hiding content blocks without position assignment in positions tab
fixed breadcrumb	d551a73feb0732d5d8b355401895613e3afda69f	TUV\immigs	2021-01-20T10:58:17.000Z	fixed breadcrumb
WIP	d5fba59eeb276147294501dc1f4094a72919e54e	TUV\gabrielg	2021-01-15T11:27:40.000Z	WIP + added possibility to change vatidity dates for positions
WIP	f0cb5bb27a0ffc370e57482af4a1fc6e39eaefef	TUV\gabrielg	2021-01-14T07:09:16.000Z	WIP + added migration to new data model + adapted code, so that it works with new data model when content blocks are in use - did not adapt administration yet - did not extend administration yet