Merge branch '163-offer-option-for-moderators' into 'staging' (02654fdc) · Commits · Marc Tröll / frag.jetzt SWTP 2022 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

frag.jetzt SWTP 2022
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

02654fdc

Commit 02654fdc authored 3 years ago by

Klaus-Dieter Quibeldey-Cirkel

Downloads
- Plain Diff

Merge branch '163-offer-option-for-moderators' into 'staging'

From '163-offer-option-for-moderators' into staging

Closes #164 and #163

See merge request arsnova/topic-cloud!73

parents 13e645a1 abd50ceb

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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/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 8 additions, 0 deletions

src/app/services/util/room-data.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 42 additions and 6 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment