Projekt

Obecné

Profil

Aktivita

Od 2022-04-24 do 2022-05-23

2022-05-21

12:23 Revize 14588cb6 (aswi2022code-of-duty-gitlab): fixed keys and indices
re #9741 Václav Honzík
10:18 Revize fc8a530f (aswi2022code-of-duty-gitlab): Pagination
re #9741 Václav Honzík
07:40 Revize cc9259b0 (aswi2022code-of-duty-gitlab): Merge remote-tracking branch 'origin/develop' into develop
Jakub Šmíd
07:40 Revize ad885d86 (aswi2022code-of-duty-gitlab): Loading of path speeded up
re #9753 Jakub Šmíd

2022-05-20

18:37 Revize 48690561 (aswi2022code-of-duty-gitlab): smol refactor
re #9741 Václav Honzík
14:01 Revize fe068d3a (aswi2022code-of-duty-gitlab): External sources sending file fixed
re #9821 Michal Schwob
13:58 Revize d9c68ec4 (aswi2022code-of-duty-gitlab): Homepage formated
re #9821 Michal Schwob
13:50 Revize 766847b8 (aswi2022code-of-duty-gitlab): Merge remote-tracking branch 'origin/develop' into develop
Jakub Šmíd
13:50 Revize 33523b92 (aswi2022code-of-duty-gitlab): SQL for deleting external catalog items changed
re #9753 Jakub Šmíd

2022-05-19

