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 |
|
Рауф Латыпов
|
5f7d22c3d3
|
SUPPORT-8817: fix for review (2)
|
2025-01-16 15:10:41 +03:00 |
|
Рауф Латыпов
|
0b29dea6a2
|
SUPPORT-8817: fix for review (1)
|
2025-01-16 13:24:22 +03:00 |
|
Рауф Латыпов
|
08c1555e4e
|
SUPPORT-8817: sync with ervu-lkrp-ul
|
2025-01-16 13:16:09 +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 |
|
Zaripov Emil
|
5c83bd20bf
|
Merge branch 'hotfix/1.9.5'
|
2025-01-16 10:17:00 +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 |
|
gulnaz
|
0fc2d315eb
|
SUPPORT-8846: add person name
|
2025-01-15 14:49:45 +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 |
|
Халтобин Евгений
|
c8d7ce8b0f
|
off server tokens
|
2025-01-15 13:07:19 +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
|
70988aefb9
|
Merge branch 'feature/SUPPORT-8838_fixes' into hotfix/1.9.5
|
2025-01-15 10:09:27 +03:00 |
|
kochetkov
|
bc7e158758
|
SUPPORT-8838 fix version
|
2025-01-15 10:08:28 +03:00 |
|
kochetkov
|
270cc6017c
|
SUPPORT-8838 fix version
|
2025-01-15 10:08:06 +03:00 |
|
Рауф Латыпов
|
9349af6def
|
SUPPORT-8817: set visible buttons and text (by removing AC and the field personName)
|
2025-01-14 23:13:25 +03:00 |
|
Рауф Латыпов
|
db390aa089
|
SUPPORT-8817: add extract request with empty ervu id
|
2025-01-14 22:59:37 +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 |
|
Eduard Tihomirov
|
c349a27ccc
|
SUPPORT-8845: Fix
|
2025-01-14 15:48:34 +03:00 |
|
kochetkov
|
b5b93f1224
|
SUPPORT-8774 update kafka-clients (from develop)
|
2025-01-14 15:20:40 +03:00 |
|
Халтобин Евгений
|
72ec94cb9a
|
to unix format
|
2025-01-14 13:48:11 +03:00 |
|
kochetkov
|
576e280208
|
remove unnecessary call to authmanager
|
2025-01-14 12:58:07 +03:00 |
|
Eduard Tihomirov
|
6cdf9fe533
|
SUPPORT-8845: Fix
|
2025-01-14 12:50:02 +03:00 |
|
kochetkov
|
09916af2c4
|
some nginx conf from rtsk sources
|
2025-01-14 10:01:17 +03:00 |
|
kochetkov
|
11f49ae09b
|
SUPPORT-8838 fixes
|
2025-01-13 13:06:29 +03:00 |
|
kochetkov
|
f8da0c82d6
|
update platform and package to 3.187.1
|
2025-01-13 12:42:11 +03:00 |
|
kochetkov
|
df562fe38f
|
add patched server.xml from ul
|
2025-01-13 12:18:36 +03:00 |
|
Халтобин Евгений
|
d1f32f5210
|
restored verify of ESIA access token
|
2025-01-13 11:41:53 +03:00 |
|
kochetkov
|
9421735242
|
SUPPORT-8830 fix
|
2025-01-10 16:31:50 +03:00 |
|
Рауф Латыпов
|
b129f96ca4
|
SUPPORT-8717: добавил скрытие блоков при несоответствие кода учета
|
2025-01-10 16:00:59 +03:00 |
|
Рауф Латыпов
|
7db7c5bd99
|
SUPPORT-8796: recruitment date start + code
|
2025-01-10 15:37:22 +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 |
|
Makarova Elena
|
40e0c159fb
|
SUPPORT-8844 доработка контроллеров по отсутствию данных о фл
|
2025-01-10 10:32:48 +03:00 |
|
Eduard Tihomirov
|
5da0b236c1
|
SUPPORT-8845: Fix
|
2025-01-09 16:52:35 +03:00 |
|
Eduard Tihomirov
|
c6af9ba05e
|
Cherry pick SUPPORT-8682
|
2025-01-09 16:45:16 +03:00 |
|
Zaripov Emil
|
0d6d3c7a29
|
SUPPORT-8843 fix
|
2025-01-09 10:58:41 +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 |
|
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 |
|