Commit graph

394 commits

Author SHA1 Message Date
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
Eduard Tihomirov
8bfbd20525 SUPPORT-8682: Fix 2024-11-19 09:51:26 +03:00
Zaripov Emil
2807482ff6 Merge branch 'master' into hotfix/1.9.2 2024-11-19 09:11:16 +03:00
Zaripov Emil
9f5aa94215 Merge branch 'master' into develop 2024-11-19 09:10:38 +03:00
Zaripov Emil
33762eb876 Merge branch 'hotfix/1.9.1' 2024-11-19 09:09:34 +03:00
gulnaz
1e9436b8c9 SUPPORT-8691: use security context; rename method 2024-11-18 17:37:18 +03:00
Eduard Tihomirov
1c6ffb7a79 SUPPORT-8571: Fix 2024-11-15 10:30:20 +03:00
gulnaz
28aee7960d Merge branch 'feature/SUPPORT-8681_fix_renderer' into hotfix/1.9.2 2024-11-15 10:07:26 +03:00
m.epshtein
a1c4008f1a SUPPORT-8615 2024-11-14 19:05:48 +03:00
kochetkov
0d349e5d38 small fixes 2024-11-14 14:37:27 +03:00
kochetkov
e05a7a9207 revert files 2024-11-14 14:10:19 +03:00
gulnaz
54d0182ee3 SUPPORT-8681: fix grid cell renderer 2024-11-14 10:20:04 +03:00
kochetkov
5f130bcf18 fix from ervu repo 2024-11-14 09:30:41 +03:00
Eduard Tihomirov
1e78891957 SUPPORT-8654: Fix
(cherry picked from commit 2797151d5ece7d9e31e66a291398f8e343bddab1)
2024-11-13 12:09:10 +03:00
Eduard Tihomirov
57f81cb350 SUPPORT-8571: Fix 2024-11-13 11:22:13 +03:00
kochetkov
60cbf11ab7 SUPPORT-8653 fix csrf cookie name 2024-11-13 09:13:06 +03:00
kochetkov
8badedfbda SUPPORT-8653 fix compile 2024-11-12 14:29:40 +03:00
kochetkov
67884c50a9 Merge remote-tracking branch 'origin/hotfix/1.9.2' into feateure/SUPPORT-8653_fixes 2024-11-11 09:32:59 +03:00
Zaripov Emil
af3f09c0c4 set version 1.10.0-SNAPSHOT 2024-11-08 13:58:00 +03:00
kochetkov
857f1d0fd7 SUPPORT-8653 fixes 2024-11-08 10:01:02 +03:00
kochetkov
6fd46a23c7 SUPPORT-8653 fixes 2024-11-08 09:37:38 +03:00
kochetkov
0600c27ee9 Merge remote-tracking branch 'origin/update/3.185' into feateure/SUPPORT-8653_fixes
# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json
2024-11-08 08:51:36 +03:00
ivanov.denis
7b12c2731d fix 2024-11-07 16:58:30 +03:00
ivanov.denis
6d4ffddd18 package.json update 2024-11-07 16:31:42 +03:00
ivanov.denis
dba2480ade release 3.185.0 2024-11-07 16:14:07 +03:00
Zaripov Emil
86a587c4f4 set version 1.9.2-SNAPSHOT 2024-11-05 12:41:42 +03:00