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

Commit 7c0074e2 authored 3 years ago by

Ruben Bimberg

Browse files

Merge branch 'staging' into tag-cloud

parents c86f880e 93b4f028

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/app/components/creator/_dialogs/profanity-settings/profanity-settings.component.html 24 additions, 0 deletions

...logs/profanity-settings/profanity-settings.component.html
src/app/components/creator/_dialogs/profanity-settings/profanity-settings.component.scss 0 additions, 0 deletions

...logs/profanity-settings/profanity-settings.component.scss
src/app/components/creator/_dialogs/profanity-settings/profanity-settings.component.spec.ts 25 additions, 0 deletions

...s/profanity-settings/profanity-settings.component.spec.ts
src/app/components/creator/_dialogs/profanity-settings/profanity-settings.component.ts 85 additions, 0 deletions

...ialogs/profanity-settings/profanity-settings.component.ts
src/app/components/creator/_dialogs/room-description-settings/room-description-settings.component.html 43 additions, 0 deletions

...ription-settings/room-description-settings.component.html
src/app/components/creator/_dialogs/room-description-settings/room-description-settings.component.scss 0 additions, 0 deletions

...ription-settings/room-description-settings.component.scss
src/app/components/creator/_dialogs/room-description-settings/room-description-settings.component.spec.ts 25 additions, 0 deletions

...tion-settings/room-description-settings.component.spec.ts
src/app/components/creator/_dialogs/room-description-settings/room-description-settings.component.ts 57 additions, 0 deletions

...scription-settings/room-description-settings.component.ts
src/app/components/creator/creator.module.ts 5 additions, 1 deletion

src/app/components/creator/creator.module.ts
src/app/components/creator/room-creator-page/room-creator-page.component.html 0 additions, 9 deletions

...reator/room-creator-page/room-creator-page.component.html
src/app/components/creator/room-creator-page/room-creator-page.component.ts 79 additions, 28 deletions

.../creator/room-creator-page/room-creator-page.component.ts
src/app/components/shared/comment/comment.component.html 20 additions, 1 deletion

src/app/components/shared/comment/comment.component.html
src/app/components/shared/comment/comment.component.ts 8 additions, 0 deletions

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

src/app/components/shared/header/header.component.html
src/app/components/shared/header/header.component.ts 42 additions, 31 deletions

src/app/components/shared/header/header.component.ts
src/assets/i18n/creator/de.json 1 addition, 1 deletion

src/assets/i18n/creator/de.json
src/assets/i18n/participant/de.json 17 additions, 0 deletions

src/assets/i18n/participant/de.json
src/assets/i18n/participant/en.json 17 additions, 0 deletions

src/assets/i18n/participant/en.json

with 453 additions and 76 deletions

Please register or to comment