[midPoint-git] [Evolveum/midpoint] 61efd9: refresh facility is added to the the table on the ...

Pavol Mederly mederly at evolveum.com
Thu Oct 13 09:20:15 CEST 2016 

  Branch: refs/heads/feature/yaml
  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: d2a9007cbab416af9405bc0b58b3c1dd1c899666
      https://github.com/Evolveum/midpoint/commit/d2a9007cbab416af9405bc0b58b3c1dd1c899666
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-10-11 (Tue, 11 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
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  Shopping cart styles (step 1)


  Commit: 2405e96850649ca73da6ebea23d08c7da4c5b01d
      https://github.com/Evolveum/midpoint/commit/2405e96850649ca73da6ebea23d08c7da4c5b01d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java

  Log Message:
  -----------
  preparation for audit log details page.. + some fixes in incompatible types..


  Commit: 0a80fb7c20b6d745775fc81b7c1a8b09ea2fe1fe
      https://github.com/Evolveum/midpoint/commit/0a80fb7c20b6d745775fc81b7c1a8b09ea2fe1fe
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-10-11 (Tue, 11 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
    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/webapp/less/midpoint-theme.less
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: cb7d1409d3fcc68585273bdbf69a4a049546d0e1
      https://github.com/Evolveum/midpoint/commit/cb7d1409d3fcc68585273bdbf69a4a049546d0e1
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java

  Log Message:
  -----------
  role catalog default view


  Commit: 51da6b1a90c14f9decd2d7a131654ef7843f59c8
      https://github.com/Evolveum/midpoint/commit/51da6b1a90c14f9decd2d7a131654ef7843f59c8
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-11 (Tue, 11 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.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/webapp/less/midpoint-theme.less
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  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: 3a9052618f5499a77bfe78c717c644f79a9a383a
      https://github.com/Evolveum/midpoint/commit/3a9052618f5499a77bfe78c717c644f79a9a383a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    A samples/evolveum/role-catalog.xml

  Log Message:
  -----------
  Role catalog example


  Commit: 513e47e6d47ef920b671c77c3782a97788d70722
      https://github.com/Evolveum/midpoint/commit/513e47e6d47ef920b671c77c3782a97788d70722
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-11 (Tue, 11 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/page/self/PageAssignmentShoppingKart.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java

  Log Message:
  -----------
  role catalog restructuring panels


  Commit: 144c658de555231a2de5e256caea475f975e256d
      https://github.com/Evolveum/midpoint/commit/144c658de555231a2de5e256caea475f975e256d
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    A samples/evolveum/role-catalog.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 6bf71953464b00be002436bfae27a744be8dbd83
      https://github.com/Evolveum/midpoint/commit/6bf71953464b00be002436bfae27a744be8dbd83
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.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
    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

  Log Message:
  -----------
  Basic implementation of object merge (model) (MID-3460)


  Commit: 48c2cb2d4347af310f826d8c42176367723e2c1e
      https://github.com/Evolveum/midpoint/commit/48c2cb2d4347af310f826d8c42176367723e2c1e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java

  Log Message:
  -----------
  Test comments


  Commit: 1336bd75c6ba6ae7f6a2435c3a260dc26428ea2b
      https://github.com/Evolveum/midpoint/commit/1336bd75c6ba6ae7f6a2435c3a260dc26428ea2b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-10-11 (Tue, 11 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/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-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
    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:
  -----------
  Identity merge, second step (MID-3460)


  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: 750f3fff3e536c7d0135356cf7dca4aab4e8276b
      https://github.com/Evolveum/midpoint/commit/750f3fff3e536c7d0135356cf7dca4aab4e8276b
  Author: Pavol Mederly <mederly 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/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
    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
    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
    A samples/evolveum/role-catalog.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/yaml

# Conflicts:
#	infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java


Compare: https://github.com/Evolveum/midpoint/compare/2f3fce5f0dab...750f3fff3e53

More information about the midPoint-svn mailing list