18:13 Revize 26f9c9ff (aswi2022code-of-duty-gitlab): toggles for specific map points
re #9741 Václav Honzík
17:18 Revize 08854c45 (aswi2022code-of-duty-gitlab): better icon
re #9741 Václav Honzík
17:10 Revize c0b66eaf (aswi2022code-of-duty-gitlab): map icon colors start
re #9741 Václav Honzík
13:04 Revize 80e18558 (aswi2022code-of-duty-gitlab): import dialogs more fleshed out
re #9741 Václav Honzík
11:49 Revize f41a4cd3 (aswi2022code-of-duty-gitlab): import menu start
re #9741 Václav Honzík
09:47 Revize 59f8628f (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9741_Tracking_Tool' of https://gitlab.kiv.zcu.cz/aswi/aswi-2022/aswi2022code-of-duty into feature/#9741_Tracking_Tool
Václav Honzík
09:46 Revize 7d477849 (aswi2022code-of-duty-gitlab): reidxing + drag jump fix
re #9741 Václav Honzík
09:44 Revize 40e45314 (aswi2022code-of-duty-gitlab): reidxing + drag jump fix
Václav Honzík

2022-05-18

20:59 Revize 96750f4d (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9811_sources_page' into 'develop'
Sources page implemented
See merge request aswi/aswi-2022/aswi2022code-of-duty!54 Michal Schwob
20:58 Revize 6201c1fb (aswi2022code-of-duty-gitlab): Merge remote-tracking branch 'origin/develop' into feature/#9811_sources_page
# Conflicts:
# frontend/src/App.tsx Michal Schwob
20:57 Revize 2decf37e (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9812_external_sources_page' into 'develop'
Page for external sources created
See merge request aswi/aswi-2022/aswi2022code-of-duty!53 Michal Schwob
20:56 Revize 6d8ac067 (aswi2022code-of-duty-gitlab): Page for external sources created
re #9812 Michal Schwob

2022-05-17

19:07 Revize dc8777af (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9741_Tracking_Tool' into 'develop'
right click popup menu
See merge request aswi/aswi-2022/aswi2022code-of-duty!52 Václav Honzík
19:03 Revize 1e2f25c9 (aswi2022code-of-duty-gitlab): somewhat functional reoder with visibility toggles
re #9741 Václav Honzík
18:54 Revize 56018f1c (aswi2022code-of-duty-gitlab): right click popup menu
re #9741 Václav Honzík
18:12 Revize a962f3ea (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9741_Tracking_Tool' into 'develop'
tracking tool update
See merge request aswi/aswi-2022/aswi2022code-of-duty!51 Václav Honzík
17:55 Revize 812b9f90 (aswi2022code-of-duty-gitlab): draggable list start
re #9741 Václav Honzík
11:16 Revize 0598e57d (aswi2022code-of-duty-gitlab): Added batch endpoint for saving multiple catalog items, POST and PUT endpoint for catalog items merged
re #9753 Jakub Šmíd

2022-05-16

21:44 Revize 7aa6893d (aswi2022code-of-duty-gitlab): button openable dialog now closes correctly
re #9741 Václav Honzík
21:34 Revize dfa67c4b (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9741_Tracking_Tool' into 'develop'
merge for deployment
See merge request aswi/aswi-2022/aswi2022code-of-duty!50 Václav Honzík
21:33 Revize a7ae217f (aswi2022code-of-duty-gitlab): import export part 1
re #9741 Václav Honzík
15:25 Revize 11fca75a (aswi2022code-of-duty-gitlab): autozoom + file upload
re #9741 Václav Honzík
14:47 Revize 7b864a5c (aswi2022code-of-duty-gitlab): path dragging and adjustment seems functional
Václav Honzík
14:04 Revize de12c6be (aswi2022code-of-duty-gitlab): draggable
re #9741 Václav Honzík
09:05 Revize b45d0300 (aswi2022code-of-duty-gitlab): draggable map marker pt1
re #9741 Václav Honzík
08:28 Revize 1f16b100 (aswi2022code-of-duty-gitlab): Merge branch 'bugfix/#9747_Coordinates_Null_Fix' into 'develop'
merge fixes
See merge request aswi/aswi-2022/aswi2022code-of-duty!49 Václav Honzík
08:28 Revize 81698b9a (aswi2022code-of-duty-gitlab): merge fixes
Václav Honzík
08:06 Revize 42048c18 (aswi2022code-of-duty-gitlab): Merge branch 'develop' of https://gitlab.kiv.zcu.cz/aswi/aswi-2022/aswi2022code-of-duty into develop
# Conflicts:
# backend/src/main/java/cz/zcu/kiv/backendapi/config/CorsConfig.java
# backend/src/main/java... Václav Honzík
07:52 Revize 55e2f06a (aswi2022code-of-duty-gitlab): Merge branch 'bugfix/#9747_Coordinates_Null_Fix' into 'develop'
coordinates null fix merge
See merge request aswi/aswi-2022/aswi2022code-of-duty!48 Václav Honzík
07:51 Revize a6f0f2fc (aswi2022code-of-duty-gitlab): Merge branch 'develop' into 'bugfix/#9747_Coordinates_Null_Fix'
# Conflicts:
# frontend/src/features/redux/store.ts Václav Honzík
07:49 Revize 42d6faf7 (aswi2022code-of-duty-gitlab): Fixed sql file reformatted by push
re #9753 Jakub Šmíd
07:49 Revize b61ca51b (aswi2022code-of-duty-gitlab): Updated files generated from swagger and code refactor
re #9802 Michal Schwob
07:49 Revize ffe12460 (aswi2022code-of-duty-gitlab): Button renamed
re #9821 Michal Schwob
07:49 Revize fdf6c32d (aswi2022code-of-duty-gitlab): Administation page finished
re #9818 Michal Schwob
07:49 Revize 4996b85f (aswi2022code-of-duty-gitlab): Newly swagger generated files
re #9627 Michal Schwob
07:49 Revize 627f4d82 (aswi2022code-of-duty-gitlab): Fixed registering a closing the dialog after success
re #9627 Michal Schwob
07:49 Revize 287652cf (aswi2022code-of-duty-gitlab): Refactor of administration page and user registration
re #9627 Michal Schwob
07:48 Revize 05dcac30 (aswi2022code-of-duty-gitlab): Fixed sql file reformatted by push
re #9753 Jakub Šmíd
07:48 Revize 8ca61504 (aswi2022code-of-duty-gitlab): Added missing comments, code refactoring
re #9743 Jakub Šmíd
07:48 Revize ae654ef7 (aswi2022code-of-duty-gitlab): Database exported to script
- removed initialization from application
- updated docker-compose.yml to create volume and add data from script
re... Jakub Šmíd
07:48 Revize 16b96e8f (aswi2022code-of-duty-gitlab): Rights fixed (for external catalog, others are OK)
re #9744 Jakub Šmíd
07:48 Revize a2646d6a (aswi2022code-of-duty-gitlab): Changed password, email and name for ADMIN
re #9756 Jakub Šmíd
07:48 Revize afdd306f (aswi2022code-of-duty-gitlab): Added Super Admin user
re #9790 Jakub Šmíd
07:48 Revize bf502b70 (aswi2022code-of-duty-gitlab): Added sources (can add/edit bibliography page)
re #9788 Jakub Šmíd
07:48 Revize cf12d561 (aswi2022code-of-duty-gitlab): Catalog change
- one-to-many associations now persist order
- text for search persists separators
re #9751
re #9754 Jakub Šmíd
07:48 Revize 2c5bb646 (aswi2022code-of-duty-gitlab): Added two external catalog items sources
re #9752 Jakub Šmíd
07:48 Revize 8a5593f0 (aswi2022code-of-duty-gitlab): Changed that user with ADMIN rights can not be removed
re #9755 Jakub Šmíd
07:48 Revize f0c515d8 (aswi2022code-of-duty-gitlab): Added new source file with catalog items
re #9750 Jakub Šmíd
07:48 Revize 67a36e64 (aswi2022code-of-duty-gitlab): Changed password DTO access to write only
re #9620 Jakub Šmíd
07:48 Revize 2e85bd2f (aswi2022code-of-duty-gitlab): Fixed user registration bad constraint
re #9620 Jakub Šmíd
07:48 Revize b523c74d (aswi2022code-of-duty-gitlab): Creation of administration page and user registration
re #9627 Michal Schwob
07:46 Revize c0cf1dbc (aswi2022code-of-duty-gitlab): coordinates fix
Václav Honzík

2022-05-15

19:20 Revize 536bda5e (aswi2022code-of-duty-gitlab): Fixed sql file reformatted by push
re #9753 Jakub Šmíd
18:15 Revize f45d05b1 (aswi2022code-of-duty-gitlab): Merge remote-tracking branch 'origin/develop' into develop
Jakub Šmíd
18:15 Revize 047167d5 (aswi2022code-of-duty-gitlab): Fixed sql file reformatted by push
re #9753 Jakub Šmíd
17:36 Revize 521076fe (aswi2022code-of-duty-gitlab): Updated files generated from swagger and code refactor
re #9802 Michal Schwob
17:33 Revize ae770857 (aswi2022code-of-duty-gitlab): Sources page implemented
re #9811 Michal Schwob
15:56 Revize 8c04c9f2 (aswi2022code-of-duty-gitlab): Button renamed
re #9821 Michal Schwob
15:14 Revize e47f061f (aswi2022code-of-duty-gitlab): 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 Michal Schwob
15:11 Revize 76a65479 (aswi2022code-of-duty-gitlab): Merge remote-tracking branch 'origin/develop' into feature/#9818_administration_page
# Conflicts:
# backend/docker-compose.yml
# backend/src/main/java/cz/zcu/kiv/backendapi/config/CorsConfig... Michal Schwob
15:06 Revize ed410564 (aswi2022code-of-duty-gitlab): Administation page finished
re #9818 Michal Schwob
06:44 Revize 7f66339f (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9743_Refactor' into 'develop'
Added missing comments, code refactoring
See merge request aswi/aswi-2022/aswi2022code-of-duty!45 Jakub Šmíd
06:44 Revize 217cf731 (aswi2022code-of-duty-gitlab): Added missing comments, code refactoring
re #9743 Jakub Šmíd

2022-05-14

09:12 Revize bca2225a (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9746_Database_Export' into 'develop'
Database exported to script
See merge request aswi/aswi-2022/aswi2022code-of-duty!44 Jakub Šmíd
09:10 Revize 6a1a8cd7 (aswi2022code-of-duty-gitlab): Database exported to script
- removed initialization from application
- updated docker-compose.yml to create volume and add data from script
re... Jakub Šmíd

2022-05-12

08:40 Revize 083ac081 (aswi2022code-of-duty-gitlab): 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 Jakub Šmíd
08:39 Revize ee8749f9 (aswi2022code-of-duty-gitlab): Rights fixed (for external catalog, others are OK)
re #9744 Jakub Šmíd

2022-05-11

12:36 Revize 6bd7393d (aswi2022code-of-duty-gitlab): 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 Jakub Šmíd
12:35 Revize 731c88e8 (aswi2022code-of-duty-gitlab): Changed password, email and name for ADMIN
re #9756 Jakub Šmíd
12:21 Revize ecbc3bc0 (aswi2022code-of-duty-gitlab): Merge branch 'feature/##9790_Super_Admin' into 'develop'
Added Super Admin user
See merge request aswi/aswi-2022/aswi2022code-of-duty!41 Jakub Šmíd
12:18 Revize a86d66a4 (aswi2022code-of-duty-gitlab): Added Super Admin user
re #9790 Jakub Šmíd
08:53 Revize f60e5657 (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9788_Sources' into 'develop'
Added sources (can add/edit bibliography page)
See merge request aswi/aswi-2022/aswi2022code-of-duty!40 Jakub Šmíd
08:51 Revize 44cfa9d1 (aswi2022code-of-duty-gitlab): Added sources (can add/edit bibliography page)
re #9788 Jakub Šmíd
08:33 Revize 91d77186 (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9754_#9751_Catalog_Edit' into 'develop'
Catalog change
See merge request aswi/aswi-2022/aswi2022code-of-duty!39 Jakub Šmíd
08:31 Revize fb55e8e9 (aswi2022code-of-duty-gitlab): Catalog change
- one-to-many associations now persist order
- text for search persists separators
re #9751
re #9754 Jakub Šmíd
05:01 Revize a825550f (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9752_External_Catalog' into 'develop'
Added two external catalog items sources
See merge request aswi/aswi-2022/aswi2022code-of-duty!38 Jakub Šmíd
04:59 Revize 0d303b8f (aswi2022code-of-duty-gitlab): Added two external catalog items sources
re #9752 Jakub Šmíd

2022-05-10

19:51 Revize 56d37dc4 (aswi2022code-of-duty-gitlab): 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 Jakub Šmíd
19:50 Revize 3ca2fe2c (aswi2022code-of-duty-gitlab): Changed that user with ADMIN rights can not be removed
re #9755 Jakub Šmíd
19:48 Revize 950afedc (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9750_Bibliography' into 'develop'
Added new source file with catalog items
See merge request aswi/aswi-2022/aswi2022code-of-duty!36 Jakub Šmíd
19:46 Revize 8b73543b (aswi2022code-of-duty-gitlab): Added new source file with catalog items
re #9750 Jakub Šmíd
17:42 Revize a7264ac3 (aswi2022code-of-duty-gitlab): Merge branch 'develop' into 'main'
Fifth iteration merge
See merge request aswi/aswi-2022/aswi2022code-of-duty!35 Václav Honzík
13:12 Revize 9ac8d8a0 (aswi2022code-of-duty-gitlab): Newly swagger generated files
re #9627 Michal Schwob
13:09 Revize 2d3a4e2b (aswi2022code-of-duty-gitlab): Fixed registering a closing the dialog after success
re #9627 Michal Schwob
08:05 Revize 598e1877 (aswi2022code-of-duty-gitlab): Merge remote-tracking branch 'origin/develop' into feature/9627_administration_page
Michal Schwob

2022-05-09

21:28 Revize 5b1882cb (aswi2022code-of-duty-gitlab): Refactor of administration page and user registration
re #9627 Michal Schwob
15:39 Revize 1c9631be (aswi2022code-of-duty-gitlab): Changed password DTO access to write only
re #9620 Jakub Šmíd
09:47 Revize dcb5701f (aswi2022code-of-duty-gitlab): Fixed user registration bad constraint
re #9620 Jakub Šmíd

2022-05-08

20:29 Revize 772e17ac (aswi2022code-of-duty-gitlab): 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 Michal Schwob
20:26 Revize 84b0e346 (aswi2022code-of-duty-gitlab): Merge remote-tracking branch 'origin/develop' into feature/9627_administration_page
Michal Schwob
20:25 Revize 4d2f04f4 (aswi2022code-of-duty-gitlab): Creation of administration page and user registration
re #9627 Michal Schwob
17:33 Revize 999c198b (aswi2022code-of-duty-gitlab): Merge remote-tracking branch 'origin/develop' into feature/#9630_Frontend_Responsive
# Conflicts:
# frontend/src/features/Catalog/AddNewLocationDialog.tsx Václav Honzík
16:57 Revize df8befe8 (aswi2022code-of-duty-gitlab): Merge remote-tracking branch 'origin/develop' into develop
Jakub Šmíd
16:57 Revize 1c921b68 (aswi2022code-of-duty-gitlab): Fixed single punctuation character in path search error
re #9620 Jakub Šmíd
16:29 Revize 383004ea (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9629_Map_Tooling' into 'develop'
Merge Map Tooling to Develop
See merge request aswi/aswi-2022/aswi2022code-of-duty!33 Václav Honzík
16:22 Revize 04fdedc6 (aswi2022code-of-duty-gitlab): Adjustments
re #9629 Václav Honzík

2022-05-07

14:17 Revize e9103a47 (aswi2022code-of-duty-gitlab): Persist navigation state
re #9630 Václav Honzík
14:13 Revize dd270a41 (aswi2022code-of-duty-gitlab): path autorefresh works as intended
re #9629 Václav Honzík
13:27 Revize 8c57f958 (aswi2022code-of-duty-gitlab): refactor to use Redux instead of localstate
re #9629 Václav Honzík
11:49 Revize b70813cb (aswi2022code-of-duty-gitlab): map displays correctly
re #9629 Václav Honzík

2022-05-06

20:17 Revize 91fd3fa6 (aswi2022code-of-duty-gitlab): Nonrecursive algorithm for path building + path rendering on map
re #9629 Václav Honzík

2022-05-05

15:04 Revize 067c00a0 (aswi2022code-of-duty-gitlab): path building algorithm implementation
re #9629 Václav Honzík
13:39 Revize dda6e56e (aswi2022code-of-duty-gitlab): Send text query to the api
re #9629 Václav Honzík
10:32 Revize f2733d24 (aswi2022code-of-duty-gitlab): hotfix edit home broke after merge
Václav Honzík
10:13 Revize 8dd364ad (aswi2022code-of-duty-gitlab): hotfix rename LoginDialog to LoginDialog from RegisterDialog
re #9628 Václav Honzík
10:08 Revize d1bca853 (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9628_Login_As_Dialog' into 'develop'
Login dialog + slice for notifications
See merge request aswi/aswi-2022/aswi2022code-of-duty!32 Václav Honzík
10:08 Revize 1807c506 (aswi2022code-of-duty-gitlab): 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
# Conflicts:
# frontend/src/App.tsx Václav Honzík
10:07 Revize a18f7b72 (aswi2022code-of-duty-gitlab): Merge remote-tracking branch 'origin/develop' into feature/#9628_Login_As_Dialog
# Conflicts:
# frontend/src/App.tsx Václav Honzík
10:06 Revize 7ee95eea (aswi2022code-of-duty-gitlab): Merge branch 'develop' into 'feature/#9628_Login_As_Dialog'
# Conflicts:
# frontend/src/App.tsx Václav Honzík
10:00 Revize 6129910f (aswi2022code-of-duty-gitlab): Show dialog in login page
re #9628 Václav Honzík

2022-05-04

14:28 Revize 668cb4df (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9624_External_catalog' into 'develop'
Added loading of external catalog items
See merge request aswi/aswi-2022/aswi2022code-of-duty!31 Jakub Šmíd
14:25 Revize 7bf2464a (aswi2022code-of-duty-gitlab): Added controller and some tests for external catalog
re #9624 Jakub Šmíd

2022-05-03

10:03 Revize 3d3b813a (aswi2022code-of-duty-gitlab): Merge branch 'feature/9129-title-page' into 'develop'
Formating of Home page
See merge request aswi/aswi-2022/aswi2022code-of-duty!30 Michal Schwob
10:01 Revize ff40cb89 (aswi2022code-of-duty-gitlab): Formating of Home page
re #9714 Michal Schwob

2022-05-02

11:00 Revize 4f42fa52 (aswi2022code-of-duty-gitlab): Login dialog + slice for notifications
re #9628 Václav Honzík

2022-05-01

21:28 Revize 20ce9f4d (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9626_Correct_HTML_Escaping_In_Catalog' into 'develop'
Merge
See merge request aswi/aswi-2022/aswi2022code-of-duty!29 Václav Honzík
21:27 Revize e8591566 (aswi2022code-of-duty-gitlab): DomPurify + Escaping Impl
re #9626 Václav Honzík
21:25 Revize a9688ebf (aswi2022code-of-duty-gitlab): Merge branch 'develop' into 'main'
Fourth iteration merge
See merge request aswi/aswi-2022/aswi2022code-of-duty!28 Václav Honzík

2022-04-29

14:44 Revize e21b7441 (aswi2022code-of-duty-gitlab): Added loading of external catalog items
re #9624 Jakub Šmíd

2022-04-26

10:22 Revize 398b2054 (aswi2022code-of-duty-gitlab): 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 Jakub Šmíd
10:20 Revize ce5bfed1 (aswi2022code-of-duty-gitlab): Changed coordinates to null from 0.0 when not known
re #9625 Jakub Šmíd

2022-04-24

19:57 Revize 5bfdc64f (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9547_map_page_and_path_visualization' into 'develop'
MERGE
See merge request aswi/aswi-2022/aswi2022code-of-duty!25 Václav Honzík
19:49 Revize 41a11178 (aswi2022code-of-duty-gitlab): map adjustments
re #9547 Václav Honzík
17:55 Revize 2d82649d (aswi2022code-of-duty-gitlab): Button changes + .env config
re #9547 Václav Honzík
17:29 Revize e99d142e (aswi2022code-of-duty-gitlab): removed console.log
re #9547 Václav Honzík
17:27 Revize c65df98c (aswi2022code-of-duty-gitlab): Merge branch 'feature/#9547_map_page_and_path_visualization' into 'develop'
Merge
See merge request aswi/aswi-2022/aswi2022code-of-duty!24 Václav Honzík
17:26 Revize 0d90d67b (aswi2022code-of-duty-gitlab): map dialogs + catalog filter fix
re #9547 #9545 Václav Honzík
 

Také k dispozici: Atom