Commit graph

1338 commits

Author SHA1 Message Date
Eduard Tihomirov
83ed180a7c SUPPORT-8897: Fix 2025-02-17 16:21:33 +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
Eduard Tihomirov
e09c492d8a SUPPORT-8897: Fix 2025-02-17 14:32:13 +03:00
Eduard Tihomirov
de60239feb SUPPORT-8897: Fix 2025-02-17 13:53:55 +03:00
Eduard Tihomirov
33e42e42b1 SUPPORT-8897: Fix
(cherry picked from commit 789e5d48317f738cbac6f5b90560975b38456917)
2025-02-17 13:50:22 +03:00
Eduard Tihomirov
175493f5e0 SUPPORT-8897: Fix 2025-02-17 13:49:37 +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
Zaripov Emil
78e0dc064c Merge branch 'hotfix/1.9.7' into test_audit 2025-02-17 08:44:25 +03:00
Zaripov Emil
24089c3d07 Merge branch 'feature/SUPPORT-8917' into hotfix/1.9.7 2025-02-17 08:42:57 +03:00
Zaripov Emil
6fedaf068c fix 2025-02-13 13:52:08 +03:00
Zaripov Emil
b4e0a01d1c SUPPORT-8917 fixed 2025-02-12 15:08:38 +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
gulnaz
757cc71507 SUPPORT-8735: apply custom grid header 2025-02-11 11:52:12 +03:00
Eduard Tihomirov
8b64c46322 SUPPORT-8911: Fix
(cherry picked from commit 8e7f8c57f15a1cf268cd9fa5c732b3f141e2a039)
2025-02-11 09:36:53 +03:00
Eduard Tihomirov
d4bdbd2f88 SUPPORT-8911: Fix
(cherry picked from commit f1b998e6a056aeb9cbd1c4bdfcc16e2c94ab72ce)
2025-02-11 09:36:41 +03:00
Eduard Tihomirov
a08ac5a4b5 SUPPORT-8911: Fix
(cherry picked from commit 17cdc6c8eed91054e0c017fc17bde669dd9574cf)
2025-02-11 09:36:33 +03:00
Eduard Tihomirov
d15308f456 SUPPORT-8911: Fix
(cherry picked from commit bbbe9cdcfd9ada3bc74e78e5b76058c881db62d2)
2025-02-11 09:36:26 +03:00
Zaripov Emil
eafd6aca90 Merge branch 'hotfix/1.9.5' 2025-02-10 11:57:54 +03:00
Zaripov Emil
6fb8755442 Merge branch 'hotfix/1.9.5' into test_audit 2025-02-07 10:27:51 +03:00
Eduard Tihomirov
3e3416d08c Merge branch 'feature/SUPPORT-8905_fix_check_csp' into test_audit 2025-02-07 10:26:27 +03:00
Eduard Tihomirov
7e9e2a877d Merge branch 'feature/SUPPORT-8905_fix_check_csp' into hotfix/1.9.5 2025-02-07 10:24:20 +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
b13d8e1b8e SUPPORT-8905: Fix 2025-02-07 09:05:52 +03:00
Eduard Tihomirov
d049de1848 SUPPORT-8897: Fix
(cherry picked from commit 688e4a40f15dd01962c9ddf4af9e2063f3c6e58f)
2025-02-07 09:03:46 +03:00
Artyom Hackimullin
4a13cb628f SUPPORT-8866: fix 2025-02-06 15:43:53 +03:00
Artyom Hackimullin
eec93233af SUPPORT-8866: commit 2025-02-06 15:41:38 +03:00
m.epshtein
d7315827f6 header 2025-02-06 13:48:16 +03:00
Eduard Tihomirov
bca9d132f2 SUPPORT-8897: Fix
(cherry picked from commit 10fb2b1e732dc7edab85f78165ba32f07ca4cf27)
2025-02-06 09:38:19 +03:00
Eduard Tihomirov
8644085c1c Merge branch 'hotfix/1.9.5' into feature/SUPPORT-8848_fix_error_handler 2025-02-06 09:37:29 +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
Eduard Tihomirov
f60d549275 SUPPORT-8848: Fix 2025-02-03 15:05:58 +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