ASWI - Pokročilé softwarové inženýrství » ASWI 2022 » Anotace pro analýzu smluvních podmínek a skrytých reklam (AV ČR) - 0x00

Fixed a missed merge issue

Merge branch 'features/9664-annotation-count-display' into dev Re #9664

1. Conflicts:
2. Backend/Backend/Controllers/DocumentController.cs
3. Backend/Core/Services/DocumentService/DocumentServiceEF.cs
4. Backend/Core/Services/DocumentService/IDocumentService.cs...

Merge branch 'features/9678-duplicate-tag-control' into dev Re #9678

1. Conflicts:
2. Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

Merge branch 'features/9677-sentiment-annotation' into dev Re #9677

1. Conflicts:
2. webapp/api/api.ts
   Regenerate client api, merged

Merge branch 'features/9593-tag-management' into dev Re #9593

1. Conflicts:
2. Backend/Core/Services/TagService/TagServiceEF.cs
3. webapp/api/api.ts
   Merged api.ts, regenerate client api

Added sentiment to GET /annotation/id

Ordering of tags in GET /tags

Merge branch 'features/9673-admin-document-preview' into dev Re #9673

1. Conflicts:
2. webapp/api/api.ts
3. webapp/pages/documents/admin/index.tsx

Regenerate client api, merged manually

Annotation state returned with document list info

Order tags by position