Commit graph

651 commits

Author SHA1 Message Date
Халтобин Евгений
cc1787d41b Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0 2024-09-26 13:36:21 +03:00
Халтобин Евгений
fa4ac6b53a Merge branch 'feature/landing' into release/1.0.0 2024-09-26 13:36:04 +03:00
Zaripov Emil
e3837f99ae Merge branch 'master' into develop 2024-09-26 13:12:13 +03:00
Zaripov Emil
a1c72bef73 Merge branch 'release/1.0.0' 2024-09-26 13:11:51 +03:00
Zaripov Emil
bb2858f41b Merge remote-tracking branch 'origin/feature/landing' into release/1.0.0 2024-09-26 13:11:08 +03:00
Zaripov Emil
db156c1acb Merge branch 'master' into develop 2024-09-26 12:52:18 +03:00
Zaripov Emil
ba6b101eb4 Merge branch 'release/1.0.0' 2024-09-26 12:51:58 +03:00
Eduard Tihomirov
371cffabbd Merge branch 'feature/SUPPORT-8458_file' into release/1.0.0 2024-09-26 10:50:37 +03:00
Eduard Tihomirov
41a6a92f12 SUPPORT-8458: Fix 2024-09-25 14:03:05 +03:00
Eduard Tihomirov
68495e4285 SUPPORT-8458: Fix 2024-09-25 09:38:18 +03:00
Халтобин Евгений
b375cb7733 temp 2024-09-24 17:20:36 +03:00
Zaripov Emil
ac380e051e Merge branch 'master' into develop 2024-09-24 16:39:10 +03:00
Zaripov Emil
211085ecdc Merge remote-tracking branch 'origin/release/1.0.0' 2024-09-24 16:38:47 +03:00
gulnaz
30e7e1b2bd rename kafka url prop 2024-09-24 16:36:29 +03:00
gulnaz
bd4cc9d4ea rename props 2024-09-24 16:30:38 +03:00
Халтобин Евгений
8a62fedaf2 Merge branch 'develop' into feature/landing 2024-09-24 14:55:18 +03:00
Zaripov Emil
e7c9c14533 Merge branch 'master' into develop 2024-09-24 14:16:27 +03:00
Zaripov Emil
bb18027332 Merge branch 'release/1.0.0' 2024-09-24 14:16:02 +03:00
Eduard Tihomirov
a24052770e SUPPORT-8458: Fix 2024-09-24 12:30:46 +03:00
Eduard Tihomirov
6978ba3011 Merge branch 'develop' into feature/SUPPORT-8458_file
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
2024-09-24 12:22:44 +03:00
gulnaz
8b3e0f9b31 SUPPORT-8558: rename av topic 2024-09-24 11:46:36 +03:00
Eduard Tihomirov
61075c6e34 SUPPORT-8458: Fix 2024-09-24 09:36:18 +03:00
Zaripov Emil
01b3081215 Merge branch 'release/1.0.0' into develop 2024-09-23 12:14:36 +03:00
gulnaz
1d0c95be13 change esia certificate hash param name 2024-09-23 11:25:37 +03:00
Eduard Tihomirov
101bc6dd58 Merge branch 'feature/SUPPORT-8552_download_topic' into release/1.0.0 2024-09-23 10:20:32 +03:00
Eduard Tihomirov
11dca6bdf1 Merge branch 'feature/SUPPORT-8551_create_db' into release/1.0.0 2024-09-23 10:04:38 +03:00
Eduard Tihomirov
fa5cbf9aaa SUPPORT-8458: Fix 2024-09-23 10:03:57 +03:00
Eduard Tihomirov
31121baf39 SUPPORT-8551: Fix 2024-09-19 11:08:17 +03:00
Eduard Tihomirov
c2d5cc176f SUPPORT-8551: Fix 2024-09-19 11:04:37 +03:00
gulnaz
ef02a774d4 SUPPORT-8553: fix properties 2024-09-19 10:31:54 +03:00
Eduard Tihomirov
61cbee8782 SUPPORT-8552: Fix 2024-09-19 09:32:52 +03:00
Хакимуллин Артём
11de13fb13 Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0 2024-09-18 15:55:32 +03:00
Хакимуллин Артём
67963df790 Merge branch 'feature/SUPPORT-8471_fix_load_okopf' into release/1.0.0 2024-09-18 15:54:37 +03:00
Хакимуллин Артём
41ac302b74 SUPPORT-8471: change naming in import 2024-09-18 15:21:23 +03:00
Хакимуллин Артём
1e4b910e40 SUPPORT-8471: fix 2024-09-18 15:04:33 +03:00
Eduard Tihomirov
ac8625bae0 SUPPORT-8551: Add sql scripts 2024-09-18 14:55:27 +03:00
Zaripov Emil
dde2082700 Merge branch 'develop' into feature/landing
# Conflicts:
#	frontend/src/ts/ervu/component/fileupload/ErvuFileUpload.ts
#	frontend/webpack.aot.config.js
2024-09-18 14:22:28 +03:00
Zaripov Emil
8d4bcc4596 ESIA-URI_BASE-URI=https://esia-portal1.test.gosuslugi.ru/ 2024-09-18 13:44:29 +03:00
Хакимуллин Артём
158df51227 SUPPORT-8471: fix 2024-09-18 13:08:45 +03:00
Zaripov Emil
e7e5242fcc Merge branch 'feature/WEBBPMNEXT-9175_migrate_to_tomcat' into release/1.0.0 2024-09-18 11:50:31 +03:00
Zaripov Emil
fc0a3b0e7e Merge remote-tracking branch 'origin/update_applications' into develop 2024-09-18 11:49:06 +03:00
Zaripov Emil
e8c57afc3f Merge remote-tracking branch 'origin/update_applications' into release/1.0.0 2024-09-18 11:48:33 +03:00
Халтобин Евгений
ea6dbf9b3d added new line to micord.env 2024-09-18 11:12:19 +03:00
Халтобин Евгений
7950e67c20 moved properties to env file 2024-09-18 11:06:36 +03:00
Makarova Elena
5b606ae66e замена приложений 2024-09-18 10:52:35 +03:00
Zaripov Emil
fcb0736bd5 fix by Pavel 2024-09-18 10:25:30 +03:00
Pavel Zilke
8ba1d7803c angie to nginx 2024-09-18 10:21:26 +03:00
Eduard Tihomirov
c0c2885e76 Merge remote-tracking branch 'origin/release/1.0.0' into feature/SUPPORT-8458_file
# Conflicts:
#	backend/pom.xml
#	pom.xml
2024-09-18 10:17:58 +03:00
Eduard Tihomirov
7ca6fef779 SUPPORT-8458: Fix 2024-09-18 09:45:17 +03:00
Makarova Elena
2c0f40ff09 fix дата 2024-09-17 17:14:43 +03:00