Commit graph

353 commits

Author SHA1 Message Date
Eduard Tihomirov
39a1f753e3 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-02-03 14:05:34 +03:00
Zaripov Emil
470d761c08 set version 1.9.4 2025-02-03 13:30:18 +03:00
gulnaz
0485296824 cherry-pick from SUPPORT-8874 2025-02-03 13:04:19 +03:00
Zaripov Emil
31105ecd92 set version 1.9.5-SNAPSHOT 2025-01-31 12:55:02 +03:00
Zaripov Emil
d985aa7e92 Merge branch 'hotfix/1.9.4' into test_audit 2025-01-31 10:57:32 +03:00
Zaripov Emil
3bb5425374 set version 1.9.4-SNAPSHOT 2025-01-31 10:35:20 +03:00
Zaripov Emil
5e31292896 set version 1.9.8 2025-01-30 16:10:39 +03:00
Eduard Tihomirov
0ecf88e51f Merge branch 'feature/SUPPORT-8783_landing' into hotfix/1.9.8 2025-01-30 16:07:54 +03:00
Eduard Tihomirov
a5895ecc73 Merge branch 'feature/SUPPORT-8783_landing' into hotfix/1.9.8 2025-01-30 15:27:12 +03:00
Eduard Tihomirov
90e23ccb9f SUPPORT-8783: Fix 2025-01-30 15:21:23 +03:00
adel.kalimullin
9bcc2d8586 SUPPORT-8706: add audit 2025-01-29 15:36:07 +03:00
Eduard Tihomirov
13cf8be812 SUPPORT-8783: Fix
(cherry picked from commit fa549ab779db8b9a29927987529a0da62f90dda0)
2025-01-27 12:20:59 +03:00
Eduard Tihomirov
d6542f36f2 SUPPORT-8783: Fix 2025-01-27 12:20:49 +03:00
Eduard Tihomirov
c3540c133f SUPPORT-8783: Fix
(cherry picked from commit cf929a88b4c3c49f77729a2341a78465012b67cc)
2025-01-27 12:18:23 +03:00
Eduard Tihomirov
203f84916a SUPPORT-8783: Fix 2025-01-24 17:13:06 +03:00
Eduard Tihomirov
98674f6f81 SUPPORT-8783: Fix 2025-01-24 14:33:45 +03:00
m.epshtein
d4fa9723a2 fix
(cherry picked from commit b6f12b6fdd677d65cd452d5043d25ae580243a60)
2025-01-24 14:31:18 +03:00
m.epshtein
cc1079bffc footer
(cherry picked from commit 10471def7f23248f640aaff388726da02d749fc5)
2025-01-24 14:31:08 +03:00
m.epshtein
a354a2065c //
(cherry picked from commit b87b79c1a081f4bb491d1639992260da44634290)
2025-01-24 14:31:01 +03:00
m.epshtein
759bfac032 new html
(cherry picked from commit c3cd9ef351a7da83c04c1892ef4d3d5f4ed880cd)
2025-01-24 14:30:53 +03:00
Eduard Tihomirov
ff21779a66 SUPPORT-8783: Fix 2025-01-24 11:47:15 +03:00
Eduard Tihomirov
1e36465c7a SUPPORT-8783: Fix 2025-01-24 10:41:35 +03:00
Eduard Tihomirov
412f4f6d3c SUPPORT-8783: Fix 2025-01-24 10:25:40 +03:00
Eduard Tihomirov
a92de66be7 SUPPORT-8783: Fix 2025-01-23 11:49:22 +03:00
Eduard Tihomirov
e8d8216673 SUPPORT-8783: Add landing 2025-01-23 11:40:12 +03:00
Zaripov Emil
8401b0ff97 set version 1.9.8-SNAPSHOT 2025-01-23 10:30:24 +03:00
Zaripov Emil
450cb4cd5a set version 1.9.7 2025-01-23 10:28:17 +03:00
Zaripov Emil
b61e82dbd6 set version 1.9.7-SNAPSHOT 2025-01-20 10:20:20 +03:00
Zaripov Emil
6d115be91f set version 1.9.6 2025-01-20 10:18:17 +03:00
kochetkov
f02e5e41e2 SUPPORT-8859: fix 2025-01-20 10:16:14 +03:00
kochetkov
805a40b79b Merge branch 'hotfix/1.9.6' into develop
# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/package-lock.json
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-01-16 15:13:56 +03:00
kochetkov
a4c36a7719 SUPPORT-8859: fix 2025-01-16 15:12:12 +03:00
gulnaz
b16a0a149e Merge branch 'feature/SUPPORT-8846_client_form' into hotfix/1.9.6 2025-01-16 12:19:12 +03:00
gulnaz
d22d599bb3 SUPPORT-8846: fix 2025-01-16 12:15:23 +03:00
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