Commit graph

576 commits

Author SHA1 Message Date
Халтобин Евгений
d1f32f5210 restored verify of ESIA access token 2025-01-13 11:41:53 +03:00
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
Zaripov Emil
ba07e5f3f6 set version 1.9.4 2025-01-08 16:32:58 +03:00
Zaripov Emil
8530edcaea Merge branch 'hotfix/1.9.4' 2025-01-08 16:31:48 +03:00
kochetkov
ed9e9a3ce8 SUPPORT-8830 fix imports 2024-12-27 16:36:35 +03:00
kochetkov
7d9928e478 SUPPORT-8830 3.5 partially 2024-12-27 16:26:01 +03:00
kochetkov
84683a4e2d SUPPORT-8830 remove sensitive data from args 3.2 2024-12-27 15:55:36 +03:00
kochetkov
2d2a07bb0c SUPPORT-8830 fix logout 2024-12-27 13:05:33 +03:00
kochetkov
b1d7de4897 SUPPORT-8830 temporary remove csp conf 2024-12-27 13:01:16 +03:00
kochetkov
9c061148ca SUPPORT-8830 fix logout 2024-12-27 12:52:39 +03:00
kochetkov
f77c95b1cd SUPPORT-8830 fix logout 2024-12-27 12:42:08 +03:00
kochetkov
2747452b88 SUPPORT-8830 first fixes 2024-12-27 09:16:13 +03:00
Zaripov Emil
2bd86a7993 set version 1.9.4-SNAPSHOT 2024-12-26 16:11:58 +03:00
Zaripov Emil
93c19f995e Merge remote-tracking branch 'origin/hotfix/1.9.3' 2024-12-26 10:40:24 +03:00
Eduard Tihomirov
14ac67f822 fix 2024-12-25 16:49:31 +03:00
Eduard Tihomirov
c5baf9028f Merge branch 'feature/SUPPORT-8755_new' into hotfix/1.9.3 2024-12-25 16:48:57 +03:00
Eduard Tihomirov
3f0a7fa5c1 SUPPORT-8755: Fix 2024-12-25 12:46:10 +03:00
Zaripov Emil
23f6b040ff Merge branch 'hotfix/1.9.3' of 10.10.31.70:/ervu-lkrp-fl into hotfix/1.9.3 2024-12-25 11:55:41 +03:00
Eduard Tihomirov
69f1094bbf SUPPORT-8755: Fix 2024-12-25 11:06:49 +03:00
Eduard Tihomirov
44bcba2faf SUPPORT-8755: Fix 2024-12-24 20:45:19 +03:00
Eduard Tihomirov
1f6595b954 SUPPORT-8755: Fix 2024-12-24 20:28:52 +03:00
Eduard Tihomirov
1a1ca85a63 SUPPORT-8755: Fix 2024-12-24 20:26:17 +03:00
Eduard Tihomirov
f86a8afd2f SUPPORT-8755: Fix 2024-12-24 20:11:53 +03:00
Халтобин Евгений
65872ef7da DEVOPS-1892: added cache settings 2024-12-24 14:28:30 +03:00
Рауф Латыпов
b8c5b75f2b SUPPORT-8796: add data into response dto 2024-12-24 12:06:11 +03:00
Zaripov Emil
09ef347220 Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-fl into develop 2024-12-23 10:18:34 +03:00
Zaripov Emil
f96d81f660 Merge branch 'master' into develop
# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2024-12-23 10:18:23 +03:00
Халтобин Евгений
1b98944498 DEVOPS-1892: added cache settings
moved from angie to nginx
2024-12-23 10:18:03 +03:00
Zaripov Emil
2410574b64 set version 1.9.3-SNAPSHOT 2024-12-23 10:17:34 +03:00
Халтобин Евгений
b8c78bfe68 DEVOPS-1892: added cache settings
moved from angie to nginx
2024-12-23 10:17:03 +03:00
Zaripov Emil
e8d2d52283 set version 1.9.2 2024-12-23 10:16:05 +03:00
Zaripov Emil
7aae64a6bf Merge branch 'hotfix/1.9.2' 2024-12-23 10:15:15 +03:00
m.epshtein
9a6be3da04 new imgs 2024-12-20 17:17:33 +03:00
Халтобин Евгений
532822c60f updated 2024-12-18 21:12:39 +03:00
adel.kalimullin
5d86ef0ecb SUPPORT-8788:fix 2024-12-18 14:47:12 +03:00
adel.kalimullin
97201cd24b SUPPORT-8788:fix auth-guard 2024-12-18 14:47:04 +03:00
Eduard Tihomirov
933004f686 fix home.html 2024-12-18 14:46:53 +03:00
Рауф Латыпов
2584a54c52 SUPPORT-8795: 2 date formatters are removed 2024-12-18 14:46:39 +03:00
adel.ka
58a9af8509 Merge branch 'refs/heads/feature/SUPPORT-8725_refactor' into develop 2024-12-17 16:05:09 +03:00
m.epshtein
fb0a1d4492 change title 2024-12-16 12:07:19 +03:00
adel.kalimullin
4ebbe22291 SUPPORT-8725:add own exception 2024-12-12 13:09:19 +03:00
adel.kalimullin
a9468f783f SUPPORT-8725:set camelCase naming 2024-12-11 12:46:41 +03:00
kochetkov
76ae8c8cde SUPPORT-8774 update kafka-clients 2024-12-10 15:29:39 +03:00
Халтобин Евгений
a44cc156e4 Merge branch 'feature/docker-compose' into develop 2024-12-05 09:04:26 +03:00
Халтобин Евгений
76aba32d64 added docker compose 2024-12-05 09:04:17 +03:00
Zaripov Emil
4216a2d311 Merge branch 'master' into hotfix/1.9.2 2024-12-03 09:28:33 +03:00
Zaripov Emil
f69e3892bf Merge branch 'master' into develop
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	resources/src/main/resources/business-model/LK RP FL/mydata.page
2024-12-03 09:27:19 +03:00
Zaripov Emil
ab881fccb8 Merge branch 'hotfix/1.9.1' 2024-12-03 09:23:29 +03:00
Халтобин Евгений
a3813e2851 Merge remote-tracking branch 'origin/feature/SUPPORT-8711_fix' into develop 2024-12-02 14:21:58 +03:00
Eduard Tihomirov
bf33eaf2ad Merge branch 'feature/SUPPORT-8571_check_browser' into develop 2024-11-29 13:09:22 +03:00