Merge branch 'staging' into 634-set-other-default-values-for-the-profanity-filter (f57b9ef3) · 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.

f57b9ef3

Commit f57b9ef3 authored 3 years ago by

Ruben Bimberg

Downloads
- Plain Diff

Merge branch 'staging' into 634-set-other-default-values-for-the-profanity-filter

# Conflicts:
#	src/app/services/http/spacy.service.ts

parents 1c31f284 d60f2001

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts 2 additions, 2 deletions

...ts/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts 17 additions, 17 deletions

...ud-administration/topic-cloud-administration.component.ts
src/app/components/shared/comment-list/comment-list.component.ts 2 additions, 2 deletions

.../components/shared/comment-list/comment-list.component.ts
src/app/components/shared/comment/comment.component.ts 1 addition, 1 deletion

src/app/components/shared/comment/comment.component.ts
src/app/components/shared/tag-cloud/tag-cloud-pop-up/tag-cloud-pop-up.component.ts 6 additions, 6 deletions

.../tag-cloud/tag-cloud-pop-up/tag-cloud-pop-up.component.ts
src/app/services/http/spacy.service.ts 3 additions, 40 deletions

src/app/services/http/spacy.service.ts
src/app/services/util/tag-cloud-data.service.ts 2 additions, 2 deletions

src/app/services/util/tag-cloud-data.service.ts
src/app/services/util/topic-cloud-admin.service.ts 1 addition, 1 deletion

src/app/services/util/topic-cloud-admin.service.ts
src/app/utils/filter-options.ts 1 addition, 1 deletion

src/app/utils/filter-options.ts

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