Merge branch 'staging' into 'master' (ca1f1cfa) · Commits · Marc Tröll / frag.jetzt SWTP 2022

Commit ca1f1cfa authored 3 years ago by

Klaus-Dieter Quibeldey-Cirkel

Merge branch 'staging' into 'master'

New header structure, page pagination, bug fixes

See merge request arsnova/frag.jetzt!713

parents 1f338716 035b982d

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 27 additions, 19134 deletions

package-lock.json
projects/ars/src/lib/ars.module.ts 19 additions, 14 deletions

projects/ars/src/lib/ars.module.ts
projects/ars/src/lib/components/content/paginator/ars-mat-paginator/ars-mat-paginator.component.html 11 additions, 0 deletions

...inator/ars-mat-paginator/ars-mat-paginator.component.html
projects/ars/src/lib/components/content/paginator/ars-mat-paginator/ars-mat-paginator.component.scss 25 additions, 0 deletions

...inator/ars-mat-paginator/ars-mat-paginator.component.scss
projects/ars/src/lib/components/content/paginator/ars-mat-paginator/ars-mat-paginator.component.ts 77 additions, 0 deletions

...aginator/ars-mat-paginator/ars-mat-paginator.component.ts
src/app/app.config.ts 3 additions, 1 deletion

src/app/app.config.ts
src/app/app.module.ts 5 additions, 4 deletions

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

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

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

.../creator/room-creator-page/room-creator-page.component.ts
src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.html 37 additions, 15 deletions

...erator-comment-list/moderator-comment-list.component.html
src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.scss 4 additions, 0 deletions

...erator-comment-list/moderator-comment-list.component.scss
src/app/components/moderator/moderator-comment-list/moderator-comment-list.component.ts 114 additions, 149 deletions

...oderator-comment-list/moderator-comment-list.component.ts
src/app/components/moderator/moderator.module.ts 17 additions, 15 deletions

src/app/components/moderator/moderator.module.ts
src/app/components/moderator/room-moderator-page/room-moderator-page.component.html 2 additions, 6 deletions

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

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

...ator/room-moderator-page/room-moderator-page.component.ts
src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.ts 53 additions, 20 deletions

...t/_dialogs/user-bonus-token/user-bonus-token.component.ts
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 10 additions, 2 deletions

...oom-participant-page/room-participant-page.component.scss

with 429 additions and 19378 deletions

Please register or to comment