Projekt

Obecné

Profil

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

aswi2022code-of-duty-gitlab @ b45d0300

# Datum Autor Komentář
b45d0300 2022-05-16 09:05 Václav Honzík

draggable map marker pt1

re #9741
1f16b100 2022-05-16 08:28 Václav Honzík

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

merge fixes

See merge request aswi/aswi-2022/aswi2022code-of-duty!49
81698b9a 2022-05-16 08:28 Václav Honzík

merge fixes
42048c18 2022-05-16 08:06 Václav Honzík

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
55e2f06a 2022-05-16 07:52 Václav Honzík

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

coordinates null fix merge

See merge request aswi/aswi-2022/aswi2022code-of-duty!48
a6f0f2fc 2022-05-16 07:51 Václav Honzík

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

  1. Conflicts:
  2. frontend/src/features/redux/store.ts
42d6faf7 2022-05-16 07:49 Jakub Šmíd

Fixed sql file reformatted by push

re #9753
b61ca51b 2022-05-16 07:49 Michal Schwob

Updated files generated from swagger and code refactor
re #9802
ffe12460 2022-05-16 07:49 Michal Schwob

Button renamed
re #9821
fdf6c32d 2022-05-16 07:49 Michal Schwob

Administation page finished
re #9818
4996b85f 2022-05-16 07:49 Michal Schwob

Newly swagger generated files
re #9627
627f4d82 2022-05-16 07:49 Michal Schwob

Fixed registering a closing the dialog after success
re #9627
287652cf 2022-05-16 07:49 Michal Schwob

Refactor of administration page and user registration
re #9627
05dcac30 2022-05-16 07:48 Jakub Šmíd

Fixed sql file reformatted by push

re #9753
8ca61504 2022-05-16 07:48 Jakub Šmíd

Added missing comments, code refactoring

re #9743
ae654ef7 2022-05-16 07:48 Jakub Šmíd

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

re #9746
16b96e8f 2022-05-16 07:48 Jakub Šmíd

Rights fixed (for external catalog, others are OK)

re #9744
a2646d6a 2022-05-16 07:48 Jakub Šmíd

Changed password, email and name for ADMIN

re #9756
afdd306f 2022-05-16 07:48 Jakub Šmíd

Added Super Admin user

re #9790
bf502b70 2022-05-16 07:48 Jakub Šmíd

Added sources (can add/edit bibliography page)

re #9788
cf12d561 2022-05-16 07:48 Jakub Šmíd

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

re #9751
re #9754
2c5bb646 2022-05-16 07:48 Jakub Šmíd

Added two external catalog items sources

re #9752
8a5593f0 2022-05-16 07:48 Jakub Šmíd

Changed that user with ADMIN rights can not be removed

re #9755
f0c515d8 2022-05-16 07:48 Jakub Šmíd

Added new source file with catalog items

re #9750
67a36e64 2022-05-16 07:48 Jakub Šmíd

Changed password DTO access to write only

re #9620
2e85bd2f 2022-05-16 07:48 Jakub Šmíd

Fixed user registration bad constraint

re #9620
b523c74d 2022-05-16 07:48 Michal Schwob

Creation of administration page and user registration
re #9627
c0cf1dbc 2022-05-16 07:46 Václav Honzík

coordinates fix
536bda5e 2022-05-15 19:20 Jakub Šmíd

Fixed sql file reformatted by push

re #9753
f45d05b1 2022-05-15 18:15 Jakub Šmíd

Merge remote-tracking branch 'origin/develop' into develop
047167d5 2022-05-15 18:15 Jakub Šmíd

Fixed sql file reformatted by push

re #9753
521076fe 2022-05-15 17:36 Michal Schwob

Updated files generated from swagger and code refactor
re #9802
8c04c9f2 2022-05-15 15:56 Michal Schwob

Button renamed
re #9821
e47f061f 2022-05-15 15:14 Michal Schwob

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
76a65479 2022-05-15 15:11 Michal Schwob

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
ed410564 2022-05-15 15:06 Michal Schwob

