Commit graph

76 commits

Author SHA1 Message Date
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
Eduard Tihomirov
19486d381a Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8471_load_classifier 2024-09-13 09:41:46 +03:00
Eduard Tihomirov
1fbb464e3b SUPPORT-8427: Fix 2024-09-12 16:40:20 +03:00
Eduard Tihomirov
3d7e8dcc68 SUPPORT-8474: Fix 2024-09-12 15:34:17 +03:00
Eduard Tihomirov
e977eb2bfe SUPPORT-8427: Fix 2024-09-12 14:51:21 +03:00
Eduard Tihomirov
5da678d304 SUPPORT-8427: Fix 2024-09-12 14:44:11 +03:00
Eduard Tihomirov
3874dba901 SUPPORT-8470: Fix 2024-09-12 13:32:39 +03:00
Хакимуллин Артём
efb88897e8 SUPPORT-8471: change default.cli 2024-09-12 13:12:46 +03:00
Хакимуллин Артём
5072345858 SUPPORT-8471: change default.cli 2024-09-12 13:00:25 +03:00
Хакимуллин Артём
f6820fc7ba SUPPORT-8471: new change properties for teamcity 2024-09-12 12:49:24 +03:00
Хакимуллин Артём
9c62bb6e03 SUPPORT-8471: add properties for teamcity 2024-09-12 12:37:14 +03:00
Eduard Tihomirov
dd2deccea3 SUPPORT-8474: Fix 2024-09-12 09:44:00 +03:00
Халтобин Евгений
7902cddf0b updated webbpm.properties 2024-09-12 09:29:01 +03:00
Artyom Hackimullin
4ea6831a0c SUPPORT-8471: new fix 2024-09-11 22:25:50 +03:00
Eduard Tihomirov
c6422e3238 SUPPORT-8470: Fix 2024-09-11 15:54:46 +03:00
gulnaz
5333009c51 SUPPORT-8411: rename topic properties 2024-09-11 08:38:51 +03:00
gulnaz
5bb0f2f92d Merge remote-tracking branch 'origin/feature/SUPPORT-8474_id_ervu' into feature/SUPPORT-8411_fixed
# 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
2024-09-10 11:45:02 +03:00
gulnaz
e678fa3ac6 SUPPORT-8411: add topic properties 2024-09-10 11:37:49 +03:00
Eduard Tihomirov
91d842d25b Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8471_load_classifier
# Conflicts:
#	config/patches/default.cli
#	config/standalone/dev/standalone.xml
#	pom.xml
2024-09-09 10:37:04 +03:00
Eduard Tihomirov
a36101b314 SUPPORT-8474: Fix 2024-09-09 10:15:56 +03:00
Eduard Tihomirov
1a0f7c7012 Merge remote-tracking branch 'origin/feature/SUPPORT-8471_load_classifier' into feature/SUPPORT-8474_id_ervu 2024-09-09 09:50:04 +03:00
Eduard Tihomirov
abd8fc8841 SUPPORT-8474: Fix 2024-09-07 11:34:13 +03:00
Eduard Tihomirov
dd2ecba904 SUPPORT-8474: Fix 2024-09-06 16:20:29 +03:00
Eduard Tihomirov
1b7cf9bab8 SUPPORT-8474: Fix
(cherry picked from commit 40044e43c1)
2024-09-06 13:52:18 +03:00
Eduard Tihomirov
40044e43c1 SUPPORT-8474: Fix 2024-09-06 13:51:58 +03:00