merge from staging (2d71596a) · Commits · Marc Tröll / frag.jetzt SWTP 2022

There was an error fetching the commit references. Please try again later.

Commit 2d71596a authored 3 years ago by

Stefan Plociennik

Browse files

merge from staging

parents 3d177457 96aacc20

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 1 addition, 1 deletion

package-lock.json
src/app/components/creator/room-creator-page/room-creator-page.component.ts 10 additions, 0 deletions

.../creator/room-creator-page/room-creator-page.component.ts
src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.ts 11 additions, 0 deletions

...oderator-comment-list/moderator-comment-list.component.ts
src/app/components/shared/_dialogs/create-comment/create-comment.component.ts 19 additions, 2 deletions

...hared/_dialogs/create-comment/create-comment.component.ts
src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html 69 additions, 0 deletions

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

.../shared/_dialogs/spacy-dialog/spacy-dialog.component.scss
src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.spec.ts 27 additions, 0 deletions

...ared/_dialogs/spacy-dialog/spacy-dialog.component.spec.ts
src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts 104 additions, 0 deletions

...ts/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html 21 additions, 0 deletions

...logs/topic-cloud-filter/topic-cloud-filter.component.html
src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.scss 12 additions, 0 deletions

...logs/topic-cloud-filter/topic-cloud-filter.component.scss
src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts 73 additions, 0 deletions

...ialogs/topic-cloud-filter/topic-cloud-filter.component.ts
src/app/components/shared/comment-list/comment-list.component.ts 16 additions, 1 deletion

.../components/shared/comment-list/comment-list.component.ts
src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html 1 addition, 1 deletion

...ialog-action-buttons/dialog-action-buttons.component.html
src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.ts 12 additions, 0 deletions

.../dialog-action-buttons/dialog-action-buttons.component.ts
src/app/components/shared/header/header.component.html 406 additions, 408 deletions

src/app/components/shared/header/header.component.html
src/app/components/shared/header/header.component.ts 9 additions, 1 deletion

src/app/components/shared/header/header.component.ts
src/app/components/shared/shared-routing.module.ts 1 addition, 1 deletion

src/app/components/shared/shared-routing.module.ts
src/app/components/shared/shared.module.ts 6 additions, 2 deletions

src/app/components/shared/shared.module.ts
src/app/components/shared/tag-cloud/tag-cloud.component.ts 1 addition, 1 deletion

src/app/components/shared/tag-cloud/tag-cloud.component.ts
src/app/models/comment.ts 4 additions, 1 deletion

src/app/models/comment.ts

with 874 additions and 419 deletions

Please register or to comment