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

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