Merge branch 'staging' of git.thm.de:arsnova/topic-cloud into staging (d3089d9f) · Commits · Marc Tröll / frag.jetzt SWTP 2022

Commit d3089d9f authored 3 years ago by

Klaus-Dieter Quibeldey-Cirkel

Browse files

Merge branch 'staging' of git.thm.de:arsnova/topic-cloud into staging

parents 6941b4b3 4322056b

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/app/components/creator/_dialogs/room-edit/room-edit.component.html 6 additions, 3 deletions

...nents/creator/_dialogs/room-edit/room-edit.component.html
src/app/components/creator/_dialogs/room-edit/room-edit.component.scss 8 additions, 0 deletions

...nents/creator/_dialogs/room-edit/room-edit.component.scss
src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.ts 1 addition, 0 deletions

...oderator-comment-list/moderator-comment-list.component.ts
src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.html 156 additions, 147 deletions

...gs/cloud-configuration/cloud-configuration.component.html
src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.scss 27 additions, 3 deletions

...gs/cloud-configuration/cloud-configuration.component.scss
src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.ts 19 additions, 2 deletions

...logs/cloud-configuration/cloud-configuration.component.ts
src/app/components/shared/_dialogs/create-comment/create-comment.component.html 11 additions, 1 deletion

...red/_dialogs/create-comment/create-comment.component.html
src/app/components/shared/_dialogs/create-comment/create-comment.component.scss 9 additions, 0 deletions

...red/_dialogs/create-comment/create-comment.component.scss
src/app/components/shared/_dialogs/create-comment/create-comment.component.ts 53 additions, 15 deletions

...hared/_dialogs/create-comment/create-comment.component.ts
src/app/components/shared/_dialogs/room-create/room-create.component.ts 1 addition, 0 deletions

...ents/shared/_dialogs/room-create/room-create.component.ts
src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html 2 additions, 2 deletions

.../shared/_dialogs/spacy-dialog/spacy-dialog.component.html
src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts 6 additions, 0 deletions

...ts/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
src/app/components/shared/_dialogs/topic-cloud-administration/TopicCloudAdminData.ts 47 additions, 2 deletions

...dialogs/topic-cloud-administration/TopicCloudAdminData.ts
src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html 66 additions, 27 deletions

...-administration/topic-cloud-administration.component.html
src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.scss 7 additions, 0 deletions

...-administration/topic-cloud-administration.component.scss
src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts 174 additions, 116 deletions

...ud-administration/topic-cloud-administration.component.ts
src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html 3 additions, 3 deletions

...logs/topic-cloud-filter/topic-cloud-filter.component.html
src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts 20 additions, 1 deletion

...ialogs/topic-cloud-filter/topic-cloud-filter.component.ts
src/app/components/shared/comment-list/comment-list.component.ts 18 additions, 18 deletions

.../components/shared/comment-list/comment-list.component.ts
src/app/components/shared/comment/comment.component.html 2 additions, 2 deletions

src/app/components/shared/comment/comment.component.html

with 636 additions and 342 deletions

Please register or to comment