[midPoint-git] [Evolveum/midpoint] 61efd9: refresh facility is added to the the table on the ...
Petr Gašparík
petr.gasparik at ami.cz
Tue Oct 18 15:19:39 CEST 2016
Branch: refs/heads/transifex
Home: https://github.com/Evolveum/midpoint
Commit: 61efd9f46a1c514073c4af649b9a8b4696a918c3
https://github.com/Evolveum/midpoint/commit/61efd9f46a1c514073c4af649b9a8b4696a918c3
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-11 (Tue, 11 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
Log Message:
-----------
refresh facility is added to the the table on the audit log viewer page by using the search button
Commit: f4c970a06ac94fc983b9c770c2e4c1bef99285a1
https://github.com/Evolveum/midpoint/commit/f4c970a06ac94fc983b9c770c2e4c1bef99285a1
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-11 (Tue, 11 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
Log Message:
-----------
AuditSearchDto is integrated
Commit: 1c609dd4ef4e7b67d1b13bf5b3d8963489c16159
https://github.com/Evolveum/midpoint/commit/1c609dd4ef4e7b67d1b13bf5b3d8963489c16159
Author: honchar <honchar at evolveum.com>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
Log Message:
-----------
role catalog styles + restructuring
Commit: 7359b46ce8a5a311f1dd77b48b48925f697120bd
https://github.com/Evolveum/midpoint/commit/7359b46ce8a5a311f1dd77b48b48925f697120bd
Author: honchar <honchar at evolveum.com>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/resources/common/system-configuration.xml
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: cd276bfd05bce1a6532417529fe486a479a3451a
https://github.com/Evolveum/midpoint/commit/cd276bfd05bce1a6532417529fe486a479a3451a
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
Log Message:
-----------
Filtering parameters are added to the search query
Commit: 3db857b8b6d803773d50cba0749abaa5f4e13eb4
https://github.com/Evolveum/midpoint/commit/3db857b8b6d803773d50cba0749abaa5f4e13eb4
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/resources/common/system-configuration.xml
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
A samples/evolveum/role-catalog.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 1c52f5a161504f0d8abdc8491519dcda4185d368
https://github.com/Evolveum/midpoint/commit/1c52f5a161504f0d8abdc8491519dcda4185d368
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
Log Message:
-----------
Fixing orgstruct tests
Commit: 21f8052f6565e607513404ab1f8eb405ddda19c3
https://github.com/Evolveum/midpoint/commit/21f8052f6565e607513404ab1f8eb405ddda19c3
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java
Log Message:
-----------
AuditSearchDto.java is added to the reports dto
Commit: ca42d9e7bf4c5d7a35fec1e562524d4b3829328a
https://github.com/Evolveum/midpoint/commit/ca42d9e7bf4c5d7a35fec1e562524d4b3829328a
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 3e586836f967a61d3491e740b8ceb520b4923507
https://github.com/Evolveum/midpoint/commit/3e586836f967a61d3491e740b8ceb520b4923507
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/resources/common/system-configuration.xml
Log Message:
-----------
Support for multiple merge configurations (MID-3460)
Commit: 51c54399ae40e8c56477984ae1d998bd1b89a129
https://github.com/Evolveum/midpoint/commit/51c54399ae40e8c56477984ae1d998bd1b89a129
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
Log Message:
-----------
Shopping cart styles update
Commit: 6ea8ed325969f83d56966827df8414da990ebe96
https://github.com/Evolveum/midpoint/commit/6ea8ed325969f83d56966827df8414da990ebe96
Author: honchar <honchar at evolveum.com>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentViewType.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
Log Message:
-----------
role catalog session storage is created
Commit: 4872e7cfbbef0840b924cc37edfb6d9c542af3f8
https://github.com/Evolveum/midpoint/commit/4872e7cfbbef0840b924cc37edfb6d9c542af3f8
Author: honchar <honchar at evolveum.com>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
M model/model-intest/src/test/resources/common/system-configuration.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: d27fec89ffdeefa392cb72695185c768e95815d4
https://github.com/Evolveum/midpoint/commit/d27fec89ffdeefa392cb72695185c768e95815d4
Author: honchar <honchar at evolveum.com>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
Log Message:
-----------
role catalog fixes
Commit: f486b2b7a1e89bbe763aa86a1daffe51fa333b64
https://github.com/Evolveum/midpoint/commit/f486b2b7a1e89bbe763aa86a1daffe51fa333b64
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/resources/common/system-configuration.xml
Log Message:
-----------
Object merge, step 3: expressions (MID-3460)
Commit: caca48d35fb6cf18614a9c9e472bf5851b9c5708
https://github.com/Evolveum/midpoint/commit/caca48d35fb6cf18614a9c9e472bf5851b9c5708
Author: ardanu <arda.nural at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Modified delta details page of Audit log viewer
Commit: e03ddb26ee06715f8082bfa738c3d8672ca894cd
https://github.com/Evolveum/midpoint/commit/e03ddb26ee06715f8082bfa738c3d8672ca894cd
Author: ardanu <arda.nural at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentViewType.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
M model/model-intest/src/test/resources/common/system-configuration.xml
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
Log Message:
-----------
modified midpoint.properties
Commit: 144498e3b7f7e4e80e6b1df0aa6c9eabd922c635
https://github.com/Evolveum/midpoint/commit/144498e3b7f7e4e80e6b1df0aa6c9eabd922c635
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Filtering parameters are decorated in the PageAuditRecorViewer
Commit: 3c8bf63d3a9d7f38d3fe391020a8fb75119f8b64
https://github.com/Evolveum/midpoint/commit/3c8bf63d3a9d7f38d3fe391020a8fb75119f8b64
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentViewType.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/resources/common/system-configuration.xml
Log Message:
-----------
Filtering parameters are decorated in the PageAuditRecorViewer
Commit: fdabee105182ad31a2599a1e3be03f6540a4cb7d
https://github.com/Evolveum/midpoint/commit/fdabee105182ad31a2599a1e3be03f6540a4cb7d
Author: honchar <honchar at evolveum.com>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
Log Message:
-----------
little fixes
Commit: e21c35b14f4fc2e8912e171639debc5e988be8ee
https://github.com/Evolveum/midpoint/commit/e21c35b14f4fc2e8912e171639debc5e988be8ee
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
Log Message:
-----------
the problem about qnameToUri is fixed in in the PageAuditRecorViewer
Commit: 398b608aec7d3da785f224070fcb2b40dc39a4c7
https://github.com/Evolveum/midpoint/commit/398b608aec7d3da785f224070fcb2b40dc39a4c7
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
Log Message:
-----------
the problem about qnameToUri is fixed in in the PageAuditRecorViewer
Commit: 7a7adc91b6cd2c7177cb8aacc9bd7db64ec450cc
https://github.com/Evolveum/midpoint/commit/7a7adc91b6cd2c7177cb8aacc9bd7db64ec450cc
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java
Log Message:
-----------
columns in the table of the PageAuditRecorViewer are adjusted
Commit: a670c23f6ccb994583fbeb70562033a00d486c0f
https://github.com/Evolveum/midpoint/commit/a670c23f6ccb994583fbeb70562033a00d486c0f
Author: honchar <honchar at evolveum.com>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Merge objects gui: first step
Commit: 8b29ad99f05843933f2984de4b4dae701f575cb3
https://github.com/Evolveum/midpoint/commit/8b29ad99f05843933f2984de4b4dae701f575cb3
Author: honchar <honchar at evolveum.com>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/resources/common/system-configuration.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Conflicts:
gui/admin-gui/src/main/resources/localization/Midpoint.properties
Commit: 19388c5a7399930197e17863f1f69af1a08972f0
https://github.com/Evolveum/midpoint/commit/19388c5a7399930197e17863f1f69af1a08972f0
Author: ozkanbayraktar <ozkan.bayraktar at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java
Log Message:
-----------
columns in the table of the PageAuditRecorViewer are adjusted
Commit: 5aeb18359e07cc69118668a853b821c40431ec34
https://github.com/Evolveum/midpoint/commit/5aeb18359e07cc69118668a853b821c40431ec34
Author: ardanu <arda.nural at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
Log Message:
-----------
modified midpoint.properties
Commit: fe06773dd8bd25de0adb1e7688e7e7fee16058c1
https://github.com/Evolveum/midpoint/commit/fe06773dd8bd25de0adb1e7688e7e7fee16058c1
Author: ardanu <arda.nural at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
Log Message:
-----------
changed delta details panel
Commit: b1f6c50b83db6b253d50db8acacddc2ca2ed8b3c
https://github.com/Evolveum/midpoint/commit/b1f6c50b83db6b253d50db8acacddc2ca2ed8b3c
Author: ardanu <arda.nural at biznet.com.tr>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 739863c1e7e7670196f6671594e763d0b9a65c43
https://github.com/Evolveum/midpoint/commit/739863c1e7e7670196f6671594e763d0b9a65c43
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-10-14 (Fri, 14 Oct 2016)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
fixing audit log details page, audit record provider paging
Commit: 08c0ac0c952a276de6c2e8574804950df806fe0d
https://github.com/Evolveum/midpoint/commit/08c0ac0c952a276de6c2e8574804950df806fe0d
Author: honchar <honchar at evolveum.com>
Date: 2016-10-14 (Fri, 14 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
MID-3470 fixed: ActivationStatusType for extended attributes
Commit: 9ff8ee598986c3aaaea8b6e9e1ad744dd1c6de26
https://github.com/Evolveum/midpoint/commit/9ff8ee598986c3aaaea8b6e9e1ad744dd1c6de26
Author: honchar <honchar at evolveum.com>
Date: 2016-10-14 (Fri, 14 Oct 2016)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Conflicts:
gui/admin-gui/src/main/resources/localization/Midpoint.properties
Commit: 9b0a70294b17149a28a0fac013d138674a3031a6
https://github.com/Evolveum/midpoint/commit/9b0a70294b17149a28a0fac013d138674a3031a6
Author: honchar <honchar at evolveum.com>
Date: 2016-10-14 (Fri, 14 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
merge
Commit: daf13484fa0922178d5ee7165f4a04de0a12ee5b
https://github.com/Evolveum/midpoint/commit/daf13484fa0922178d5ee7165f4a04de0a12ee5b
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-14 (Fri, 14 Oct 2016)
Changed paths:
M samples/evolveum/role-catalog.xml
Log Message:
-----------
Fixing element ordering (fixes samples test)
Commit: 48153e19ef0e0c06263dcf7db1f4f2d0452d6740
https://github.com/Evolveum/midpoint/commit/48153e19ef0e0c06263dcf7db1f4f2d0452d6740
Author: Martin Lízner <martin.lizner at gmail.com>
Date: 2016-10-14 (Fri, 14 Oct 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Travis: experimental switch to Trusty VM, abandon JDK7
Commit: a47e3a76f28fd465e247f0dede7da66daee578ee
https://github.com/Evolveum/midpoint/commit/a47e3a76f28fd465e247f0dede7da66daee578ee
Author: Martin Lízner <martin.lizner at gmail.com>
Date: 2016-10-14 (Fri, 14 Oct 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Travis: cleanup
Commit: 16c7e06b9d1a925eb2d91713e368be325f426ed5
https://github.com/Evolveum/midpoint/commit/16c7e06b9d1a925eb2d91713e368be325f426ed5
Author: honchar <honchar at evolveum.com>
Date: 2016-10-17 (Mon, 17 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
Log Message:
-----------
Merge Objects gui implementing
Commit: 29fa771ec779262a401519897c67c3fc52419113
https://github.com/Evolveum/midpoint/commit/29fa771ec779262a401519897c67c3fc52419113
Author: honchar <honchar at evolveum.com>
Date: 2016-10-17 (Mon, 17 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
Log Message:
-----------
Merge Objects gui implementing
Commit: cefdce64d5d0baa8dd81dba65fb87e7a7deb5361
https://github.com/Evolveum/midpoint/commit/cefdce64d5d0baa8dd81dba65fb87e7a7deb5361
Author: honchar <honchar at evolveum.com>
Date: 2016-10-17 (Mon, 17 Oct 2016)
Changed paths:
M .travis.yml
M samples/evolveum/role-catalog.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 53c62125a541205e332b3c1d19dc0b0d4be4fbce
https://github.com/Evolveum/midpoint/commit/53c62125a541205e332b3c1d19dc0b0d4be4fbce
Author: honchar <honchar at evolveum.com>
Date: 2016-10-18 (Tue, 18 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Merge Objects page extends PageAdminFocus
Commit: 4fd4fb99b2a7c1e3a12c375c026b88bba8a6bb8b
https://github.com/Evolveum/midpoint/commit/4fd4fb99b2a7c1e3a12c375c026b88bba8a6bb8b
Author: Petr Gašparík <petr.gasparik at ami.cz>
Date: 2016-10-18 (Tue, 18 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
Log Message:
-----------
Merge branch 'transifex'
# Conflicts:
# gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
Compare: https://github.com/Evolveum/midpoint/compare/aecbced22316...4fd4fb99b2a7
More information about the midPoint-svn
mailing list