Халтобин Евгений
|
906ef4f06a
|
updated docker
|
2024-09-16 10:28:05 +03:00 |
|
Халтобин Евгений
|
4bbbc81522
|
Merge branch 'develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat
|
2024-09-16 08:56:03 +03:00 |
|
m.epshtein
|
3e981d4b4f
|
header-logo
|
2024-09-13 15:15:22 +03:00 |
|
m.epshtein
|
ab3b28a02a
|
grid-v2 flex
|
2024-09-13 14:53:31 +03:00 |
|
m.epshtein
|
b8c4b5cafe
|
scroll fix
|
2024-09-13 14:45:06 +03:00 |
|
m.epshtein
|
9ac8984490
|
Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop
|
2024-09-13 14:31:37 +03:00 |
|
m.epshtein
|
c0e133593b
|
journal grid
|
2024-09-13 14:31:27 +03:00 |
|
Makarova Elena
|
3771db8f7f
|
Merge branch 'grid_mila' into develop
|
2024-09-13 14:31:15 +03:00 |
|
Makarova Elena
|
8441b5d194
|
Merge remote-tracking branch 'origin/develop' into grid_mila
|
2024-09-13 14:30:31 +03:00 |
|
m.epshtein
|
eb19fd054e
|
fix footer
|
2024-09-13 14:16:09 +03:00 |
|
Makarova Elena
|
ab7aa1fc1e
|
перенос строки в гриде
|
2024-09-13 13:49:29 +03:00 |
|
m.epshtein
|
5d34476701
|
dynamic footer
|
2024-09-13 13:47:58 +03:00 |
|
Makarova Elena
|
d06e1bc10b
|
Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop
|
2024-09-13 12:37:12 +03:00 |
|
Makarova Elena
|
6e741860d1
|
убрала класс у красной кнопки
|
2024-09-13 12:37:03 +03:00 |
|
m.epshtein
|
0c777a44e5
|
Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop
|
2024-09-13 12:09:05 +03:00 |
|
m.epshtein
|
c6c8f03e3e
|
hide filter-button
|
2024-09-13 12:08:47 +03:00 |
|
Makarova Elena
|
e55f55342f
|
ERVU-136
|
2024-09-13 09:28:33 +03:00 |
|
Makarova Elena
|
c760c3606c
|
ERVU-130 добавлен класс pin
|
2024-09-10 10:05:13 +03:00 |
|
m.epshtein
|
91cd1f3fa8
|
ERVU-130
|
2024-09-06 18:20:16 +03:00 |
|
Makarova Elena
|
5bd32bf24e
|
инструкция в 2 строки
|
2024-09-06 16:15:34 +03:00 |
|
Makarova Elena
|
913e98e785
|
+ lined
|
2024-09-06 15:40:05 +03:00 |
|
Makarova Elena
|
1871946bba
|
fix
|
2024-09-06 15:21:27 +03:00 |
|
Makarova Elena
|
c8a2a186b2
|
ERVU-119, 129
|
2024-09-06 15:14:31 +03:00 |
|
m.epshtein
|
c752c98160
|
fix
|
2024-09-04 18:16:38 +03:00 |
|
m.epshtein
|
492b3e446f
|
Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop
|
2024-09-04 18:00:38 +03:00 |
|
m.epshtein
|
cf638af75e
|
new btns
|
2024-09-04 18:00:26 +03:00 |
|
Makarova Elena
|
ee4d1082ae
|
btn-main на красных кнопках
|
2024-09-04 16:31:58 +03:00 |
|
Makarova Elena
|
d39b48da66
|
Merge branch 'ERVU-119' into develop
|
2024-09-04 15:18:16 +03:00 |
|
Makarova Elena
|
7afc36b37a
|
Merge remote-tracking branch 'origin/develop' into ERVU-119
|
2024-09-04 14:56:55 +03:00 |
|
kochetkov
|
b28287a930
|
fix
|
2024-09-04 14:54:26 +03:00 |
|
kochetkov
|
3dfe3d78f8
|
WEBBPMNEXT-9175 migrate to tomcat
|
2024-09-04 13:56:05 +03:00 |
|
Makarova Elena
|
4a75e9153e
|
btn-main
|
2024-09-04 12:31:32 +03:00 |
|
Makarova Elena
|
c7c66ad50f
|
lдобавила класс dropdown-item
|
2024-09-04 12:17:40 +03:00 |
|
Makarova Elena
|
7a3d6c8b54
|
Merge remote-tracking branch 'origin/ERVU-119' into ERVU-119
|
2024-09-04 11:44:12 +03:00 |
|
Makarova Elena
|
f774392433
|
добавила класс btn-block на hbox
|
2024-09-04 11:43:56 +03:00 |
|
m.epshtein
|
6c265865a8
|
button.close
|
2024-09-04 11:40:37 +03:00 |
|
Makarova Elena
|
d2b5cf6fbb
|
правка наименования файла
|
2024-09-04 11:09:56 +03:00 |
|
Makarova Elena
|
d065711489
|
Merge remote-tracking branch 'origin/develop' into ERVU-119
|
2024-09-04 10:30:18 +03:00 |
|
Zaripov Emil
|
e224860c32
|
Merge remote-tracking branch 'origin/feature/WEBBPMNEXT-9188_fixes' into develop
|
2024-09-03 16:35:26 +03:00 |
|
m.epshtein
|
aead18dc02
|
selected-file-delete-btn
|
2024-09-03 16:21:43 +03:00 |
|
m.epshtein
|
a4da75d437
|
btn-block
|
2024-09-03 16:00:09 +03:00 |
|
Zaripov Emil
|
274bd25088
|
Merge branch 'feature/WEBBPMNEXT-9188_fixes' into develop
|
2024-09-03 15:23:18 +03:00 |
|
Zaripov Emil
|
ee99734e7e
|
Merge branch 'update/3.178' into develop
|
2024-09-03 15:21:19 +03:00 |
|
kochetkov
|
be7864437f
|
restore deletion after update merge
|
2024-09-03 15:10:42 +03:00 |
|
kochetkov
|
8a9df37caf
|
Merge branch 'update/3.178' into feature/WEBBPMNEXT-9188_fixes
# Conflicts:
# pom.xml
|
2024-09-03 15:01:27 +03:00 |
|
kochetkov
|
be2b7a84d6
|
update to 3.178.2
|
2024-09-03 14:59:44 +03:00 |
|
m.epshtein
|
a56ec06247
|
Merge remote-tracking branch 'origin/develop' into ERVU-119
|
2024-09-03 12:17:39 +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 |
|
kochetkov
|
ace0cc2477
|
Merge remote-tracking branch 'origin/develop' into update/3.178
|
2024-09-03 08:56:58 +03:00 |
|
m.epshtein
|
4a8d708235
|
fix
|
2024-09-02 18:00:40 +03:00 |
|