gulnaz
|
7e59789449
|
SUPPORT-8749: rename common kafka env vars
|
2025-01-29 18:23:56 +03:00 |
|
Халтобин Евгений
|
44f9351cde
|
DEVOPS-1898 fixes from Pavel
|
2025-01-24 14:07:15 +03:00 |
|
gulnaz
|
961ba3b4de
|
fix after merge
|
2025-01-23 12:52:02 +03:00 |
|
Artyom Hackimullin
|
2aead95668
|
update esnsi okopf
|
2025-01-23 12:36:15 +03:00 |
|
gulnaz
|
d764fb7eb1
|
add import
|
2025-01-23 11:24:44 +03:00 |
|
gulnaz
|
3f04f84c7f
|
Merge branch 'master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ervu/client/okopf/EsnsiOkopfClient.java
# backend/src/main/java/ervu/dao/okopf/OkopfDaoImpl.java
# backend/src/main/java/ervu/service/scheduler/EsnsiOkopfSchedulerServiceImpl.java
# backend/src/main/java/ru/micord/ervu/kafka/controller/ErvuKafkaController.java
# backend/src/main/java/ru/micord/ervu/kafka/model/Data.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/UlDataService.java
# config.md
# config/micord.env
# config/standalone/dev/standalone.xml
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-01-23 11:20:35 +03:00 |
|
Zaripov Emil
|
5493593eb9
|
set version 1.9.7
|
2025-01-23 10:41:18 +03:00 |
|
Zaripov Emil
|
1509a92b11
|
Merge branch 'hotfix/1.9.7'
|
2025-01-23 10:39:32 +03:00 |
|
Zaripov Emil
|
3668582991
|
Revert "добавила контроллер видимости текста запроса выписки"
This reverts commit 1bd828e3ff.
|
2025-01-22 17:14:35 +03:00 |
|
Makarova Elena
|
952193820e
|
добавила контроллер видимости текста запроса выписки
|
2025-01-22 17:14:04 +03:00 |
|
Zaripov Emil
|
25c0c15773
|
Merge branch 'hotfix/1.9.7' of 10.10.31.70:/ervu-lkrp-ul into hotfix/1.9.7
|
2025-01-21 11:46:45 +03:00 |
|
Eduard Tihomirov
|
3806812f46
|
fix imports
|
2025-01-21 11:26:06 +03:00 |
|
Eduard Tihomirov
|
3d0a75e45d
|
Cherry pick marker verify
|
2025-01-21 11:17:24 +03:00 |
|
Artyom Hackimullin
|
c8e1e8b1b3
|
Merge remote-tracking branch 'origin/hotfix/1.9.7' into feature/SUPPORT-8863_not_deploy_okopf
|
2025-01-21 09:53:16 +03:00 |
|
Artyom Hackimullin
|
1130a5addd
|
SUPPORT-8863: revert micord.env
|
2025-01-21 09:52:27 +03:00 |
|
Artyom Hackimullin
|
108ec97ca6
|
SUPPORT-8863: test(3)
|
2025-01-20 16:28:54 +03:00 |
|
Artyom Hackimullin
|
ea090e14c5
|
SUPPORT-8863: test(2)
|
2025-01-20 16:19:38 +03:00 |
|
Artyom Hackimullin
|
1710a75da3
|
SUPPORT-8863: test(1)
|
2025-01-20 15:59:17 +03:00 |
|
Makarova Elena
|
1bd828e3ff
|
добавила контроллер видимости текста запроса выписки
|
2025-01-20 10:41:25 +03:00 |
|
Zaripov Emil
|
c34eec1f42
|
Merge branch 'master' into develop
# Conflicts:
# backend/pom.xml
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-01-20 10:31:29 +03:00 |
|
Artyom Hackimullin
|
16fbbebe62
|
SUPPORT-8863: fix
|
2025-01-20 10:25:42 +03:00 |
|
Zaripov Emil
|
118606aeb5
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8868_excerpt_time_zone' into hotfix/1.9.7
|
2025-01-20 10:14:26 +03:00 |
|
Zaripov Emil
|
cb77cb47d1
|
set version 1.9.7-SNAPSHOT
|
2025-01-20 10:05:34 +03:00 |
|
Zaripov Emil
|
6a26bf6fdf
|
set version 1.9.6
|
2025-01-20 10:03:30 +03:00 |
|
gulnaz
|
132daa310f
|
Merge branch 'hotfix/1.9.6' into feature/SUPPORT-8868_excerpt_time_zone
|
2025-01-20 10:02:26 +03:00 |
|
Zaripov Emil
|
59fea37d63
|
Merge branch 'hotfix/1.9.6'
|
2025-01-20 10:02:24 +03:00 |
|
kochetkov
|
01c44dfd07
|
Merge branch 'feature/SUPPORT-8859_fixes' into hotfix/1.9.6
|
2025-01-20 09:58:31 +03:00 |
|
Artyom Hackimullin
|
38af4421fe
|
SUPPORT-8863: fix
|
2025-01-20 09:30:35 +03:00 |
|
Artyom Hackimullin
|
d8c9b1bd82
|
SUPPORT-8863: fix
|
2025-01-18 20:43:36 +03:00 |
|
Artyom Hackimullin
|
737af83478
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8863_not_deploy_okopf' into feature/SUPPORT-8863_not_deploy_okopf
|
2025-01-18 20:25:37 +03:00 |
|
Artyom Hackimullin
|
18ae53b069
|
SUPPORT-8863: fix
|
2025-01-18 20:25:08 +03:00 |
|
Artyom Hackimullin
|
eb8e7d042d
|
SUPPORT-8863: fix
|
2025-01-18 20:25:08 +03:00 |
|
Artyom Hackimullin
|
0f1446ffbf
|
SUPPORT-8863: update
|
2025-01-18 20:25:07 +03:00 |
|
Artyom Hackimullin
|
8aabcc5d11
|
SUPPORT-8689: fix
|
2025-01-17 15:59:56 +03:00 |
|
Artyom Hackimullin
|
c4078bfdee
|
SUPPORT-8689: fix
|
2025-01-17 15:50:16 +03:00 |
|
Artyom Hackimullin
|
46f78c6959
|
SUPPORT-8689: update
|
2025-01-17 15:37:19 +03:00 |
|
Makarova Elena
|
5200173fc2
|
добавила контроллер видимости текста запроса выписки
|
2025-01-17 13:44:36 +03:00 |
|
gulnaz
|
ab8b12739a
|
SUPPORT-8868: add time zone to excerpt request
|
2025-01-17 12:12:32 +03:00 |
|
Eduard Tihomirov
|
a293a61742
|
Merge branch 'feature/SUPPORT-8822_new_state' into develop
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
|
2025-01-17 11:50:37 +03:00 |
|
kochetkov
|
0fe8a1ead6
|
small fix
|
2025-01-16 12:52:45 +03:00 |
|
kochetkov
|
a2e1e43e83
|
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 12:48:58 +03:00 |
|
kochetkov
|
19d999ad07
|
Merge branch 'feature/SUPPORT-8859_fixes' into hotfix/1.9.6
|
2025-01-16 10:42:36 +03:00 |
|
Zaripov Emil
|
7b53c7d6dd
|
set version 1.9.6-SNAPSHOT
|
2025-01-16 10:15:36 +03:00 |
|
Zaripov Emil
|
8f5f109b98
|
set version
|
2025-01-16 10:12:40 +03:00 |
|
Zaripov Emil
|
714374ae55
|
Merge branch 'hotfix/1.9.5'
|
2025-01-16 10:11:33 +03:00 |
|
gulnaz
|
5169b5802d
|
Merge branch 'hotfix/1.9.5' into develop
|
2025-01-15 17:42:22 +03:00 |
|
gulnaz
|
72f76c102f
|
remove redundant checking
|
2025-01-15 17:41:39 +03:00 |
|
Рауф Латыпов
|
872d9e9208
|
Merge branch 'feature/SUPPORT-8831_button_visibility' into develop
|
2025-01-15 17:05:09 +03:00 |
|
Рауф Латыпов
|
0ccdcf2a69
|
Merge branch 'develop' into feature/SUPPORT-8831_button_visibility
# Conflicts:
# frontend/src/ts/ervu/component/grid/InMemoryStaticGrid.ts
|
2025-01-15 17:02:35 +03:00 |
|
kochetkov
|
e382d88c15
|
Merge remote-tracking branch 'origin/hotfix/1.9.5' into develop
# Conflicts:
# config/micord.env
|
2025-01-15 16:36:38 +03:00 |
|