Administation page finished
re #9818
7f66339f 2022-05-15 06:44 Jakub Šmíd

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

Added missing comments, code refactoring

See merge request aswi/aswi-2022/aswi2022code-of-duty!45
217cf731 2022-05-15 06:44 Jakub Šmíd

Added missing comments, code refactoring

re #9743
bca2225a 2022-05-14 09:12 Jakub Šmíd

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

Database exported to script

See merge request aswi/aswi-2022/aswi2022code-of-duty!44
6a1a8cd7 2022-05-14 09:10 Jakub Šmíd

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

re #9746
083ac081 2022-05-12 08:40 Jakub Šmíd

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
ee8749f9 2022-05-12 08:39 Jakub Šmíd

Rights fixed (for external catalog, others are OK)

re #9744
6bd7393d 2022-05-11 12:36 Jakub Šmíd

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
731c88e8 2022-05-11 12:35 Jakub Šmíd

Changed password, email and name for ADMIN

re #9756
ecbc3bc0 2022-05-11 12:21 Jakub Šmíd

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

Added Super Admin user

See merge request aswi/aswi-2022/aswi2022code-of-duty!41
a86d66a4 2022-05-11 12:18 Jakub Šmíd

Added Super Admin user

re #9790
f60e5657 2022-05-11 08:53 Jakub Šmíd

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

Added sources (can add/edit bibliography page)

See merge request aswi/aswi-2022/aswi2022code-of-duty!40
44cfa9d1 2022-05-11 08:51 Jakub Šmíd

Added sources (can add/edit bibliography page)

re #9788
91d77186 2022-05-11 08:33 Jakub Šmíd

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

Catalog change

See merge request aswi/aswi-2022/aswi2022code-of-duty!39
fb55e8e9 2022-05-11 08:31 Jakub Šmíd

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

re #9751
re #9754
a825550f 2022-05-11 05:01 Jakub Šmíd

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

Added two external catalog items sources

See merge request aswi/aswi-2022/aswi2022code-of-duty!38
0d303b8f 2022-05-11 04:59 Jakub Šmíd

Added two external catalog items sources

re #9752
56d37dc4 2022-05-10 19:51 Jakub Šmíd

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
3ca2fe2c 2022-05-10 19:50 Jakub Šmíd

Changed that user with ADMIN rights can not be removed

re #9755
950afedc 2022-05-10 19:48 Jakub Šmíd

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

Added new source file with catalog items

See merge request aswi/aswi-2022/aswi2022code-of-duty!36
8b73543b 2022-05-10 19:46 Jakub Šmíd

Added new source file with catalog items

re #9750
9ac8d8a0 2022-05-10 13:12 Michal Schwob

Newly swagger generated files
re #9627
2d3a4e2b 2022-05-10 13:09 Michal Schwob

Fixed registering a closing the dialog after success
re #9627
598e1877 2022-05-10 08:05 Michal Schwob

Merge remote-tracking branch 'origin/develop' into feature/9627_administration_page
5b1882cb 2022-05-09 21:28 Michal Schwob

Refactor of administration page and user registration
re #9627
1c9631be 2022-05-09 15:39 Jakub Šmíd

Changed password DTO access to write only

re #9620
dcb5701f 2022-05-09 09:47 Jakub Šmíd

Fixed user registration bad constraint

re #9620
772e17ac 2022-05-08 20:29 Michal Schwob

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
84b0e346 2022-05-08 20:26 Michal Schwob

Merge remote-tracking branch 'origin/develop' into feature/9627_administration_page
4d2f04f4 2022-05-08 20:25 Michal Schwob

Creation of administration page and user registration
re #9627
999c198b 2022-05-08 17:33 Václav Honzík

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

  1. Conflicts:
  2. frontend/src/features/Catalog/AddNewLocationDialog.tsx
df8befe8 2022-05-08 16:57 Jakub Šmíd

