Merge branch 'master' into '667-refactor-create-composable-components' (ab384c1c) · Commits · Marc Tröll / frag.jetzt SWTP 2022

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

Commit ab384c1c authored 3 years ago by

Lukas Haase

Merge branch 'master' into '667-refactor-create-composable-components'

# Conflicts:
#   src/app/components/creator/room-creator-page/room-creator-page.component.ts

parents 50e51efe fd48d6b6

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/app/components/creator/_dialogs/bonus-token/bonus-token.component.html 18 additions, 4 deletions

...s/creator/_dialogs/bonus-token/bonus-token.component.html
src/app/components/creator/_dialogs/bonus-token/bonus-token.component.scss 23 additions, 2 deletions

...s/creator/_dialogs/bonus-token/bonus-token.component.scss
src/app/components/creator/_dialogs/bonus-token/bonus-token.component.ts 15 additions, 6 deletions

...nts/creator/_dialogs/bonus-token/bonus-token.component.ts
src/app/components/creator/_dialogs/room-description-settings/room-description-settings.component.ts 6 additions, 25 deletions

...scription-settings/room-description-settings.component.ts
src/app/components/creator/_dialogs/room-name-settings/room-name-settings.component.html 28 additions, 0 deletions

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

...logs/room-name-settings/room-name-settings.component.scss
src/app/components/creator/_dialogs/room-name-settings/room-name-settings.component.spec.ts 26 additions, 0 deletions

...s/room-name-settings/room-name-settings.component.spec.ts
src/app/components/creator/_dialogs/room-name-settings/room-name-settings.component.ts 47 additions, 0 deletions

...ialogs/room-name-settings/room-name-settings.component.ts
src/app/components/creator/creator.module.ts 3 additions, 1 deletion

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

...reator/room-creator-page/room-creator-page.component.html
src/app/components/creator/room-creator-page/room-creator-page.component.scss 5 additions, 0 deletions

...reator/room-creator-page/room-creator-page.component.scss
src/app/components/creator/room-creator-page/room-creator-page.component.ts 11 additions, 0 deletions

.../creator/room-creator-page/room-creator-page.component.ts
src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.html 18 additions, 4 deletions

..._dialogs/user-bonus-token/user-bonus-token.component.html
src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.scss 22 additions, 0 deletions

..._dialogs/user-bonus-token/user-bonus-token.component.scss
src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.ts 14 additions, 6 deletions

...t/_dialogs/user-bonus-token/user-bonus-token.component.ts
src/app/components/shared/_dialogs/deep-ldialog/deep-ldialog.component.ts 1 addition, 2 deletions

...ts/shared/_dialogs/deep-ldialog/deep-ldialog.component.ts
src/app/components/shared/_dialogs/remove-from-history/remove-from-history.component.html 5 additions, 3 deletions

...gs/remove-from-history/remove-from-history.component.html
src/app/components/shared/_dialogs/topic-cloud-administration/TopicCloudAdminData.ts 102 additions, 24 deletions

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

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

...-administration/topic-cloud-administration.component.scss

with 405 additions and 83 deletions

Please register or to comment