merge request id	736
Titel	Feature/ll 1305 lernbausteine unterweisung
Beschreibung
Status	merged
Created at	2023-01-20T08:28:03.094Z
Updated at	2023-01-26T16:14:44.545Z
Source branch	feature/LL-1305-lernbausteine-unterweisung
Target branch	develop
Author	Sascha Immig
Assignee	Sascha Immig

Discussion notes

added 2 commits a86abb52 - optimized popover firing event 5185f628 - Optimized layout and changed wording / translations Compare with previous version	Sascha Immig	2023-01-20T11:12:25.458Z
added 4 commits 6cccdc6c - + added column "client" in content administration for none client users and added a client filter 4a5fc79d - Merge branch 'feature/LL-1336-add-client-context-to-contents' into… 68c405f4 - beautyfied search bar 3592694a - updated wording and alignment Compare with previous version	Sascha Immig	2023-01-20T12:44:16.101Z
added 1 commit 711adb69 - set position for new column; Compare with previous version	Sascha Immig	2023-01-20T13:58:48.040Z
added 1 commit 4d75e3e2 - LL-1305 | Filter done, add button done. Compare with previous version	Sebastian	2023-01-25T12:30:33.362Z
added 3 commits 9ae4f1e6 - optmized layout und code indention 9967ee15 - restored first tab 56fb89e6 - typo Compare with previous version	Sascha Immig	2023-01-26T15:49:47.990Z
merged	Sascha Immig	2023-01-26T16:14:44.574Z

Merge Commits

Title	Id	Author	Created at	Message
none client users see all contents now	1192044593469355ab86b9f1da57495e0b96c0d6	TUV\gabrielg	2022-12-22T13:13:14.000Z	none client users see all contents now
added client filtering to content serch controller	196e5b45af10e9b4e0bbd6331b4851bdbab4ccce	TUV\gabrielg	2022-12-22T12:21:42.000Z	added client filtering to content serch controller
LL-1305 | ContentList Methode for output the json with the ContentItems data	2b0739b7cdc1921a5c85b5df88c9cc3ef110334d	Sebastian Majchrzak	2023-01-09T13:11:20.000Z	LL-1305 | ContentList Methode for output the json with the ContentItems data
updated wording and alignment	3592694ab90946711eee7143ecc31821153335c6	TUV\immigs	2023-01-20T12:44:07.000Z	updated wording and alignment
Merge branch 'feature/LL-1336-add-client-context-to-contents' into…	4a5fc79dab96357ebfdc302e2379aeaf8bae7d47	TUV\immigs	2023-01-20T11:39:42.000Z	Merge branch 'feature/LL-1336-add-client-context-to-contents' into feature/LL-1305-lernbausteine-unterweisung
LL-1305 | Filter done, add button done.	4d75e3e25ec89a14af32f535c6fbd06065c98533	Sebastian Majchrzak	2023-01-25T12:30:23.000Z	LL-1305 | Filter done, add button done.
Optimized layout and changed wording / translations	5185f6285c5e44c849e55a7a90f15efe70c0ff9e	TUV\immigs	2023-01-20T11:12:16.000Z	Optimized layout and changed wording / translations
typo	56fb89e65574bb3dc6bd1c8524f71cccad79b370	TUV\immigs	2023-01-26T15:49:38.000Z	typo
beautyfied search bar	68c405f447a09b9e6ee1a95cefe599696d9021ba	TUV\immigs	2023-01-20T12:38:19.000Z	beautyfied search bar
+ added column "client" in content administration for none client users and added a client filter	6cccdc6c5382b922cc137c9e9dd784165cce0bbf	TUV\gabrielg	2023-01-12T12:35:51.000Z	+ added column "client" in content administration for none client users and added a client filter + changed buttons to iconized buttons
set position for new column;	711adb69c1ab7d8c5d2fdf25102314d13289ea9d	TUV\immigs	2023-01-20T13:58:33.000Z	set position for new column;
+ refactored class ContentController so that it replaces ContentSearchController	89b668f294f66414caaa43c1922e2fe56e3b624a	TUV\gabrielg	2022-12-22T15:57:15.000Z	+ refactored class ContentController so that it replaces ContentSearchController + optimized a scope and added additional scope
restored first tab	9967ee156dc5e66b8cd4387d5028de8dc37e7328	TUV\immigs	2023-01-26T15:49:24.000Z	restored first tab
optmized layout und code indention	9ae4f1e6ad6c5765125549065278f6e534983a48	TUV\immigs	2023-01-26T15:49:11.000Z	optmized layout und code indention
optimized popover firing event	a86abb52ee50ee74e00c6ea6d2519cb103577c67	TUV\immigs	2023-01-20T10:43:56.000Z	optimized popover firing event
LL-1305 | ContentList table with buttons etc. done	c7af99df7c3b3052be7156054dc8f8e27c36fea0	Sebastian Majchrzak	2023-01-17T13:26:05.000Z	LL-1305 | ContentList table with buttons etc. done
LL-1305 | Content Item deleting in the Table done	cd2dd3e16c37818dad5915c5bf078e02316630c3	Sebastian Majchrzak	2023-01-19T13:38:21.000Z	LL-1305 | Content Item deleting in the Table done
+ contents now are restricted to contents without client id or with own client…	fcc852adbea4090d39d96cbf3270b63785533ec7	TUV\gabrielg	2022-12-22T11:54:50.000Z	+ contents now are restricted to contents without client id or with own client id fpe users with client context + in administration users with client context can only see contents of their context - content selectors not adapted yet