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 possible issues with generating final annotation for merging

Merge branch 'main' of https://gitlab.kiv.zcu.cz/aswi/aswi-2022/aswi20220x00

1. Conflicts:
2. docker-compose.yml

Update docker-compose.yml - set Postgres ver. to 14

Merge branch 'liks' into 'main' Deployement to LIKS

See merge request aswi/aswi-2022/aswi20220x00!71

Deployement to LIKS

Specified postgres version in docker-compose

Added rollback of tag addition/removal

Warning message update.

Added annotation state to document export

Bug fixes

BasePath from env

FE absolute paths, fixed?

FE dockerfile updated

FE changed

BE useRouting changed

Deployment to prefixed location

Merge branch 'tested'

Merge branch 'dev' into tested

Merge branch 'docs/9865-documentation' into 'dev' Re #9865

Documentation added

See merge request aswi/aswi-2022/aswi20220x00!70

Frontend Readme updated

Merge branch 'features/last-changes' into 'dev' Re #9863

Refactoring, bug fixes, enhancements

See merge request aswi/aswi-2022/aswi20220x00!69

Refactoring, fixes

Frontend README added

Build and Startup description

Get user annotations returns all annotations

Removed fetchData infinite cycle

Added more info to UserInfo return DTO

Update docker-compose.yml

Deploy hotfix

Merge branch 'features/Testing-cleanup' into 'dev' Re #9865

cleaning testing, adding new comments to user creation frontend, adding readme

See merge request aswi/aswi-2022/aswi20220x00!68

Testing cleanup + readme

cleaning testing, adding new comments to user creation frontend, adding readme

Backend README.md updated

Merge branch 'features/9831-testing-user-creation' into dev Re #9831

1. Conflicts:
2. Backend/FrontendTesting/FrontendTesting.csproj

Added readme to backend

More comments in backend

Added comments to backend

Merge branch 'tested'

Merge branch 'dev' into tested

Merge branch 'bugs/predeployment-bugfixes' into 'dev' Re #9863

Bug fixes

See merge request aswi/aswi-2022/aswi20220x00!66

Merge branch 'features/9828-docker-compose' into 'dev' Re #9828

Docker-compose added

See merge request aswi/aswi-2022/aswi20220x00!65

docker-compose.yml fixed

docker-compose.yml testing CORS

User detail improved

Reset documents selection after action

Added database migration

Merge branch 'tested'

Merge branch 'dev' into tested

Frontend - hotfix

Merge branch 'bugs/predeployment-bugfixes' into 'dev' Re #9863

Minor bug fixes and improvements

See merge request aswi/aswi-2022/aswi20220x00!64

Document upload improved

Occurrence - like canceling

Recreate document finalization fixed

Tag occurence marked as final - fixed

User annotation preview added

GET /documents returns annotationId for each annotator

docker-compose.yml added

Backend NuGet packages updated

Merge branch 'tested'

Merge branch 'dev' into tested

Merge branch 'features/9776-ui-improvements' into 'dev' Re #9776 Re #9782

UI improvements
Icons changed to FontAwesome, layout updated, colors updated
Export function added

See merge request aswi/aswi-2022/aswi20220x00!63

Document upload description

Export fixed

Fixed error in exported archive

Export in BASE64

Changed remove user CSS transitions

More changes in export and download

Buttons layout on admin documents management updated

Fixed export

annotator's table scroll improved

Tables - scroll instead pagination, export and delete buttons

Merge branch 'features/9776-ui-improvements' of https://gitlab.kiv.zcu.cz/aswi/aswi-2022/aswi20220x00 into features/9776-ui-improvements

Removed unused icon imports

Icons

Annotator - finish button position changed

Admin documents table widths changed

Annotators removing from documents

Admin documents table buttons changes, default annotations count redesigned

Document table column widths changed

Layout and minor color changes

Ordering of users in GET /users

Fixed annotation underline not having correct start and end marks

Added endpoint for removing annotator from document

Added endpoint DELETE /documents

Document export takes only list of doc IDs

Removed paging from GET /documents

Improved sanitization

Final annotations fixed

Small fix

Ordering of documents

Changed endpoint for export

Export in BE

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

Login screen

Merge branch 'features/9826-document-assigning-enhancement' into 'dev' Re #9826

Document assigning modal window was improved - table instead of simple list.

See merge request aswi/aswi-2022/aswi20220x00!60

Merge branch 'features/9829-tag-buttons-tooltips' into 'dev' Re #9829

Tag buttons tooltips were implemented

See merge request aswi/aswi-2022/aswi20220x00!59

Merge branch 'features/9833-default-annotation-count' into dev Re #9833

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

Merge branch 'features/9783-annotation-tag-search' into 'dev' Re #9783

Added search bar to tags panel in the annotation view

See merge request aswi/aswi-2022/aswi20220x00!56

Merge branch 'features/9777-document-notes' into dev Re #9777

1. Conflicts:
2. webapp/components/annotation/DocumentAnnotationView.tsx

Merge branch 'features/9827-display-username' into 'dev' Re #9827

Displaying username in navigation bar was implemented.

See merge request aswi/aswi-2022/aswi20220x00!61

Merge branch 'features/9832-tags-table-sentiment' into 'dev' Re #9832

Added sentiment to tags management

See merge request aswi/aswi-2022/aswi20220x00!57

Merge branch 'bugs/9739-button-tooltip' into dev Re #9739

1. Conflicts:
2. webapp/pages/tags/index.tsx