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

Commit af108b9b authored 3 years ago by

Klaus-Dieter Quibeldey-Cirkel

Browse files

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

parents 4c9cba58 6be1c854

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 2179 additions, 1854 deletions

package-lock.json
package.json 1 addition, 0 deletions

package.json
src/app/app.module.ts 4 additions, 4 deletions

src/app/app.module.ts
src/app/components/creator/_dialogs/bonus-token/bonus-token.component.html 27 additions, 21 deletions

...s/creator/_dialogs/bonus-token/bonus-token.component.html
src/app/components/creator/_dialogs/bonus-token/bonus-token.component.ts 50 additions, 5 deletions

...nts/creator/_dialogs/bonus-token/bonus-token.component.ts
src/app/components/creator/room-creator-page/room-creator-page.component.html 1 addition, 1 deletion

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

...reator/room-creator-page/room-creator-page.component.scss
src/app/components/home/home-page/home-page.component.html 10 additions, 1 deletion

src/app/components/home/home-page/home-page.component.html
src/app/components/home/home-page/home-page.component.ts 6 additions, 3 deletions

src/app/components/home/home-page/home-page.component.ts
src/app/components/home/new-landing/new-landing.component.html 4 additions, 1 deletion

...pp/components/home/new-landing/new-landing.component.html
src/app/components/moderator/room-moderator-page/room-moderator-page.component.html 1 addition, 1 deletion

...or/room-moderator-page/room-moderator-page.component.html
src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss 0 additions, 4 deletions

...or/room-moderator-page/room-moderator-page.component.scss
src/app/components/participant/room-participant-page/room-participant-page.component.html 1 addition, 1 deletion

...oom-participant-page/room-participant-page.component.html
src/app/components/participant/room-participant-page/room-participant-page.component.scss 0 additions, 4 deletions

...oom-participant-page/room-participant-page.component.scss
src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.html 23 additions, 37 deletions

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

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

...logs/cloud-configuration/cloud-configuration.component.ts
src/app/components/shared/_dialogs/create-comment/create-comment.component.html 1 addition, 4 deletions

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

...hared/_dialogs/create-comment/create-comment.component.ts
src/app/components/shared/_dialogs/joyride-template/joyride-template.component.html 22 additions, 0 deletions

..._dialogs/joyride-template/joyride-template.component.html

with 2384 additions and 1982 deletions

Please register or to comment