gulnaz
|
a17c129eb5
|
Merge branch 'develop' into feature/SUPPORT-8749_fix_config
# Conflicts:
# config/micord.env
|
2025-03-04 10:26:22 +03:00 |
|
Eduard Tihomirov
|
93ab3255cb
|
Merge branch 'feature/SUPPORT-8942_fix' into develop
|
2025-02-27 11:18:08 +03:00 |
|
gulnaz
|
bdfdedefe1
|
set offset reset strategy
|
2025-02-26 17:04:47 +03:00 |
|
Eduard Tihomirov
|
4feee469ac
|
fix cron
|
2025-02-26 14:35:19 +03:00 |
|
Eduard Tihomirov
|
51c3f18824
|
SUPPORT-8942: Fix
|
2025-02-26 14:09:58 +03:00 |
|
Eduard Tihomirov
|
be04288309
|
SUPPORT-8942: Fix
|
2025-02-26 12:43:59 +03:00 |
|
Eduard Tihomirov
|
3a7e507861
|
SUPPORT-8942: Fix
|
2025-02-26 12:32:38 +03:00 |
|
Eduard Tihomirov
|
ab430db08f
|
SUPPORT-8942: Fix
|
2025-02-26 12:29:36 +03:00 |
|
Eduard Tihomirov
|
c36dee9764
|
SUPPORT-8942: Fix
|
2025-02-26 12:16:16 +03:00 |
|
Eduard Tihomirov
|
f2fbc71020
|
SUPPORT-8942: Fix
|
2025-02-26 12:13:45 +03:00 |
|
Eduard Tihomirov
|
df37c970d4
|
SUPPORT-8942: Fix
|
2025-02-26 11:22:03 +03:00 |
|
Eduard Tihomirov
|
01ebd16710
|
SUPPORT-8942: Fix
|
2025-02-26 11:16:35 +03:00 |
|
Eduard Tihomirov
|
2ec132d30c
|
SUPPORT-8942: Fix
|
2025-02-26 10:17:18 +03:00 |
|
Eduard Tihomirov
|
b8ddb3b6ae
|
SUPPORT-8942: Fix
|
2025-02-26 09:49:56 +03:00 |
|
Eduard Tihomirov
|
a26b95a355
|
SUPPORT-8942: Fix
|
2025-02-25 11:35:39 +03:00 |
|
Eduard Tihomirov
|
a648214f51
|
SUPPORT-8942: Fix
|
2025-02-25 08:44:48 +03:00 |
|
gulnaz
|
cabde7f04d
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ru/micord/ervu/kafka/controller/ErvuKafkaController.java
# backend/src/main/java/ru/micord/ervu/kafka/exception/ExcerptException.java
# 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-24 16:33:50 +03:00 |
|
Eduard Tihomirov
|
da11e5a3a4
|
SUPPORT-8643: Fix
|
2025-02-24 15:02:49 +03:00 |
|
Eduard Tihomirov
|
2b874412d6
|
SUPPORT-8643: Fix
|
2025-02-24 15:01:27 +03:00 |
|
Zaripov Emil
|
c4b0a6fefb
|
set version 1.9.8
|
2025-02-24 14:49:50 +03:00 |
|
Zaripov Emil
|
dc48f3dce7
|
Merge branch 'hotfix/1.9.8'
|
2025-02-24 14:48:02 +03:00 |
|
Zaripov Emil
|
55b6f959a6
|
revert SUPPORT-8917
|
2025-02-21 17:52:21 +03:00 |
|
adel.kalimullin
|
7176977893
|
Merge branch 'test_audit' into hotfix/1.9.8
|
2025-02-21 16:17:44 +03:00 |
|
Eduard Tihomirov
|
186f3d5d40
|
SUPPORT-8643: Fix
|
2025-02-21 12:23:09 +03:00 |
|
Eduard Tihomirov
|
a965b4cd83
|
SUPPORT-8897: Fix
(cherry picked from commit 0b20270fd5da2d20576cd40cdf3a9fd52807f894)
|
2025-02-21 11:55:11 +03:00 |
|
Eduard Tihomirov
|
813ba4c4d5
|
SUPPORT-8643: Fix
(cherry picked from commit 574d67cd3cddae828f5f0c67132f680c78359752)
|
2025-02-21 11:55:06 +03:00 |
|
Eduard Tihomirov
|
553ae85d26
|
SUPPORT-8643: Fix
(cherry picked from commit a3f898037002c277866768e196edadb377ae4678)
|
2025-02-21 11:46:44 +03:00 |
|
Zaripov Emil
|
001a90e4d1
|
Merge branch 'hotfix/1.9.8' into test_audit
|
2025-02-20 14:46:16 +03:00 |
|
Zaripov Emil
|
0db0af9529
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8866_active_route' into hotfix/1.9.8
|
2025-02-20 14:43:45 +03:00 |
|
Zaripov Emil
|
63757e9dc3
|
Merge branch 'hotfix/1.9.8' into test_audit
|
2025-02-19 15:49:35 +03:00 |
|
m.epshtein
|
e4858fa5c4
|
SUPPORT-8933
|
2025-02-19 15:40:54 +03:00 |
|
Eduard Tihomirov
|
9d5177d800
|
Merge branch 'hotfix/1.9.8' into test_audit
|
2025-02-18 10:59:18 +03:00 |
|
Eduard Tihomirov
|
c766170ec7
|
SUPPORT-8897: Fix
(cherry picked from commit 789e5d48317f738cbac6f5b90560975b38456917)
|
2025-02-18 10:58:25 +03:00 |
|
Zaripov Emil
|
62fa49ff65
|
SUPPORT-8917 fix 2
|
2025-02-18 10:56:28 +03:00 |
|
Zaripov Emil
|
39239e9ab4
|
SUPPORT-8917 fix 2
|
2025-02-18 10:55:16 +03:00 |
|
Zaripov Emil
|
8d3227bce1
|
SUPPORT-8917 fix
|
2025-02-18 10:20:14 +03:00 |
|
Zaripov Emil
|
853881d2d5
|
SUPPORT-8917 fix
|
2025-02-18 09:15:21 +03:00 |
|
Eduard Tihomirov
|
1d75707174
|
Merge branch 'hotfix/1.9.8' into test_audit
|
2025-02-17 15:23:05 +03:00 |
|
Eduard Tihomirov
|
2f1c33388c
|
Merge branch 'feature/SUPPORT-8911_fix_csp_load' into hotfix/1.9.8
|
2025-02-17 15:15:24 +03:00 |
|
Emir Suleimanov
|
da9d6a86d4
|
Merge remote-tracking branch 'origin/test_audit' into test_audit
|
2025-02-17 14:49:18 +03:00 |
|
Emir Suleimanov
|
08b2e06d51
|
SUPPORT-8702: fix notification display
|
2025-02-17 14:48:38 +03:00 |
|
adel.ka
|
66314960c7
|
SUPPORT-8914: add new network attribute
|
2025-02-17 14:45:41 +03:00 |
|
Emir Suleimanov
|
f0abfe898c
|
fix
|
2025-02-17 13:35:46 +03:00 |
|
Emir Suleimanov
|
2e2e6ead89
|
SUPPORT-8702: fix notification display
|
2025-02-17 13:32:45 +03:00 |
|
Zaripov Emil
|
7357ed664b
|
Merge branch 'hotfix/1.9.8' into test_audit
|
2025-02-17 12:08:30 +03:00 |
|
Makarova Elena
|
f7048063cb
|
добавила контроллер видимости текста запроса выписки
|
2025-02-17 12:08:04 +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 |
|
Халтобин Евгений
|
16531e0dea
|
updated nginx image
|
2025-02-17 09:01:35 +03:00 |
|