Zaripov Emil
|
89bda5d0bc
|
Merge branch 'feature/WEBBPMNEXT-9175_migrate_to_tomcat' into release/1.0.0
|
2024-09-17 16:15:32 +03:00 |
|
Makarova Elena
|
cc2ab05a22
|
Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop
|
2024-09-17 15:52:57 +03:00 |
|
Makarova Elena
|
4a38e42ada
|
fix дата
|
2024-09-17 15:52:39 +03:00 |
|
Хакимуллин Артём
|
44bad3d87b
|
SUPPORT-8471: fix
|
2024-09-17 14:54:21 +03:00 |
|
Pavel Zilke
|
5d480a9114
|
Dockerfile.TC - update base image
|
2024-09-17 14:42:56 +03:00 |
|
Хакимуллин Артём
|
5cd79f73d3
|
SUPPORT-8471: fix package
|
2024-09-17 14:39:43 +03:00 |
|
Хакимуллин Артём
|
2dc8add5ae
|
Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0
|
2024-09-17 14:33:42 +03:00 |
|
Хакимуллин Артём
|
750cc7c6c6
|
SUPPORT-8471: fix
|
2024-09-17 14:29:08 +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 |
|
Eduard Tihomirov
|
ca1b396ced
|
Revert "test"
This reverts commit 7b470ebfd6.
|
2024-09-17 14:14:31 +03:00 |
|
Хакимуллин Артём
|
4c7ab1f6b1
|
Merge remote-tracking branch 'refs/remotes/origin/release/1.0.0' into feature/SUPPORT-8471_fix_load_okopf
# Conflicts:
# pom.xml
|
2024-09-17 13:49:18 +03:00 |
|
Eduard Tihomirov
|
92faad9e1a
|
add patch
|
2024-09-17 13:40:18 +03:00 |
|
Хакимуллин Артём
|
f104c79d2c
|
SUPPORT-8471: change liquibase
|
2024-09-17 13:36:29 +03:00 |
|
Хакимуллин Артём
|
ec57434660
|
SUPPORT-8471: rename package classifier to okopf
|
2024-09-17 12:38:42 +03:00 |
|
m.epshtein
|
05c03c1cf3
|
fix
|
2024-09-17 12:03:51 +03:00 |
|
m.epshtein
|
f8640fb7e7
|
//
|
2024-09-17 11:50:52 +03:00 |
|
m.epshtein
|
f06bed920e
|
fix hand merge
|
2024-09-17 11:50:30 +03:00 |
|
Eduard Tihomirov
|
42a8845940
|
test
|
2024-09-17 11:06:17 +03:00 |
|
Eduard Tihomirov
|
ca94a4c749
|
Rename cookie
|
2024-09-17 10:36:03 +03:00 |
|
Zaripov Emil
|
90ec62c721
|
test2
|
2024-09-16 17:52:15 +03:00 |
|
Хакимуллин Артём
|
931da342bc
|
SUPPORT-8471: move package model
|
2024-09-16 15:09:14 +03:00 |
|
Хакимуллин Артём
|
376d790670
|
SUPPORT-8471: change version
|
2024-09-16 14:26:57 +03:00 |
|
Хакимуллин Артём
|
5283efbbbf
|
SUPPORT-8471: add throws
|
2024-09-16 14:24:15 +03:00 |
|
Eduard Tihomirov
|
7b470ebfd6
|
test
|
2024-09-16 12:40:47 +03:00 |
|
gulnaz
|
c10af187c6
|
SUPPORT-8411: add time zone; add properties for tomcat
|
2024-09-16 12:01:13 +03:00 |
|
gulnaz
|
73456d5913
|
Merge branch 'release/1.0.0' of 10.10.31.70:/ervu-lkrp-ul into release/1.0.0
|
2024-09-16 12:00:33 +03:00 |
|
Eduard Tihomirov
|
33e5e904c4
|
Merge branch 'release/1.0.0' into feature/WEBBPMNEXT-9175_migrate_to_tomcat
|
2024-09-16 11:51:25 +03:00 |
|
Eduard Tihomirov
|
10ffe8d529
|
fix
|
2024-09-16 11:51:02 +03:00 |
|
Халтобин Евгений
|
126df21e76
|
added some properties
|
2024-09-16 11:40:23 +03:00 |
|
Eduard Tihomirov
|
b8b017b472
|
Merge branch 'release/1.0.0' into feature/WEBBPMNEXT-9175_migrate_to_tomcat
|
2024-09-16 11:11:01 +03:00 |
|
Eduard Tihomirov
|
41c09532bf
|
fix
|
2024-09-16 11:10:47 +03:00 |
|
Eduard Tihomirov
|
c84db57ae3
|
Merge branch 'release/1.0.0' into feature/SUPPORT-8458_file
# Conflicts:
# backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
# backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaServiceImpl.java
|
2024-09-16 11:07:03 +03:00 |
|
Хакимуллин Артём
|
85a45d032b
|
SUPPORT-8471: delete log in OkopfServiceImpl.java
|
2024-09-16 10:47:32 +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 |
|
Хакимуллин Артём
|
3d38744cb2
|
SUPPORT-8471: new changes
|
2024-09-16 10:13:51 +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 |
|
Халтобин Евгений
|
4bbbc81522
|
Merge branch 'develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat
|
2024-09-16 08:56:03 +03:00 |
|
gulnaz
|
165f807025
|
fix after merge
|
2024-09-13 17:16:19 +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 |
|
gulnaz
|
7d95b8ccb9
|
Merge branch 'feature/SUPPORT-8411_fixed' into release/1.0.0
|
2024-09-13 17:05:24 +03:00 |
|
Eduard Tihomirov
|
96d13480ce
|
backend.context change
|
2024-09-13 16:31:35 +03:00 |
|
Хакимуллин Артём
|
1948e08f83
|
SUPPORT-8471: init EsnsiOkopfSchedulerServiceImpl
|
2024-09-13 15:59:41 +03:00 |
|
Zaripov Emil
|
32f7b1f7b3
|
Merge remote-tracking branch 'origin/develop' into release/1.0.0
|
2024-09-13 15:36:50 +03:00 |
|
Eduard Tihomirov
|
5c4825f42c
|
Fix
|
2024-09-13 15:34:51 +03:00 |
|
m.epshtein
|
3e981d4b4f
|
header-logo
|
2024-09-13 15:15:22 +03:00 |
|
Eduard Tihomirov
|
c4c0a6e237
|
Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0
|
2024-09-13 14:58:04 +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 |
|