ASWI - Pokročilé softwarové inženýrství » ASWI 2022 » Zpracování geografických údajů v novoasyrských textech (KBS FF) - Code of Duty

button openable dialog now closes correctly

re #9741

import export part 1

re #9741

autozoom + file upload

re #9741

path dragging and adjustment seems functional

draggable

re #9741

draggable map marker pt1

re #9741

Merge branch 'bugfix/#9747_Coordinates_Null_Fix' into 'develop'

merge fixes

See merge request aswi/aswi-2022/aswi2022code-of-duty!49

merge fixes

Merge branch 'develop' of https://gitlab.kiv.zcu.cz/aswi/aswi-2022/aswi2022code-of-duty into develop

1. Conflicts:
2. backend/src/main/java/cz/zcu/kiv/backendapi/config/CorsConfig.java
3. backend/src/main/java/cz/zcu/kiv/backendapi/security/SecurityConfig.java

Merge branch 'bugfix/#9747_Coordinates_Null_Fix' into 'develop'

coordinates null fix merge

See merge request aswi/aswi-2022/aswi2022code-of-duty!48

Merge branch 'develop' into 'bugfix/#9747_Coordinates_Null_Fix'

1. Conflicts:
2. frontend/src/features/redux/store.ts

Fixed sql file reformatted by push

re #9753

Updated files generated from swagger and code refactor
re #9802

Button renamed
re #9821

Administation page finished
re #9818

Newly swagger generated files
re #9627

Fixed registering a closing the dialog after success
re #9627

Refactor of administration page and user registration
re #9627

Fixed sql file reformatted by push

re #9753

Added missing comments, code refactoring

re #9743

Database exported to script
- removed initialization from application
- updated docker-compose.yml to create volume and add data from script

re #9746

Rights fixed (for external catalog, others are OK)

re #9744

Changed password, email and name for ADMIN

re #9756

Added Super Admin user

re #9790

Added sources (can add/edit bibliography page)

re #9788

Catalog change
- one-to-many associations now persist order
- text for search persists separators

re #9751
re #9754

Added two external catalog items sources

re #9752

Changed that user with ADMIN rights can not be removed

re #9755

Added new source file with catalog items

re #9750

Changed password DTO access to write only

re #9620

Fixed user registration bad constraint

re #9620

Creation of administration page and user registration
re #9627

coordinates fix

Fixed sql file reformatted by push

re #9753

Merge remote-tracking branch 'origin/develop' into develop

Fixed sql file reformatted by push

re #9753

Updated files generated from swagger and code refactor
re #9802

Button renamed
re #9821

Merge branch 'feature/#9818_administration_page' into 'develop'

Refactor of administration page and user registration

See merge request aswi/aswi-2022/aswi2022code-of-duty!46

Merge remote-tracking branch 'origin/develop' into feature/#9818_administration_page

1. Conflicts:
2. backend/docker-compose.yml
3. backend/src/main/java/cz/zcu/kiv/backendapi/config/CorsConfig.java
4. backend/src/main/java/cz/zcu/kiv/backendapi/security/SecurityConfig.java

Administation page finished
re #9818

Merge branch 'feature/#9743_Refactor' into 'develop'

Added missing comments, code refactoring

See merge request aswi/aswi-2022/aswi2022code-of-duty!45

Added missing comments, code refactoring

re #9743

Merge branch 'feature/#9746_Database_Export' into 'develop'

Database exported to script

See merge request aswi/aswi-2022/aswi2022code-of-duty!44

Database exported to script
- removed initialization from application
- updated docker-compose.yml to create volume and add data from script

re #9746

Merge branch 'feature/#9744_Rights' into 'develop'

Rights fixed (for external catalog, others are OK)

See merge request aswi/aswi-2022/aswi2022code-of-duty!43

Rights fixed (for external catalog, others are OK)

re #9744

Merge branch 'feature/#9756_Admin_Change' into 'develop'

Changed password, email and name for ADMIN

See merge request aswi/aswi-2022/aswi2022code-of-duty!42

Changed password, email and name for ADMIN

re #9756

Merge branch 'feature/##9790_Super_Admin' into 'develop'

Added Super Admin user

See merge request aswi/aswi-2022/aswi2022code-of-duty!41

Added Super Admin user

re #9790

Merge branch 'feature/#9788_Sources' into 'develop'

Added sources (can add/edit bibliography page)

See merge request aswi/aswi-2022/aswi2022code-of-duty!40