Merge remote-tracking branch 'origin/develop' into develop
1c921b68 2022-05-08 16:57 Jakub Šmíd

Fixed single punctuation character in path search error

re #9620
383004ea 2022-05-08 16:29 Václav Honzík

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

Merge Map Tooling to Develop

See merge request aswi/aswi-2022/aswi2022code-of-duty!33
04fdedc6 2022-05-08 16:22 Václav Honzík

Adjustments

re #9629
e9103a47 2022-05-07 14:17 Václav Honzík

Persist navigation state

re #9630
dd270a41 2022-05-07 14:13 Václav Honzík

path autorefresh works as intended

re #9629
8c57f958 2022-05-07 13:27 Václav Honzík

refactor to use Redux instead of localstate

re #9629
b70813cb 2022-05-07 11:49 Václav Honzík

map displays correctly

re #9629
91fd3fa6 2022-05-06 20:17 Václav Honzík

Nonrecursive algorithm for path building + path rendering on map

re #9629
067c00a0 2022-05-05 15:04 Václav Honzík

path building algorithm implementation

re #9629
dda6e56e 2022-05-05 13:39 Václav Honzík

Send text query to the api

re #9629
f2733d24 2022-05-05 10:32 Václav Honzík

hotfix edit home broke after merge
8dd364ad 2022-05-05 10:13 Václav Honzík

hotfix rename LoginDialog to LoginDialog from RegisterDialog

re #9628
d1bca853 2022-05-05 10:08 Václav Honzík

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

Login dialog + slice for notifications

See merge request aswi/aswi-2022/aswi2022code-of-duty!32
1807c506 2022-05-05 10:08 Václav Honzík

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
a18f7b72 2022-05-05 10:07 Václav Honzík

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

  1. Conflicts:
  2. frontend/src/App.tsx
7ee95eea 2022-05-05 10:06 Václav Honzík

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

  1. Conflicts:
  2. frontend/src/App.tsx
6129910f 2022-05-05 10:00 Václav Honzík

Show dialog in login page

re #9628
668cb4df 2022-05-04 14:28 Jakub Šmíd

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

Added loading of external catalog items

See merge request aswi/aswi-2022/aswi2022code-of-duty!31
7bf2464a 2022-05-04 14:25 Jakub Šmíd

Added controller and some tests for external catalog

re #9624
3d3b813a 2022-05-03 10:03 Michal Schwob

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

Formating of Home page

See merge request aswi/aswi-2022/aswi2022code-of-duty!30
ff40cb89 2022-05-03 10:01 Michal Schwob

Formating of Home page
re #9714
4f42fa52 2022-05-02 11:00 Václav Honzík

Login dialog + slice for notifications

re #9628
20ce9f4d 2022-05-01 21:28 Václav Honzík

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

Merge

See merge request aswi/aswi-2022/aswi2022code-of-duty!29
e8591566 2022-05-01 21:27 Václav Honzík

DomPurify + Escaping Impl

re #9626
e21b7441 2022-04-29 14:44 Jakub Šmíd

Added loading of external catalog items

re #9624
398b2054 2022-04-26 10:22 Jakub Šmíd

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
ce5bfed1 2022-04-26 10:20 Jakub Šmíd

Changed coordinates to null from 0.0 when not known

re #9625
5bfdc64f 2022-04-24 19:57 Václav Honzík

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

MERGE

See merge request aswi/aswi-2022/aswi2022code-of-duty!25
41a11178 2022-04-24 19:49 Václav Honzík

map adjustments

re #9547
2d82649d 2022-04-24 17:55 Václav Honzík

Button changes + .env config

re #9547
e99d142e 2022-04-24 17:29 Václav Honzík

removed console.log

re #9547
c65df98c 2022-04-24 17:27 Václav Honzík

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

Merge

See merge request aswi/aswi-2022/aswi2022code-of-duty!24
0d90d67b 2022-04-24 17:26 Václav Honzík

map dialogs + catalog filter fix

re #9547 #9545