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
|
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 |
|
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 |
|
Хакимуллин Артём
|
931da342bc
|
SUPPORT-8471: move package model
|
2024-09-16 15:09:14 +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 |
|
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 |
|
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 |
|
Хакимуллин Артём
|
3d38744cb2
|
SUPPORT-8471: new changes
|
2024-09-16 10:13:51 +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 |
|
Хакимуллин Артём
|
1948e08f83
|
SUPPORT-8471: init EsnsiOkopfSchedulerServiceImpl
|
2024-09-13 15:59:41 +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
|
19c4faaba1
|
SUPPORT-8411: add sorting
|
2024-09-13 14:43:05 +03:00 |
|
gulnaz
|
e5ce54655b
|
SUPPORT-8411: remove redundant code
|
2024-09-13 14:37:03 +03:00 |
|
gulnaz
|
6ca54eb670
|
SUPPORT-8411: check for length
|
2024-09-13 14:32:42 +03:00 |
|
gulnaz
|
d23a5644c1
|
SUPPORT-8411: revert some changes
|
2024-09-13 14:03:52 +03:00 |
|
gulnaz
|
7398103f24
|
SUPPORT-8411: fix after merge; fetch logs from db; add excluded statuses property;
|
2024-09-13 14:02:29 +03:00 |
|
Хакимуллин Артём
|
82cd8892a0
|
SUPPORT-8471: renames okpf dao and service
|
2024-09-13 13:15:47 +03:00 |
|
Хакимуллин Артём
|
ae1b188114
|
SUPPORT-8471: new changes
|
2024-09-13 13:10:26 +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 |
|
gulnaz
|
d8d60b5817
|
SUPPORT-8411: change package; fix page and scripts
|
2024-09-13 12:43:17 +03:00 |
|
Eduard Tihomirov
|
c6b9815947
|
SUPPORT-8470: Fix
|
2024-09-13 12:16:30 +03:00 |
|
Eduard Tihomirov
|
a494f43555
|
SUPPORT-8470: Add ervuId
|
2024-09-13 12:16:11 +03:00 |
|
gulnaz
|
14f9bf2233
|
Merge branch 'feature/SUPPORT-8474_id_ervu' into feature/SUPPORT-8411_fixed
|
2024-09-13 11:17:02 +03:00 |
|
Eduard Tihomirov
|
c2f278c6cd
|
Merge branch 'feature/SUPPORT-8474_id_ervu' into feature/SUPPORT-8470_status
|
2024-09-13 11:06:25 +03:00 |
|
Eduard Tihomirov
|
e21b8497f5
|
Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu
|
2024-09-13 10:39:47 +03:00 |
|
Eduard Tihomirov
|
3d55523696
|
SUPPORT-8427: Fix
|
2024-09-13 10:37:19 +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
|
3d7e8dcc68
|
SUPPORT-8474: Fix
|
2024-09-12 15:34:17 +03:00 |
|
Eduard Tihomirov
|
12a498f210
|
SUPPORT-8474: Fix
|
2024-09-12 15:17:33 +03:00 |
|
Eduard Tihomirov
|
5da678d304
|
SUPPORT-8427: Fix
|
2024-09-12 14:44:11 +03:00 |
|
Хакимуллин Артём
|
3539bc504f
|
SUPPORT-8471: little fix
|
2024-09-12 13:50:00 +03:00 |
|
Хакимуллин Артём
|
03c1b63d1c
|
SUPPORT-8471: change patch
|
2024-09-12 13:31:23 +03:00 |
|
Eduard Tihomirov
|
2792129e69
|
SUPPORT-8427: Fix
|
2024-09-12 12:36:07 +03:00 |
|