Халтобин Евгений
|
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
|
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 |
|
gulnaz
|
fca4ac39a7
|
SUPPORT-8723: refactor
|
2024-11-29 11:56:51 +03:00 |
|
gulnaz
|
7a9d3f5e49
|
SUPPORT-8723: set different group.id for each app instance
|
2024-11-28 15:19:20 +03:00 |
|
Eduard Tihomirov
|
fd6507217b
|
SUPPORT-8593: Fix
|
2024-11-27 12:16:40 +03:00 |
|
Eduard Tihomirov
|
85124d60ff
|
SUPPORT-8593: Fix
|
2024-11-27 10:52:37 +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 |
|
Eduard Tihomirov
|
59a5e71560
|
Merge branch 'feature/SUPPORT-8682_fix_exit' into develop
|
2024-11-26 10:59:52 +03:00 |
|
r.gaztdinov
|
61ab814745
|
-i
|
2024-11-25 14:41:17 +03:00 |
|
m.epshtein
|
ed4462b7bf
|
height: auto for cell
|
2024-11-25 14:41:12 +03:00 |
|
r.gaztdinov
|
42c8851e28
|
+
|
2024-11-25 14:41:03 +03:00 |
|
m.epshtein
|
312067780e
|
//
|
2024-11-25 14:40:56 +03:00 |
|
r.gaztdinov
|
5f177cd904
|
80.0
|
2024-11-25 14:40:51 +03:00 |
|
r.gaztdinov
|
e05d5bdfeb
|
0.0
|
2024-11-25 14:40:46 +03:00 |
|
r.gaztdinov
|
11a3957ca1
|
=
|
2024-11-25 14:40:30 +03:00 |
|
r.gaztdinov
|
89b4f030ff
|
subtitle
# Conflicts:
# resources/src/main/resources/business-model/LK RP FL/mydata.page
|
2024-11-25 14:39:43 +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 |
|
r.gaztdinov
|
73fdf6c1d5
|
grid-warning
|
2024-11-25 14:38:12 +03:00 |
|
gulnaz
|
3e55034add
|
Merge branch 'feature/SUPPORT-8726_few_restriction_packages' into hotfix/1.9.1
|
2024-11-22 13:19:36 +03:00 |
|
Eduard Tihomirov
|
172229fbec
|
SUPPORT-8682: Fix
|
2024-11-22 11:08:13 +03:00 |
|
Eduard Tihomirov
|
a2834123f6
|
SUPPORT-8682: Fix
|
2024-11-22 10:42:46 +03:00 |
|
Eduard Tihomirov
|
9ac386a0a2
|
SUPPORT-8682: Fix
|
2024-11-22 10:26:29 +03:00 |
|
kochetkov
|
8a8e2e2369
|
SUPPORT-8609 fix
|
2024-11-22 10:03:49 +03:00 |
|
kochetkov
|
185b4f7630
|
SUPPORT-8609 fix
|
2024-11-22 09:05:50 +03:00 |
|
gulnaz
|
7981b23166
|
SUPPORT-8726: fix restrictions adding
|
2024-11-21 17:25:02 +03:00 |
|
r.gaztdinov
|
8dc6702130
|
passport
|
2024-11-21 11:43:31 +03:00 |
|
r.gaztdinov
|
17c7872350
|
passport
|
2024-11-21 10:37:24 +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
|
f3915330dc
|
Merge branch 'hotfix/1.9.1'
|
2024-11-20 10:19:56 +03:00 |
|
Eduard Tihomirov
|
79adb832bb
|
SUPPORT-8682: Fix
|
2024-11-20 10:19:01 +03:00 |
|
Zaripov Emil
|
afd66e0b1b
|
set version 1.9.1-SNAPSHOT
|
2024-11-20 10:18:52 +03:00 |
|
Zaripov Emil
|
752fca7886
|
Merge branch 'hotfix/1.9.2' into hotfix/1.9.1
|
2024-11-20 10:17:25 +03:00 |
|
gulnaz
|
4362b79507
|
add openapi yaml
|
2024-11-20 09:53:50 +03:00 |
|
Eduard Tihomirov
|
5e050590fa
|
fix
|
2024-11-19 15:31:19 +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 |
|
Zaripov Emil
|
1f4bcef10c
|
fix
|
2024-11-18 11:42:21 +03:00 |
|