Commit graph

369 commits

Author SHA1 Message Date
Zaripov Emil
ff41597b3e set version 1.9.6-SNAPSHOT 2025-01-16 10:19:18 +03:00
Zaripov Emil
c2341bb451 set version 1.9.5 2025-01-16 10:18:04 +03:00
kochetkov
4540b39acb Merge branch 'hotfix/1.9.5' into develop 2025-01-15 16:25:12 +03:00
kochetkov
238d858ab0 fix info.svg path 2025-01-15 16:25:00 +03:00
kochetkov
99c76be066 Merge branch 'hotfix/1.9.5' into develop 2025-01-15 16:22:25 +03:00
kochetkov
778de1b3b9 copy also browser_check.js 2025-01-15 16:21:59 +03:00
kochetkov
bea62ab235 Merge branch 'hotfix/1.9.5' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/nginx.conf
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-01-15 14:35:55 +03:00
gulnaz
48e19fd286 SUPPORT-8846: remove redundant load 2025-01-15 12:29:13 +03:00
gulnaz
5722e46735 SUPPORT-8846: extend LoadForm from Container; fix component and pages 2025-01-15 12:26:03 +03:00
gulnaz
7e9611a3f4 SUPPORT-8846: fix load 2025-01-15 10:36:29 +03:00
kochetkov
270cc6017c SUPPORT-8838 fix version 2025-01-15 10:08:06 +03:00
gulnaz
117891dc10 SUPPORT-8846: fix LoadForm and pages; remove redundant scripts 2025-01-14 17:19:09 +03:00
Eduard Tihomirov
5108caf305 Merge branch 'feature/SUPPORT-8845_fix_logout' into hotfix/1.9.5
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
2025-01-14 15:58:28 +03:00
kochetkov
9421735242 SUPPORT-8830 fix 2025-01-10 16:31:50 +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
Eduard Tihomirov
c6af9ba05e Cherry pick SUPPORT-8682 2025-01-09 16:45:16 +03:00
m.epshtein
b81fdc9dd6 header fix 2025-01-09 09:28:14 +03:00
Zaripov Emil
440d89335e set version 1.9.5-SNAPSHOT 2025-01-08 16:42:57 +03:00
Zaripov Emil
ba07e5f3f6 set version 1.9.4 2025-01-08 16:32:58 +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
b1d7de4897 SUPPORT-8830 temporary remove csp conf 2024-12-27 13:01:16 +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
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
Zaripov Emil
2410574b64 set version 1.9.3-SNAPSHOT 2024-12-23 10:17:34 +03:00
Zaripov Emil
e8d2d52283 set version 1.9.2 2024-12-23 10:16:05 +03:00
m.epshtein
9a6be3da04 new imgs 2024-12-20 17:17:33 +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
m.epshtein
fb0a1d4492 change title 2024-12-16 12:07:19 +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
Eduard Tihomirov
bf33eaf2ad Merge branch 'feature/SUPPORT-8571_check_browser' into develop 2024-11-29 13:09:22 +03:00
Eduard Tihomirov
59a5e71560 Merge branch 'feature/SUPPORT-8682_fix_exit' into develop 2024-11-26 10:59:52 +03:00
m.epshtein
ed4462b7bf height: auto for cell 2024-11-25 14:41:12 +03:00
m.epshtein
312067780e // 2024-11-25 14:40:56 +03:00
m.epshtein
95ad992cae // 2024-11-25 14:38:40 +03:00
m.epshtein
4f1b856a8f grid-warning 2024-11-25 14:38:22 +03:00
Eduard Tihomirov
9ac386a0a2 SUPPORT-8682: Fix 2024-11-22 10:26:29 +03:00
Zaripov Emil
3e06359125 set version 1.9.2-SNAPSHOT 2024-11-20 11:02:41 +03:00
Zaripov Emil
f1a5ef66b4 Merge branch 'master' into develop
# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2024-11-20 10:22:52 +03:00
Zaripov Emil
b85454f8eb set version 1.9.1 2024-11-20 10:20:38 +03:00
Zaripov Emil
afd66e0b1b set version 1.9.1-SNAPSHOT 2024-11-20 10:18:52 +03:00
Eduard Tihomirov
58523c4659 fix EsiaError 2024-11-19 11:26:09 +03:00
kochetkov
1aae56a424 Merge branch 'feateure/SUPPORT-8653_fixes' into develop
# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2024-11-19 10:16:07 +03:00
Eduard Tihomirov
77b9f50de0 Merge branch 'feature/SUPPORT-8571_check_browser' into develop 2024-11-19 09:56:34 +03:00