Projekt

Obecné

Profil

Statistiky
| Větev: | Tag: | Revize:

# Datum Autor Komentář
669ffe38 2022-05-05 15:05 Jaroslav Hrubý

Refactoring after code review

d845a737 2022-05-05 13:01 Vojtěch Bartička

Added role to GET /users

9980241e 2022-05-03 15:25 Jaroslav Hrubý

User filtering implemented

faa3619b 2022-05-02 12:58 Vojtěch Bartička

Added assigned documents count to GET /users

b7e18e03 2022-05-02 11:04 Jaroslav Hrubý

README edit

0db53e25 2022-05-02 11:04 Jaroslav Hrubý

Document filtering implemented

3e251fec 2022-05-01 15:41 Vojtěch Bartička

Merge branch 'features/9582-deployment' into 'dev' Re #9582

Deploymnet, Dockerfile, Gitlab-ci, env for backend url

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

7f244939 2022-05-01 15:41 Lukáš Vlček

Re #9582

1c9bc808 2022-04-29 19:24 Vojtěch Bartička

Merge branch 'features/9588-Testing-Backend-Documents' into 'dev' Re #9588

Add and get documents from database

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

b2594803 2022-04-29 18:43 Jakub Schenk

User tests corrections

User tests corrected the way bugs were fixed and application was corrected after 1st test report

065f6462 2022-04-29 17:48 Jakub Schenk

Namespace correction

Merge request respond corrections - namespaces and name of MakeRequest() method

ac3387f3 2022-04-28 12:18 Vojtěch Bartička

Merge branch 'features/9670-tag-padding' into 'dev' Re #9670

Implemented intersection calculations and graph coloring to calculate padding

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

8dc25caa 2022-04-28 09:39 Vojtěch Bartička

Added padding size calculation to html rendering

3e5bde59 2022-04-27 09:43 Vojtěch Bartička

Merge branch 'features/9657-backend-tag-tree-order' into 'dev' Re #9657

Ordering of categories, tags and subtags in TagServiceEF.GetTagTree

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

b5a8f370 2022-04-27 09:42 Vojtěch Bartička

Merge branch 'features/9660-backend-annotation-optimization' into 'dev' Re #9660

Document rendering is now done on the first annotation load, then it is cached. Adding or removing tags is done incrementally.

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

f3c42457 2022-04-27 08:11 Vojtěch Bartička

Ordering of tags in GetTagTree

553486ad 2022-04-27 07:51 Vojtěch Bartička

Added caching and incremental updates to annotations

0f58bb56 2022-04-26 17:27 Jakub Schenk

Testing of documents in backend

Add and get documents from database

97581398 2022-04-26 17:03 Vojtěch Bartička

Merge branch 'features/9585-9590-user-management' into 'dev' Re #9590 Re #9585

User management (create, edit, delete) and document assigning were implemented.

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

43d49a98 2022-04-25 12:46 Jaroslav Hrubý

Modal windows for user edit, delete and assigned documents were implemented

78122c3a 2022-04-25 08:59 Vojtěch Bartička

DeleteUser save changes

20f0da33 2022-04-25 08:51 Vojtěch Bartička

Merge branch 'features/9585-document-assigning' into features/9590-user-management

  1. Conflicts:
  2. webapp/api/api.ts
f37d2b59 2022-04-25 08:42 Vojtěch Bartička

Added endpoint for user delete

11b41a50 2022-04-25 08:38 Vojtěch Bartička

Annotations not created on document upload

82ba2ee5 2022-04-24 18:59 Jaroslav Hrubý

Users table implemented

9bfa1e39 2022-04-24 17:33 Jaroslav Hrubý

Document assigning implemented

f7aa763d 2022-04-21 10:13 Vojtěch Bartička

Added endpoint for user creation

951ce8d3 2022-04-21 10:02 Vojtěch Bartička

Merge branch 'bugs/9578-user-empty-password' into 'dev' Re #9578

Check if an empty password or null is passed during user creation and password change

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

a9acbe07 2022-04-21 10:01 Vojtěch Bartička

Created endpoint for changing user information

4733e8c2 2022-04-21 09:32 Vojtěch Bartička

Endpoint for user annotations with ID in path

4ebfa716 2022-04-21 09:03 Vojtěch Bartička

Check if password is empty or null

f5061dbe 2022-04-20 17:58 Vojtěch Bartička

Merge branch 'features/9579-autentization-testing' into 'dev' Autentization and user testing (backend and frontend)

