Zaripov Emil
|
a519b42a46
|
fix by artyom h
|
2024-11-02 18:16:55 +03:00 |
|
Халтобин Евгений
|
031617b4c2
|
fix
|
2024-10-24 09:18:15 +03:00 |
|
Eduard Tihomirov
|
3059b797df
|
Merge branch 'hotfix/1.8.2' into feature/SUPPORT-8579_access_marker
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# config/standalone/dev/standalone.xml
|
2024-10-23 14:45:41 +03:00 |
|
Халтобин Евгений
|
311e1583d1
|
removed old props
|
2024-10-23 10:31:51 +03:00 |
|
Халтобин Евгений
|
474ad39775
|
update env file
|
2024-10-21 08:58:25 +03:00 |
|
Eduard Tihomirov
|
09b850df49
|
fix upload data role
|
2024-10-15 14:47:55 +03:00 |
|
Eduard Tihomirov
|
b6d1c9720c
|
Merge remote-tracking branch 'origin/master' into feature/SUPPORT-8579_access_marker
# Conflicts:
# backend/src/main/java/ervu/controller/EmployeeInfoFileUploadController.java
# backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
# config/standalone/dev/standalone.xml
|
2024-10-11 10:32:02 +03:00 |
|
Eduard Tihomirov
|
2c2ff8680a
|
SUPPORT-8579: Fix
|
2024-10-03 16:26:46 +03:00 |
|
gulnaz
|
e03f255df3
|
SUPPORT-8583: exclude some file statuses
|
2024-10-03 11:59:26 +03:00 |
|
Халтобин Евгений
|
8b7a8845f5
|
Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0
|
2024-10-01 11:13:42 +03:00 |
|
Eduard Tihomirov
|
365e5e4b7d
|
SUPPORT-8556: Fix
|
2024-10-01 10:59:53 +03:00 |
|
Eduard Tihomirov
|
323b27be12
|
Merge remote-tracking branch 'origin/release/1.0.0' into feature/SUPPORT-8556_fix
|
2024-10-01 09:49:35 +03:00 |
|
ivanov.denis
|
e7d83594c6
|
SUPPORT-8438 import fix
|
2024-09-30 18:15:49 +03:00 |
|
ivanov.denis
|
f21375bcc7
|
SUPPORT-8438 val fix
|
2024-09-30 17:13:07 +03:00 |
|
ivanov.denis
|
6866bacf52
|
?
|
2024-09-30 15:34:19 +03:00 |
|
Pavel Zilke
|
be6c1aef93
|
fix ervu kafka bootstrap servers
|
2024-09-28 19:17:32 +03:00 |
|
gulnaz
|
89326bd0b9
|
rename s3 props; add s3 env vars
|
2024-09-28 10:45:20 +03:00 |
|
Eduard Tihomirov
|
723a4b9654
|
SUPPORT-8556: Fix
|
2024-09-26 14:10:57 +03:00 |
|
Eduard Tihomirov
|
371cffabbd
|
Merge branch 'feature/SUPPORT-8458_file' into release/1.0.0
|
2024-09-26 10:50:37 +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 |
|
Eduard Tihomirov
|
a24052770e
|
SUPPORT-8458: Fix
|
2024-09-24 12:30:46 +03:00 |
|
gulnaz
|
8b3e0f9b31
|
SUPPORT-8558: rename av topic
|
2024-09-24 11:46:36 +03:00 |
|
gulnaz
|
1d0c95be13
|
change esia certificate hash param name
|
2024-09-23 11:25:37 +03:00 |
|
gulnaz
|
ef02a774d4
|
SUPPORT-8553: fix properties
|
2024-09-19 10:31:54 +03:00 |
|
Zaripov Emil
|
8d4bcc4596
|
ESIA-URI_BASE-URI=https://esia-portal1.test.gosuslugi.ru/
|
2024-09-18 13:44:29 +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 |
|
Халтобин Евгений
|
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 |
|
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 |
|
Zaripov Emil
|
89bda5d0bc
|
Merge branch 'feature/WEBBPMNEXT-9175_migrate_to_tomcat' into release/1.0.0
|
2024-09-17 16:15:32 +03:00 |
|
Pavel Zilke
|
5d480a9114
|
Dockerfile.TC - update base image
|
2024-09-17 14:42:56 +03:00 |
|
Eduard Tihomirov
|
9c2c57a590
|
Merge branch 'feature/WEBBPMNEXT-9175_migrate_to_tomcat' into release/1.0.0
# Conflicts:
# config/tomcat/etc/tomcat/webbpm.properties
|
2024-09-17 14:19:34 +03:00 |
|
Eduard Tihomirov
|
88e5a86a4c
|
Revert "test2"
This reverts commit 90ec62c721.
|
2024-09-17 14:14:42 +03:00 |
|
Zaripov Emil
|
90ec62c721
|
test2
|
2024-09-16 17:52:15 +03:00 |
|
gulnaz
|
c10af187c6
|
SUPPORT-8411: add time zone; add properties for tomcat
|
2024-09-16 12:01:13 +03:00 |
|
Халтобин Евгений
|
126df21e76
|
added some properties
|
2024-09-16 11:40:23 +03:00 |
|
Халтобин Евгений
|
4997ec7e41
|
Merge remote-tracking branch 'origin/release/1.0.0' into feature/WEBBPMNEXT-9175_migrate_to_tomcat
|
2024-09-16 10:38:34 +03:00 |
|
Халтобин Евгений
|
906ef4f06a
|
updated docker
|
2024-09-16 10:28:05 +03:00 |
|
gulnaz
|
ccf2cf0389
|
SUPPORT-8411: remove redundant file; revert some changes
|
2024-09-16 09:49:42 +03:00 |
|
Eduard Tihomirov
|
484ddb0f85
|
fix
|
2024-09-16 09:44:42 +03:00 |
|
gulnaz
|
79833feb75
|
Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0
# Conflicts:
# backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# config/patches/default.cli
# config/standalone/dev/standalone.xml
# frontend/src/resources/app-config.json
# resources/src/main/resources/business-model/Журнал взаимодействия.page
|
2024-09-13 17:12:11 +03:00 |
|
Eduard Tihomirov
|
5c4825f42c
|
Fix
|
2024-09-13 15:34:51 +03:00 |
|
Eduard Tihomirov
|
4891c16316
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8471_fix_load_okopf' into release/1.0.0
# Conflicts:
# backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/InteractionLog.java
# backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/InteractionLogRecord.java
# backend/src/main/resources/config/v_1.0/changelog-v_1.0.xml
# config/patches/default.cli
# config/standalone/dev/standalone.xml
|
2024-09-13 14:57:11 +03:00 |
|
gulnaz
|
d94e45c970
|
Merge branch 'feature/SUPPORT-8470_status' into feature/SUPPORT-8411_fixed
# Conflicts:
# backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
|
2024-09-13 13:01:22 +03:00 |
|
Eduard Tihomirov
|
2a4e3bea71
|
SUPPORT-8470: Fix
|
2024-09-13 10:19:27 +03:00 |
|
Eduard Tihomirov
|
8dba0d4316
|
Merge branch 'feature/SUPPORT-8474_id_ervu' into feature/SUPPORT-8470_status
|
2024-09-13 10:07:26 +03:00 |
|
gulnaz
|
e1c3cc3eb6
|
Merge branch 'feature/SUPPORT-8474_id_ervu' into feature/SUPPORT-8411_fixed
# Conflicts:
# backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaServiceImpl.java
# frontend/src/resources/app-config.json
|
2024-09-13 10:05:28 +03:00 |
|
Eduard Tihomirov
|
142e501906
|
Merge branch 'feature/SUPPORT-8471_load_classifier' into feature/SUPPORT-8474_id_ervu
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# config/standalone/dev/standalone.xml
|
2024-09-13 09:52:03 +03:00 |
|