Merge branch 'staging' into tag-cloud-configuration (a38f935a) · Commits · Marc Tröll / frag.jetzt SWTP 2022

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

Commit a38f935a authored 3 years ago by

Ahmet Hamdi Janusch Cetin

Browse files

Merge branch 'staging' into tag-cloud-configuration

parents 2f97132f 58861bf8

Hide whitespace changes

Inline Side-by-side

Showing

src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html 66 additions, 41 deletions

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

...ud-administration/topic-cloud-administration.component.ts
src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html 7 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 14 additions, 2 deletions

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

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

src/app/components/shared/comment/comment.component.html
src/app/components/shared/comment/comment.component.ts 18 additions, 4 deletions

src/app/components/shared/comment/comment.component.ts
src/app/components/shared/header/header.component.html 12 additions, 4 deletions

src/app/components/shared/header/header.component.html
src/app/components/shared/header/header.component.scss 2 additions, 2 deletions

src/app/components/shared/header/header.component.scss
src/app/components/shared/header/header.component.ts 7 additions, 1 deletion

src/app/components/shared/header/header.component.ts
src/app/components/shared/tag-cloud/tag-cloud-pop-up/tag-cloud-pop-up.component.html 2 additions, 1 deletion

...ag-cloud/tag-cloud-pop-up/tag-cloud-pop-up.component.html
src/app/components/shared/tag-cloud/tag-cloud-pop-up/tag-cloud-pop-up.component.ts 10 additions, 2 deletions

.../tag-cloud/tag-cloud-pop-up/tag-cloud-pop-up.component.ts
src/app/components/shared/tag-cloud/tag-cloud.component.html 1 addition, 1 deletion

src/app/components/shared/tag-cloud/tag-cloud.component.html
src/app/components/shared/tag-cloud/tag-cloud.component.ts 13 additions, 1 deletion

src/app/components/shared/tag-cloud/tag-cloud.component.ts
src/app/services/util/profanity-filter.service.ts 1 addition, 0 deletions

src/app/services/util/profanity-filter.service.ts
src/app/services/util/room-data.service.ts 14 additions, 2 deletions

src/app/services/util/room-data.service.ts
src/app/services/util/tag-cloud-data.service.ts 0 additions, 6 deletions

src/app/services/util/tag-cloud-data.service.ts
src/app/services/util/topic-cloud-admin.service.ts 6 additions, 1 deletion

src/app/services/util/topic-cloud-admin.service.ts
src/assets/i18n/creator/de.json 3 additions, 1 deletion

src/assets/i18n/creator/de.json
src/assets/i18n/creator/en.json 3 additions, 1 deletion

src/assets/i18n/creator/en.json

with 206 additions and 84 deletions

Please register or to comment