User tested for creation, updating and autentication
Login tested for logging in via username and password
Frontend tested /login page

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

c1e3df97 2022-04-20 12:35 Vojtěch Bartička

Merge branch 'features/9584-documents-table' into 'dev' Re #9584

Documents table in document management (admin view)

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

87fd0356 2022-04-20 12:34 Lukáš Vlček

Admin can also load documents assigned to him for annotation

c6109e2d 2022-04-20 12:34 Lukáš Vlček

Document table added for admin (document management)

86d4a2b7 2022-04-20 11:59 Vojtěch Bartička

Merge branch 'features/9583-small-demo-changes' into 'dev' Re #9583

Documents assigned to users on document upload

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

005202c6 2022-04-20 11:53 Vojtěch Bartička

Users assigned on document upload

295e9198 2022-04-19 14:46 Vojtěch Bartička

Merge branch 'features/9480-backend-annotation-visualisation' into 'dev' Re #9480

Beta version of annotation rendering implemented in backend

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

c9762683 2022-04-19 14:43 Vojtěch Bartička

Fixed indexing bugs in backend, minor changes in frontend

0a9f9349 2022-04-19 13:37 Vojtěch Bartička

Backend document rendering

778fd294 2022-04-19 13:35 Vojtěch Bartička

Merge branch 'features/9465-documents-upload' into 'dev' Re #9465

Modal window uploading new documents was finished and connected to server API.

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

441d6054 2022-04-19 13:35 Vojtěch Bartička

Merge branch 'features/9466-list-documents-annotator' into 'dev' Re #9466

Table showing anotator's documents was implemented.

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

4a7bae81 2022-04-19 11:24 Jaroslav Hrubý

Documents upload implemented, connected to REST API

414636c0 2022-04-19 07:01 Jakub Schenk

commentary

new comments for testing classes and messages for failed tests

2d8c65b5 2022-04-18 17:32 Jakub Schenk

Frontend login testing

Frontend login tested for correct and incorrect inputs

06d1aa21 2022-04-18 14:52 Jaroslav Hrubý

Refactoring

f0567ed4 2022-04-18 14:46 Jakub Schenk

utils

utils added for frontend testing - drivers

d65e75d9 2022-04-18 14:46 Jakub Schenk

Frontend testing

frontend testing base

ba13a48a 2022-04-18 14:46 Jakub Schenk

backend login

login on backend tested (JwtUtils in Utils inicialization)

ea53e0e1 2022-04-18 14:46 Jakub Schenk

user testing

first of was user testing mandatory, before testing autentization - with this user should be properly tested

cb624ba8 2022-04-17 18:23 Jaroslav Hrubý

Merge remote-tracking branch 'origin/dev' into features/9466-list-documents-annotator

  1. Conflicts:
  2. webapp/pages/documents/admin/index.tsx
  3. webapp/pages/documents/annotator/index.tsx
4e871c6f 2022-04-17 14:05 Vojtěch Bartička

Merge branch 'features/9475-9478-annotations' into 'dev' Re #9475 Re #9478

Document text selection, adding tag/subtag to selected text, removing annotation occurrences

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

51f70e00 2022-04-17 13:56 Lukáš Vlček

Build fixed

9fdb7d55 2022-04-17 13:56 Lukáš Vlček

Deleting occurences

3f66b624 2022-04-17 13:52 Lukáš Vlček

Comments added to selection utils

8316c102 2022-04-17 13:52 Vojtěch Bartička

Last fix

77667f3f 2022-04-17 13:51 Vojtěch Bartička

Minor rename

2ebf32d0 2022-04-17 13:49 Vojtěch Bartička

Changed Id to OccurenceId in TagInstanceInfo

0f8d6304 2022-04-17 13:41 Vojtěch Bartička

Endpoint for annotation instance deletion - untested

4bc99591 2022-04-17 13:24 Lukáš Vlček

Adding tag/subtag to selected text

abf94f21 2022-04-17 13:23 Lukáš Vlček

Backend - saving data fixed

d08c4fb0 2022-04-17 12:45 Vojtěch Bartička

Fixed error in AnnotationController

69af9d49 2022-04-17 12:38 Vojtěch Bartička

Merge branch 'features/9475-9478-annotations' of https://gitlab.kiv.zcu.cz/aswi/aswi-2022/aswi20220x00 into features/9475-9478-annotations

be4deff8 2022-04-17 12:38 Vojtěch Bartička

Minor fixes, added annotation instance endpoint - untested

