Merge branch 'revert-36d0e9c2' into 'staging' (18ae9c45) · 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.

18ae9c45

Commit 18ae9c45 authored 3 years ago by

Philipp Sautner

Downloads
- Plain Diff

Merge branch 'revert-36d0e9c2' into 'staging'

Revert "Merge branch 'keywords-to-be-selected' into 'staging'"

See merge request arsnova/topic-cloud!29

parents 36d0e9c2 587a4fdb

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/app/components/shared/_dialogs/create-comment/create-comment.component.html 7 additions, 9 deletions

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

...red/_dialogs/create-comment/create-comment.component.scss
src/app/components/shared/_dialogs/create-comment/create-comment.component.ts 36 additions, 99 deletions

...hared/_dialogs/create-comment/create-comment.component.ts
src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html 5 additions, 22 deletions

.../shared/_dialogs/spacy-dialog/spacy-dialog.component.html
src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.scss 1 addition, 1 deletion

.../shared/_dialogs/spacy-dialog/spacy-dialog.component.scss
src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts 19 additions, 32 deletions

...ts/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
src/assets/i18n/creator/de.json 1 addition, 6 deletions

src/assets/i18n/creator/de.json
src/assets/i18n/creator/en.json 1 addition, 6 deletions

src/assets/i18n/creator/en.json
src/assets/i18n/participant/de.json 1 addition, 6 deletions

src/assets/i18n/participant/de.json
src/assets/i18n/participant/en.json 1 addition, 6 deletions

src/assets/i18n/participant/en.json

with 72 additions and 192 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