Projekt

Obecné

Profil

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

aswi2022code-of-duty-gitlab @ ee8749f9

# Datum Autor Komentář
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
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
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
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
76e15218 2022-04-23 09:32 Václav Honzík

dummy path with arrows example

re #9547
d0c6b9ec 2022-04-23 07:41 Jakub Šmíd

Merge branch 'feature/#9492_Filter_Change' into 'develop'

Added filter for written forms and some tests

See merge request aswi/aswi-2022/aswi2022code-of-duty!23
ba120f65 2022-04-23 07:37 Jakub Šmíd

Added orphan removal to catalog item

re #9492
a8335530 2022-04-23 07:15 Jakub Šmíd

Test cases added

re #9492
788ce11e 2022-04-22 17:59 Václav Honzík

tracking tool start

re #9547
8754af5c 2022-04-22 17:56 Václav Honzík

Table scrolling

re #9534
d6451c0a 2022-04-22 15:22 Jakub Šmíd

Added filter for written forms and some tests

re #9492
361c6398 2022-04-21 19:57 Václav Honzík

Merge branch 'feature/#9545_catalog_filtering' into 'develop'

catalog filter

See merge request aswi/aswi-2022/aswi2022code-of-duty!22
1c710f4f 2022-04-21 19:49 Václav Honzík

filter functional

re #9545
394f2d16 2022-04-21 16:02 Václav Honzík

catalog slice

re #9545
f1e150c8 2022-04-15 14:54 Jakub Šmíd

Merge branch 'feature/#9491_Catalog_Item_Description' into 'develop'

Added description to catalog item

See merge request aswi/aswi-2022/aswi2022code-of-duty!21
541abced 2022-04-15 14:53 Jakub Šmíd

Added description to catalog item

re #9491
50f76574 2022-04-15 07:26 Jakub Šmíd

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

Checked, added and fixed rights to endpoints

See merge request aswi/aswi-2022/aswi2022code-of-duty!20
4afeda3d 2022-04-15 07:25 Jakub Šmíd

Checked, added and fixed rights to endpoints

re #9511
88f07dae 2022-04-15 07:16 Jakub Šmíd

Merge branch 'feature/#9490_Path' into 'develop'

Added path

See merge request aswi/aswi-2022/aswi2022code-of-duty!19
c5787e2d 2022-04-15 07:15 Jakub Šmíd

Added test for path

re #9490
b539ef29 2022-04-15 07:03 Jakub Šmíd

Added path
- searching and highlighting text
- returning list of found catalog items

re #9490
369e0228 2022-04-11 21:01 Michal Schwob

Working deployment
re #9333
0d941c5e 2022-04-11 14:30 Jakub Šmíd

Configuration files for kubernetes and swagger

re #9333
409ad6d9 2022-04-11 13:40 Jakub Šmíd

Edited swagger generated files

re #9333
288f6d14 2022-04-11 13:06 Michal Schwob

Changed config nginx
re #9333
220bfa94 2022-04-11 12:51 Michal Schwob

Changed config for docker compose
re #9333
0319d5a2 2022-04-11 11:14 Jakub Šmíd

Configuration files for kubernetes

re #9333
1aa0448a 2022-04-11 10:35 Michal Schwob

Changed environmental variables for api path
re #9333
2aa2893c 2022-04-11 10:35 Michal Schwob

Changed environmental variables for api path
re #9333
33ec823a 2022-04-11 09:56 Michal Schwob

Dockerfile
re #9333
8884d114 2022-04-11 09:48 Michal Schwob

Config for nginx server
re #9333
63f320c0 2022-04-11 09:01 Michal Schwob

Update .gitlab-ci.yml file
c0dc6652 2022-04-11 08:57 Jakub Šmíd

Changed endpoints to begin with /api/

re #9333
a11b46b5 2022-04-10 15:31 Václav Honzík

added .env file re #9243
456b0111 2022-04-10 14:44 Václav Honzík

re #9243 - LCA milestone code refactor
6f163797 2022-04-08 15:35 Václav Honzík

Merge branch 'feature/#9369_catalog_item_detail' into 'develop'

Feature/#9369 catalog item detail

See merge request aswi/aswi-2022/aswi2022code-of-duty!16
853e96aa 2022-04-08 15:34 Václav Honzík

Merge branch 'feature/#9368_auth_err_handling' into 'develop'

Feature/#9368 auth err handling

See merge request aswi/aswi-2022/aswi2022code-of-duty!15
286a9547 2022-04-08 15:33 Václav Honzík

re #9368 - refresh with fetch instead of axios
4a2ac9a8 2022-04-08 15:33 Václav Honzík

re #9369 item + catalog refactor
5e8514b8 2022-04-07 19:28 Václav Honzík

re #9369 api get for single item
f2db3e05 2022-04-07 19:11 Václav Honzík

re #9369 - catalog detail fetching
fced3794 2022-04-07 13:17 Václav Honzík

Merge branch 'feature/#9369_catalog_item_detail' of https://gitlab.kiv.zcu.cz/aswi/aswi-2022/aswi2022code-of-duty into feature/#9369_catalog_item_detail
8042e8b3 2022-04-07 13:15 Václav Honzík

re #9369 catalog tweaks
a496e984 2022-04-06 10:01 Jakub Šmíd

Changed TitlePage schema for Swagger generation

re #9383
6c033561 2022-04-04 12:24 Michal Schwob

Update .gitlab-ci.yml file
f78b6150 2022-04-04 12:22 Michal Schwob

Update .gitlab-ci.yml file
f456d0a0 2022-04-04 12:19 Václav Honzík

re #9369 map placeholder
053244c6 2022-04-04 11:50 Michal Schwob

Update .gitlab-ci.yml file
3ec590e6 2022-04-04 11:46 Václav Honzík

re #9369 item left col display text
817d5ff1 2022-04-04 11:43 Michal Schwob

Update .gitlab-ci.yml file
88e9dc23 2022-04-04 11:42 Michal Schwob

Update .gitlab-ci.yml file