c2192cda 2022-04-17 12:12 Lukáš Vlček

Selection detection and calculation of start and end position in original document

8837ddf3 2022-04-17 12:03 Vojtěch Bartička

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

HTML preprocessing and sanitization (removing all original attributes from HTML)
Showing HTML on frontend

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

ec1d738f 2022-04-17 12:01 Vojtěch Bartička

Merge branch 'features/9481-frontend-annotation-panel' into dev Re #9481

  1. Conflicts:
  2. webapp/pages/annotation/[id].tsx
8d667501 2022-04-17 11:48 Vojtěch Bartička

Merge branch 'features/9477-frontend-annotation-tag-tree' into 'dev' Re #9477

Implemented a left panel that shows a tree of tags

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

b5f60842 2022-04-17 11:40 Lukáš Vlček

Document preview on frontend

bae9fbba 2022-04-17 11:16 Jaroslav Hrubý

Table of annotator's documents implemented

b5df208d 2022-04-17 10:44 Vojtěch Bartička

Fixed tag length detection

3c185841 2022-04-17 10:11 Vojtěch Bartička

HTML preprocessing and sanitization

76242338 2022-04-17 00:37 Dominik Poch

Connected annotation panel to API and updated visual

9a41c02f 2022-04-17 00:35 Dominik Poch

Added mapped annotation

Mapped annotation to instance and separated them to different tag occurrences

2c9bdf18 2022-04-16 23:14 Dominik Poch

Upgraded visual of the tag tree

6d6613d4 2022-04-16 23:13 Dominik Poch

Changed colors of dummy tags

Changed colors of dummy tags to show different colors in the tag tree

7652cf88 2022-04-16 20:47 Lukáš Vlček

Basic annotation document preview

0441c314 2022-04-16 20:42 Dominik Poch

Added comments

5593c10b 2022-04-16 20:37 Dominik Poch

Connected tag panel to server

ab68c8da 2022-04-16 20:33 Dominik Poch

Tag selection

Report when tag is selected

b8cae450 2022-04-16 20:13 Dominik Poch

Context for category

Changed context of tags to context of categories

ed01528f 2022-04-16 19:56 Dominik Poch

Implemented tag panel

Implemented tag panel and all its items

7595035c 2022-04-16 19:52 Lukáš Vlček

AnnotationID as dynamic route part in annotation page

484f2ac1 2022-04-16 19:49 Dominik Poch

Tag context

Added context that handles tags

a37f82ce 2022-04-16 19:43 Lukáš Vlček

Minor login optimisation

dd747fc5 2022-04-16 19:42 Lukáš Vlček

API regenerated

351d73ea 2022-04-16 19:09 Vojtěch Bartička

Merge branch 'features/9473-backend-document-annotation-api' into 'dev' Re #9473

Fixed some issues with GET requests requiring a body

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

351351fa 2022-04-16 18:58 Lukáš Vlček

Re #9453

Login, Token management

7a32656e 2022-04-16 18:56 Jaroslav Hrubý

Refactoring

8c45ccb0 2022-04-16 18:49 hrubyjar

Token management implemented, redirections

42c654f6 2022-04-16 18:30 Vojtěch Bartička

Same fix in DocumentController - moved to QueryParams

f6eca400 2022-04-16 16:09 Vojtěch Bartička

Merge branch 'features/9481-frontend-annotation-panel' into 'dev' Re #9481

Renamed files, fixed overflow in annotation view, added access to the AnnotationContext in the annotation view, deleted visibility from add document modal window, deleted LayoutProps...

c0c74381 2022-04-16 16:08 Vojtěch Bartička

Annotation controller id in path, not request body

acb8a961 2022-04-16 15:40 Dominik Poch

Added comments

c73aecde 2022-04-16 14:48 Dominik Poch

Renamed files, fixed overflow in annotation view, added access to the AnnotationContext in annotation view, deleted visiblity from add document modal window, deleted LayoutProps

34e9f2d3 2022-04-16 09:31 Lukáš Vlček

AnnotationContext use demo

c057279b 2022-04-16 09:30 Lukáš Vlček

AnnotationContext added

3e6b15a7 2022-04-16 09:29 Lukáš Vlček

Current API model generated

a80db039 2022-04-16 09:04 Dominik Poch

Initialization of tags in annotation view

Initialized tags and created event handlers in the annotation view

4e91ed40 2022-04-16 09:01 Dominik Poch

Annotation panel events

Added events that propagate changes between panels in the annotation view