Pavel Zilke
|
8ba1d7803c
|
angie to nginx
|
2024-09-18 10:21:26 +03:00 |
|
Pavel Zilke
|
5d480a9114
|
Dockerfile.TC - update base image
|
2024-09-17 14:42:56 +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 |
|
Халтобин Евгений
|
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 |
|
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 |
|
Eduard Tihomirov
|
a9f5936afb
|
SUPPORT-8474: Fix
|
2024-09-06 11:54:07 +03:00 |
|
Eduard Tihomirov
|
66bdc4cb01
|
SUPPORT-8474: Fix
|
2024-09-06 11:32:40 +03:00 |
|
Eduard Tihomirov
|
ffd450930d
|
SUPPORT-8427: Fix
|
2024-09-06 10:22:49 +03:00 |
|
Хакимуллин Артём
|
5c85e84078
|
SUPPORT-8471: new changes
|
2024-09-05 16:38:12 +03:00 |
|
Хакимуллин Артём
|
3f9c5a1b53
|
SUPPORT-8471: new changes
|
2024-09-05 15:33:36 +03:00 |
|
Eduard Tihomirov
|
0c5c15fc51
|
SUPPORT-8427: Fix
|
2024-09-05 14:43:41 +03:00 |
|
Eduard Tihomirov
|
9e990f6e86
|
SUPPORT-8427: Fix
|
2024-09-05 12:58:42 +03:00 |
|
Eduard Tihomirov
|
f3a72c4276
|
SUPPORT-8427: Fix
|
2024-09-05 10:52:45 +03:00 |
|
Eduard Tihomirov
|
e98285c3eb
|
SUPPORT-8427: Fix
|
2024-09-04 11:45:19 +03:00 |
|
kochetkov
|
90b7c2c122
|
Merge branch 'update/3.178' into feature/WEBBPMNEXT-9188_fixes
# Conflicts:
# backend/src/main/java/AppConfig.java
# config/patches/default.cli
# frontend/package-lock.json
# frontend/package.json
# frontend/src/ts/modules/app/app.module.ts
# packages/ru.cg.webbpm.packages.base.resources/.flattened-pom.xml
# packages/ru.cg.webbpm.packages.base.resources/META-INF/components/docs/component/grids/NavigateOnGridCellOrRow.html
# packages/ru.cg.webbpm.packages.base.resources/META-INF/package-descriptor.xml
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/Button.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/CancelButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/ClearFilterButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/DeleteButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/DownloadButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/ErrorButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecProcessButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecuteSqlButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/FilterButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/NavigationButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/SaveButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/SelectButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/SignButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/StartProcessButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/EntityGraphReportingButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/FormReportingButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/CollapsiblePanel.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/Dialog.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/DropDown.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/FieldSet.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/FilterGroup.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/Form.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/HBox.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/TabContainer.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/TabItem.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/VBox.component
# packages/ru.cg.webbpm.packages.base.resources/component/containers/Window.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/EditableGrid.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/AutocompleteGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/CheckBoxGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ComboBoxGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/DateTimePickerGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/MoneyFieldGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/NumberFieldGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumnV2.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyClientGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyServerGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/StaticComboBoxGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextAreaGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextFieldGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TimePickerGridColumn.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/Address.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/Autocomplete.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/CheckBox.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/ComboBox.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/DateTimePicker.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/EditableOneToMany.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/FilePreview.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/FileUpload.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToMany.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToManyField.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/MoneyField.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/NumberField.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToMany.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToManyV2.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/RadioButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/SignVerification.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticComboBox.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticRadioButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/Text.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/TextArea.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/TextField.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/TimePicker.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/TreeField.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/EditableGrid.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/Form.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/fileupload/FileUploadField.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAddress.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAutocomplete.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterBoolean.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterCheckBox.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterComboBox.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterDateTimePicker.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterNumberField.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterRadioButton.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterStaticComboBox.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextArea.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextField.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/LinkField.component
# packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/MultiValueField.component
# packages/ru.cg.webbpm.packages.base.resources/component/grids/Grid.component
# packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2.component
# packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Column.component
# packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Group.component
# packages/ru.cg.webbpm.packages.base.resources/component/grids/PagingGrid.component
# packages/ru.cg.webbpm.packages.base.resources/component/grids/TreeGrid.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ActionController.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Calendar.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Chart.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ChartV2.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/EventCalendar.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/GanttChart.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/HyperLink.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/IFrame.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/InnerHtml.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuGroup.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuItem.component
# packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ValidationController.component
# packages/ru.cg.webbpm.packages.base.resources/converters/converters.jar
# packages/ru.cg.webbpm.packages.base.resources/metadata/java.metadata
# packages/ru.cg.webbpm.packages.base.resources/metadata/typescript.metadata.json
# packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstance.component
# packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceDiagram.component
# packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceList.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/Groups.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsCreate.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsEdit.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/OrganizationEdit.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/Organizations.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/Roles.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/RolesEdit.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/SecurityFeatures.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteNavigationButton.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteSelectButton.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/UserForm.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/Users.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/UsersCreate.component
# packages/ru.cg.webbpm.packages.base.resources/user-management/UsersEdit.component
# pom.xml
# resources/src/main/resources/business-model/Журнал взаимодействия.page
# resources/src/main/resources/business-model/Информация об организации.page
# resources/src/main/resources/business-model/Личный кабинет юр лица.page
# resources/src/main/resources/business-model/Процессы/process-instance-list.page
# resources/src/main/resources/business-model/Процессы/process-instance.page
# resources/src/main/resources/business-model/Управление пользователями/Группы редактирование.page
# resources/src/main/resources/business-model/Управление пользователями/Группы создание.page
# resources/src/main/resources/business-model/Управление пользователями/Группы.page
# resources/src/main/resources/business-model/Управление пользователями/Организации.page
# resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page
# resources/src/main/resources/business-model/Управление пользователями/Пользователи редактирование.page
# resources/src/main/resources/business-model/Управление пользователями/Пользователи создание.page
# resources/src/main/resources/business-model/Управление пользователями/Пользователи.page
# resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page
# resources/src/main/resources/business-model/Управление пользователями/Роли.page
# resources/src/main/resources/business-model/Управление пользователями/Функции безопасности.page
# resources/src/main/resources/overrides/0f470331-dfb0-4f10-b748-c9a7f33d31d9.component.override
# resources/src/main/resources/overrides/0f8d0a8b-8014-4367-8ff3-7f049c284978.component.override
# resources/src/main/resources/overrides/16071adb-3bdf-4c33-b29b-886876016415.component.override
# resources/src/main/resources/overrides/38c2de2f-c5dd-413e-babf-ce54cb4e5279.component.override
# resources/src/main/resources/overrides/4e314e88-02d6-4b0e-b7a7-15a36bdeb682.component.override
# resources/src/main/resources/overrides/57537dbd-c468-4c2d-99df-924b5ba018d6.component.override
# resources/src/main/resources/overrides/5cc0e63d-f697-47a8-a9dc-3170f1a99721.component.override
# resources/src/main/resources/overrides/5f9c58f8-9ee1-4df3-b93c-e48534e798db.component.override
# resources/src/main/resources/overrides/67605d63-1081-423b-b6b5-727ecfce2ca1.component.override
# resources/src/main/resources/overrides/76e91ef4-d2ef-4662-96ad-84c0dae0ecff.component.override
# resources/src/main/resources/overrides/7a57e082-99e3-4453-a2df-d5ffafa2c019.component.override
# resources/src/main/resources/overrides/8e1d9023-42c0-4960-9c59-02f4f0c2e4dd.component.override
# resources/src/main/resources/overrides/a4d442cf-72a8-431e-815a-490959083787.component.override
# resources/src/main/resources/overrides/c4b48815-f449-48fe-9ae0-dec9b6f4c53c.component.override
# resources/src/main/resources/overrides/ca7390f1-1891-4161-b8ae-ef66de5776b7.component.override
# resources/src/main/resources/overrides/ed47cfae-64da-4360-8f61-1087179ad78b.component.override
# resources/src/main/resources/overrides/fe225a1a-1c03-485e-a069-18b92ab4f7f7.component.override
|
2024-09-03 09:02:56 +03:00 |
|