Added sources (can add/edit bibliography page)

re #9788

Merge branch 'feature/#9754_#9751_Catalog_Edit' into 'develop'

Catalog change

See merge request aswi/aswi-2022/aswi2022code-of-duty!39

Catalog change
- one-to-many associations now persist order
- text for search persists separators

re #9751
re #9754

Merge branch 'feature/#9752_External_Catalog' into 'develop'

Added two external catalog items sources

See merge request aswi/aswi-2022/aswi2022code-of-duty!38

Added two external catalog items sources

re #9752

Merge branch 'feeature/#9755_Admin_Removal' into 'develop'

Changed that user with ADMIN rights can not be removed

See merge request aswi/aswi-2022/aswi2022code-of-duty!37

Changed that user with ADMIN rights can not be removed

re #9755

Merge branch 'feature/#9750_Bibliography' into 'develop'

Added new source file with catalog items

See merge request aswi/aswi-2022/aswi2022code-of-duty!36

Added new source file with catalog items

re #9750

Newly swagger generated files
re #9627

Fixed registering a closing the dialog after success
re #9627

Merge remote-tracking branch 'origin/develop' into feature/9627_administration_page

Refactor of administration page and user registration
re #9627

Changed password DTO access to write only

re #9620

Fixed user registration bad constraint

re #9620

Merge branch 'feature/9627_administration_page' into 'develop'

Creation of administration page and user registration

See merge request aswi/aswi-2022/aswi2022code-of-duty!34

Merge remote-tracking branch 'origin/develop' into feature/9627_administration_page

Creation of administration page and user registration
re #9627

Merge remote-tracking branch 'origin/develop' into feature/#9630_Frontend_Responsive

1. Conflicts:
2. frontend/src/features/Catalog/AddNewLocationDialog.tsx

Merge remote-tracking branch 'origin/develop' into develop

Fixed single punctuation character in path search error

re #9620

Merge branch 'feature/#9629_Map_Tooling' into 'develop'

Merge Map Tooling to Develop

See merge request aswi/aswi-2022/aswi2022code-of-duty!33

Adjustments

re #9629

Persist navigation state

re #9630

path autorefresh works as intended

re #9629

refactor to use Redux instead of localstate

re #9629

map displays correctly

re #9629

Nonrecursive algorithm for path building + path rendering on map

re #9629

path building algorithm implementation

re #9629

Send text query to the api

re #9629

hotfix edit home broke after merge

hotfix rename LoginDialog to LoginDialog from RegisterDialog

re #9628

Merge branch 'feature/#9628_Login_As_Dialog' into 'develop'

Login dialog + slice for notifications

See merge request aswi/aswi-2022/aswi2022code-of-duty!32

Merge branch 'feature/#9628_Login_As_Dialog' of https://gitlab.kiv.zcu.cz/aswi/aswi-2022/aswi2022code-of-duty into feature/#9628_Login_As_Dialog

1. Conflicts:
2. frontend/src/App.tsx

Merge remote-tracking branch 'origin/develop' into feature/#9628_Login_As_Dialog

1. Conflicts:
2. frontend/src/App.tsx

Merge branch 'develop' into 'feature/#9628_Login_As_Dialog'

1. Conflicts:
2. frontend/src/App.tsx

Show dialog in login page

re #9628

Merge branch 'feature/#9624_External_catalog' into 'develop'

Added loading of external catalog items

See merge request aswi/aswi-2022/aswi2022code-of-duty!31

Added controller and some tests for external catalog

re #9624

Merge branch 'feature/9129-title-page' into 'develop'

Formating of Home page

See merge request aswi/aswi-2022/aswi2022code-of-duty!30

Formating of Home page
re #9714

Login dialog + slice for notifications

re #9628

Merge branch 'feature/#9626_Correct_HTML_Escaping_In_Catalog' into 'develop'

Merge

See merge request aswi/aswi-2022/aswi2022code-of-duty!29

DomPurify + Escaping Impl

re #9626

Added loading of external catalog items

re #9624

Merge branch 'feature/#9625_Coordinates_change' into 'develop'

Changed coordinates to null from 0.0 when not known

See merge request aswi/aswi-2022/aswi2022code-of-duty!26

Changed coordinates to null from 0.0 when not known

re #9625

Merge branch 'feature/#9547_map_page_and_path_visualization' into 'develop'

MERGE

See merge request aswi/aswi-2022/aswi2022code-of-duty!25