Eduard Tihomirov
|
90ec38852f
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ru/micord/ervu/controller/ErvuDataController.java
# backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaTokensStore.java
# backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
# config/nginx.conf
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-01-10 13:15:15 +03:00 |
|
kochetkov
|
2d2a07bb0c
|
SUPPORT-8830 fix logout
|
2024-12-27 13:05:33 +03:00 |
|
Eduard Tihomirov
|
c4e5bab8b6
|
fix marker verify
(cherry picked from commit f46ddfc623589bdadcafabfce77a18d8d4f569f0)
|
2024-11-26 16:20:10 +03:00 |
|
Eduard Tihomirov
|
b6072d9bf4
|
Merge branch 'develop' into feature/SUPPORT-8593_marker_verify
|
2024-11-26 16:19:56 +03:00 |
|
Zaripov Emil
|
cd60dded99
|
set DB_APP_NAME=ervu_lkrp_fl
|
2024-11-08 15:16:33 +03:00 |
|
gulnaz
|
5808a3e10a
|
SUPPORT-8664: fix NPE, config and kafka template bean name
|
2024-10-31 13:53:44 +03:00 |
|
Eduard Tihomirov
|
bb29b09aee
|
Merge branch 'master' into feature/SUPPORT-8593_marker_verify
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaPersonalDataService.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/PersonalDataService.java
# config/standalone/dev/standalone.xml
|
2024-10-25 15:12:11 +03:00 |
|
Халтобин Евгений
|
080be303bd
|
fix
|
2024-10-24 10:16:24 +03:00 |
|
Eduard Tihomirov
|
4a57d604db
|
Merge remote-tracking branch 'origin/release/1.8' into feature/SUPPORT-8579_access_marker
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java
# backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
|
2024-10-23 12:06:24 +03:00 |
|
gulnaz
|
641b2617b3
|
move changes to release
|
2024-10-19 12:38:32 +03:00 |
|
Халтобин Евгений
|
4b9c618eb2
|
fixed kafka parameter
|
2024-10-19 08:44:26 +03:00 |
|
Eduard Tihomirov
|
47069acb2b
|
SUPPORT-8593: Fix
|
2024-10-09 08:03:41 +03:00 |
|
Eduard Tihomirov
|
d5082c3ce2
|
SUPPORT-8579: Fix
|
2024-10-03 16:28:43 +03:00 |
|
Pavel Zilke
|
005af5a9e6
|
delete unused env variables
|
2024-09-27 10:41:48 +03:00 |
|
Халтобин Евгений
|
ee4d64bc71
|
added props
|
2024-09-25 15:07:45 +03:00 |
|
Халтобин Евгений
|
c31af0f366
|
added ERVU_KAFKA_SECURITY_PROTOCOL
|
2024-09-25 14:48:40 +03:00 |
|
gulnaz
|
7e890469e6
|
change esia certificate hash param name; remove some props from webbpm.properties
|
2024-09-23 11:35:16 +03:00 |
|
gulnaz
|
6b757c805c
|
SUPPORT-8413: add topic properties
|
2024-09-20 15:47:06 +03:00 |
|
gulnaz
|
2382841891
|
SUPPORT-8553: fix properties; add micord.env
|
2024-09-19 12:21:28 +03:00 |
|