gulnaz
|
d8d60b5817
|
SUPPORT-8411: change package; fix page and scripts
|
2024-09-13 12:43:17 +03:00 |
|
Makarova Elena
|
6e741860d1
|
убрала класс у красной кнопки
|
2024-09-13 12:37:03 +03:00 |
|
Eduard Tihomirov
|
ea36487cd7
|
Merge branch 'feature/SUPPORT-8474_id_ervu' into release/1.0.0
|
2024-09-13 10:56:39 +03:00 |
|
Makarova Elena
|
e55f55342f
|
ERVU-136
|
2024-09-13 09:28:33 +03:00 |
|
gulnaz
|
37b9ed80b9
|
SUPPORT-8411: fix grid and page
|
2024-09-10 11:38:18 +03:00 |
|
Makarova Elena
|
c760c3606c
|
ERVU-130 добавлен класс pin
|
2024-09-10 10:05:13 +03:00 |
|
SavelevAlex
|
282241217f
|
SUPPORT-8411 : almost done commit
|
2024-09-08 21:14:19 +02:00 |
|
SavelevAlex
|
b7fa56b960
|
SUPPORT-8411 : refactor ervu kafka
|
2024-09-08 10:24:17 +02: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 |
|
Eduard Tihomirov
|
ce58408c61
|
SUPPORT-8474: Fix
|
2024-09-05 16:13:28 +03:00 |
|
Eduard Tihomirov
|
704b021816
|
Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu
# Conflicts:
# backend/src/main/java/esia/service/EsiaAuthService.java
|
2024-09-05 14:19:27 +03:00 |
|
Makarova Elena
|
ee4d1082ae
|
btn-main на красных кнопках
|
2024-09-04 16:31:58 +03:00 |
|
Eduard Tihomirov
|
b7efe76f22
|
SUPPORT-8427: Fix
|
2024-09-04 15:31:50 +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
|
f774392433
|
добавила класс btn-block на hbox
|
2024-09-04 11:43:56 +03:00 |
|
Eduard Tihomirov
|
b27eb092f8
|
Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu
# Conflicts:
# Dockerfile
# backend/src/main/java/AppConfig.java
# backend/src/main/java/esia/config/EsiaConfig.java
# backend/src/main/java/esia/controller/EsiaController.java
# backend/src/main/java/esia/model/EmployeeModel.java
# backend/src/main/java/esia/model/PersonModel.java
# backend/src/main/java/esia/service/EsiaAuthService.java
# backend/src/main/java/esia/service/UlDataServiceImpl.java
|
2024-09-04 11:22:30 +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 |
|
Eduard Tihomirov
|
3857a02094
|
Merge branch 'develop' into feature/SUPPORT-8427_new
|
2024-09-03 16:50:24 +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 |
|
Eduard Tihomirov
|
b72a001e7b
|
Revert "test"
This reverts commit b2505b6ad8.
|
2024-09-03 14:58:08 +03:00 |
|
Eduard Tihomirov
|
b2505b6ad8
|
test
|
2024-09-03 14:54:27 +03:00 |
|
Eduard Tihomirov
|
bd6502154f
|
SUPPORT-8427: Fix pages
|
2024-09-03 14:16:57 +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 |
|
Makarova Elena
|
a164b10c4b
|
донастройка элементов
|
2024-09-02 15:03:05 +03:00 |
|
Makarova Elena
|
5b06ae25cd
|
ERVU-119 добавление приложений
|
2024-09-02 12:39:02 +03:00 |
|
Makarova Elena
|
81dd332321
|
ERVU-119 использование компоненты Inner html
|
2024-08-29 14:28:06 +03:00 |
|
Халтобин Евгений
|
bb2390bc4b
|
removed roles
|
2024-08-12 09:26:47 +03:00 |
|
Eduard Tihomirov
|
146d638631
|
Merge remote-tracking branch 'origin/feature/WEBBPMNEXT-9188_fixes' into feature/SUPPORT-8407_ul
|
2024-08-07 10:39:18 +03:00 |
|
Булат Хайруллин
|
fb81e84569
|
ERVU-93 clearColumnFilters
|
2024-08-05 15:14:49 +03:00 |
|
Булат Хайруллин
|
782f98d421
|
Merge branch 'update/3.176' into develop
|
2024-08-05 15:07:44 +03:00 |
|
Булат Хайруллин
|
813c6103e5
|
ограничение на 5 мб
|
2024-08-04 19:22:54 +03:00 |
|
Халтобин Евгений
|
c23ebfa0f1
|
reverted changes
|
2024-08-02 11:34:43 +03:00 |
|
Халтобин Евгений
|
b008e71b56
|
updated resources
|
2024-08-02 11:28:25 +03:00 |
|
kochetkov
|
a558ba831d
|
WEBBPMNEXT-9188 change group and artifactId
|
2024-08-01 15:27:07 +03:00 |
|
Zaripov Emil
|
0d75528f62
|
скрыл поле ОГРН присвоен, в перспективе удалим, его нет в ЕСИА
|
2024-07-31 13:31:06 +03:00 |
|
Zaripov Emil
|
69374f6116
|
fix
|
2024-07-30 18:32:00 +03:00 |
|
Булат Хайруллин
|
4ccfa9cdfe
|
file upload fix
|
2024-07-30 17:17:14 +03:00 |
|
ivanov.denis
|
bc5eac92bd
|
fix
|
2024-07-30 16:18:18 +03:00 |
|
Булат Хайруллин
|
b4367255d8
|
Merge branch 'test/SUPPORT-8381_file_upload_test' into develop
|
2024-07-30 10:28:27 +03:00 |
|
Булат Хайруллин
|
afb606eab6
|
fix
|
2024-07-30 10:27:36 +03:00 |
|
Eduard Tihomirov
|
5813ebd5a3
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8426_disable_webbpm_security' into feature/SUPPORT-8407_ul
|
2024-07-29 11:36:55 +03:00 |
|
Zaripov Emil
|
ddcc39972b
|
исключил Виды деятельности
|
2024-07-26 13:53:13 +03:00 |
|
Булат Хайруллин
|
c1a51374bb
|
fix
|
2024-07-26 11:49:50 +03:00 |
|