Zaripov Emil
|
7357ed664b
|
Merge branch 'hotfix/1.9.8' into test_audit
|
2025-02-17 12:08:30 +03:00 |
|
gulnaz
|
e0318213e5
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaServiceImpl.java
# 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-17 11:33:36 +03:00 |
|
Zaripov Emil
|
d1bdce54f2
|
set version 1.9.8-SNAPSHOT
|
2025-02-17 11:09:32 +03:00 |
|
Eduard Tihomirov
|
7c9e849788
|
remove SUPPORT-8822
|
2025-02-17 11:08:18 +03:00 |
|
Zaripov Emil
|
78e0dc064c
|
Merge branch 'hotfix/1.9.7' into test_audit
|
2025-02-17 08:44:25 +03:00 |
|
Zaripov Emil
|
54a5194649
|
set version 1.9.7-SNAPSHOT
|
2025-02-12 13:43:33 +03:00 |
|
Zaripov Emil
|
4d70570a2c
|
set version 1.9.6-SNAPSHOT
|
2025-02-11 17:19:02 +03:00 |
|
Zaripov Emil
|
1911e67f8c
|
Merge branch 'hotfix/1.9.5'
# Conflicts:
# backend/pom.xml
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-02-07 10:07:24 +03:00 |
|
Eduard Tihomirov
|
bca9d132f2
|
SUPPORT-8897: Fix
(cherry picked from commit 10fb2b1e732dc7edab85f78165ba32f07ca4cf27)
|
2025-02-06 09:38:19 +03:00 |
|
Emir Suleimanov
|
e46460b8fe
|
SUPPORT-8884: add request timeout
|
2025-02-05 18:37:09 +03:00 |
|
Emir Suleimanov
|
1ccdcf1940
|
SUPPORT-8884: add request timeout
|
2025-02-05 18:37:00 +03:00 |
|
Emir Suleimanov
|
4fc5ba8c5a
|
SUPPORT-8884: add request timeout
|
2025-02-05 10:33:21 +03:00 |
|
Emir Suleimanov
|
5b89d8f390
|
SUPPORT-8884: add request timeout
|
2025-02-05 10:29:57 +03:00 |
|
Emir Suleimanov
|
30c85a5f1f
|
SUPPORT-8702: fix notification display
|
2025-02-04 17:38:13 +03:00 |
|
adel.ka
|
f7adcfe105
|
Merge remote-tracking branch 'origin/hotfix/1.9.5' into test_audit
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
|
2025-02-03 14:31:34 +03:00 |
|
Eduard Tihomirov
|
f7e168f80c
|
Merge branch 'master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# config/micord.env
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-02-03 13:54:09 +03:00 |
|
Zaripov Emil
|
e899261b11
|
set version 1.9.4
|
2025-02-03 13:28:46 +03:00 |
|
Emir Suleimanov
|
5ac5a36dc4
|
SUPPORT-8884: add loggers
|
2025-01-31 16:21:10 +03:00 |
|
Zaripov Emil
|
2f8fb63c66
|
set version 1.9.5-SNAPSHOT
|
2025-01-31 13:06:01 +03:00 |
|
adel.kalimullin
|
79c5b41a07
|
SUPPORT-8706: fixes
|
2025-01-31 11:27:29 +03:00 |
|
adel.kalimullin
|
735b91891b
|
SUPPORT-8706: fitterName fixes
|
2025-01-31 11:16:45 +03:00 |
|
Zaripov Emil
|
8f68f4a48e
|
Merge branch 'hotfix/1.9.4' into test_audit
|
2025-01-31 10:57:06 +03:00 |
|
Zaripov Emil
|
93358f45f8
|
set version 1.9.4-SNAPSHOT
|
2025-01-31 10:52:10 +03:00 |
|
Zaripov Emil
|
d926374f5f
|
set version 1.9.8
|
2025-01-30 15:58:28 +03:00 |
|
gulnaz
|
7e59789449
|
SUPPORT-8749: rename common kafka env vars
|
2025-01-29 18:23:56 +03:00 |
|
adel.kalimullin
|
2f7328d6fb
|
SUPPORT-8706: add audit
|
2025-01-29 14:46:49 +03:00 |
|
Artyom Hackimullin
|
2451e49530
|
Merge branch 'feature/SUPPORT-8863_retry_esnsi' into hotfix/1.9.8
|
2025-01-28 15:14:30 +03:00 |
|
Artyom Hackimullin
|
43bfd0f73d
|
fix
|
2025-01-28 14:44:27 +03:00 |
|
Artyom Hackimullin
|
87f33971ec
|
fix
|
2025-01-28 14:10:16 +03:00 |
|
Emir Suleimanov
|
3f769b1131
|
SUPPORT-8884: add loggers
|
2025-01-28 14:03:36 +03:00 |
|
Artyom Hackimullin
|
67c3346b31
|
fix
|
2025-01-28 13:36:38 +03:00 |
|
Artyom Hackimullin
|
294a2959db
|
fix
|
2025-01-28 13:19:54 +03:00 |
|
Artyom Hackimullin
|
2ce0af6967
|
commit(2)
|
2025-01-28 12:05:29 +03:00 |
|
Artyom Hackimullin
|
cd5890bf5d
|
commit(2)
|
2025-01-28 10:05:22 +03:00 |
|
Artyom Hackimullin
|
9e4dc4e00a
|
commit(1)
|
2025-01-28 09:53:54 +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
|
6617e42343
|
set version 1.9.8-SNAPSHOT
|
2025-01-23 10:44:05 +03:00 |
|
Zaripov Emil
|
5493593eb9
|
set version 1.9.7
|
2025-01-23 10:41:18 +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
|
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 |
|
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 |
|