Merge branch 'hotfix/1.9.1' into feateure/SUPPORT-8653_fixes
# Conflicts: # backend/pom.xml # frontend/package.json # 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/SignButtonV2.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/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
This commit is contained in:
kochetkov
commit
f8aef7dba5
116 changed files with 2841 additions and 1047 deletions
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ru.micord.ervu.lkrp</groupId>
|
||||
<artifactId>ul</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>1.9.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>ru.micord.ervu.lkrp.ul</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
|
|
@ -180,7 +180,7 @@
|
|||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<finalName>${parent.artifactId}</finalName>
|
||||
<finalName>${project.parent.artifactId}</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue