Commit graph

715 commits

Author SHA1 Message Date
Zaripov Emil
e257f12201 set version 1.8.2 2024-10-25 12:02:35 +03:00
Zaripov Emil
496ea11cef Merge branch 'hotfix/1.8.2' 2024-10-25 12:01:49 +03:00
Zaripov Emil
3082614d0a Merge branch 'hotfix/1.8.1' 2024-10-25 12:00:14 +03:00
Eduard Tihomirov
541188a28d fix logout 2024-10-24 15:18:37 +03:00
Eduard Tihomirov
73a6dad42b fix 2024-10-24 12:58:04 +03:00
Eduard Tihomirov
93223065cd fix logout 2024-10-24 10:14:50 +03:00
Халтобин Евгений
031617b4c2 fix 2024-10-24 09:18:15 +03:00
kochetkov
cfa0c269b9 Merge branch 'hotfix/1.8.2' into feature/SUPPORT-8609_add_csrf_tokens 2024-10-23 22:40:58 +03:00
kochetkov
8d021cd7a2 update versions to snapshot 2024-10-23 22:40:32 +03:00
kochetkov
93a11898ab Merge remote-tracking branch 'origin/hotfix/1.8.2' into feature/SUPPORT-8609_add_csrf_tokens
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/standalone/dev/standalone.xml
#	frontend/src/resources/template/app/component/log_out.html
2024-10-23 15:05:23 +03:00
Eduard Tihomirov
3059b797df Merge branch 'hotfix/1.8.2' into feature/SUPPORT-8579_access_marker
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/standalone/dev/standalone.xml
2024-10-23 14:45:41 +03:00
Eduard Tihomirov
86082685bf Merge branch 'hotfix/1.8.1' into hotfix/1.8.2 2024-10-23 14:39:52 +03:00
kochetkov
c524fcec3f SUPPORT-8609 small fixes 2024-10-23 14:38:22 +03:00
kochetkov
8e74699426 SUPPORT-8609 small fix 2024-10-23 12:01:08 +03:00
Eduard Tihomirov
ea8c108653 sync 2024-10-23 11:22:31 +03:00
Халтобин Евгений
311e1583d1 removed old props 2024-10-23 10:31:51 +03:00
kochetkov
2a0715fc26 SUPPORT-8609 dmall fix 2024-10-23 10:28:19 +03:00
kochetkov
6536306282 SUPPORT-8609 update security config 2024-10-23 10:04:11 +03:00
kochetkov
3248a1e444 Merge branch 'feature/SUPPORT-8609_add_csrf_tokens' of 10.10.31.70:/ervu-lkrp-ul into feature/SUPPORT-8609_add_csrf_tokens 2024-10-22 14:07:22 +03:00
kochetkov
4068277bc3 SUPPORT-8609 fixes 2024-10-22 14:07:11 +03:00
gulnaz
d46f7ee8c1 fix 2024-10-22 12:42:20 +03:00
kochetkov
5be19645c0 fix after merge 2024-10-22 10:19:26 +03:00
kochetkov
a82d48e054 Merge remote-tracking branch 'origin/hotfix/1.8.2' into feature/SUPPORT-8609_add_csrf_tokens
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java
#	backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/standalone/dev/standalone.xml
#	frontend/src/ts/modules/security/guard/auth.guard.ts
2024-10-22 10:15:10 +03:00
m.epshtein
ac7675987f SUPPORT-8636 2024-10-21 15:08:25 +03:00
Халтобин Евгений
474ad39775 update env file 2024-10-21 08:58:25 +03:00
Zaripov Emil
19fa2c5151 ERVU-164 fixed 2024-10-19 13:05:23 +03:00
Халтобин Евгений
de4fbf2cb1 added access to version 2024-10-19 09:02:49 +03:00
Eduard Tihomirov
8120afbcf4 SUPPORT-8601, SUPPORT-8602, SUPPORT-8613, SUPPORT-8599 2024-10-18 11:41:42 +03:00
Халтобин Евгений
e8c64daa28 added fix from Sergei 2024-10-18 09:54:53 +03:00
m.epshtein
aafa7ed83e Merge branch 'hotfix/1.8.1' of 10.10.31.70:/ervu-lkrp-ul into hotfix/1.8.1 2024-10-17 20:44:03 +03:00
m.epshtein
b5bf97b39e // 2024-10-17 20:43:47 +03:00
gulnaz
07f06dbf72 SUPPORT-8627: delete interaction data 2024-10-17 19:58:29 +03:00
m.epshtein
fcdbccfbab Merge branch 'hotfix/1.8.1' of 10.10.31.70:/ervu-lkrp-ul into hotfix/1.8.1 2024-10-17 16:25:40 +03:00
m.epshtein
88a3df15c5 in-memory-static-grid 2024-10-17 16:25:26 +03:00
Zaripov Emil
3b8aed2ec4 Revert "height=100%"
This reverts commit 9f9d243121.
2024-10-17 16:08:53 +03:00
kochetkov
f0c667fddf SUPPORT-8609 small fix 2024-10-17 09:48:25 +03:00
kochetkov
454562b92c SUPPORT-8609 small fix 2024-10-16 16:42:08 +03:00
kochetkov
bb92c71194 SUPPORT-8609 add csrf cookie protection 2024-10-15 15:14:21 +03:00
Eduard Tihomirov
b8e0725138 set version 1.8.1 2024-10-15 14:50:34 +03:00
Eduard Tihomirov
09b850df49 fix upload data role 2024-10-15 14:47:55 +03:00
Eduard Tihomirov
b6d1c9720c Merge remote-tracking branch 'origin/master' into feature/SUPPORT-8579_access_marker
# Conflicts:
#	backend/src/main/java/ervu/controller/EmployeeInfoFileUploadController.java
#	backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
#	config/standalone/dev/standalone.xml
2024-10-11 10:32:02 +03:00
Халтобин Евгений
6cbae50ac8 Merge branch 'release/1.8' 2024-10-11 08:26:15 +03:00
Халтобин Евгений
5ac501ee38 Update for next development version 2024-10-11 08:26:14 +03:00
Eduard Tihomirov
d0691e26f1 Merge branch 'feature/SUPPORT-8601_fix_message' into release/1.8 2024-10-09 10:40:43 +03:00
Eduard Tihomirov
08574aa214 SUPPORT-8601: Fix 2024-10-09 09:38:04 +03:00
gulnaz
9bbc260e97 SUPPORT-8591: commit after checking 2024-10-09 09:31:29 +03:00
gulnaz
75ed29e6ab SUPPORT-8591: up kafka version 2024-10-08 17:32:18 +03:00
gulnaz
e485d0c17d SUPPORT-8591: check for message id of kafka response 2024-10-08 17:29:50 +03:00
gulnaz
ff599fc138 Merge branch 'feature/SUPPORT-8590_fix_time' into release/1.8 2024-10-08 09:35:31 +03:00
gulnaz
76772df530 SUPPORT-8590: parse for client time zone 2024-10-07 18:42:45 +03:00