[midPoint-git] [Evolveum/midpoint] 6c567a: policy rule assignments names

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6c567abf18c80308e8f41543c119b273e5b677a0
      https://github.com/Evolveum/midpoint/commit/6c567abf18c80308e8f41543c119b273e5b677a0
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  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/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  policy rule assignments names


  Commit: 0dcb81b04c071941916d6f9493179e543d191f51
      https://github.com/Evolveum/midpoint/commit/0dcb81b04c071941916d6f9493179e543d191f51
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchValue.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/ScheduleValidator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.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/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    M model/model-intest/src/test/resources/schema/piracy.xsd
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java

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

Conflicts:
	gui/admin-gui/src/main/resources/localization/Midpoint.properties


Compare: https://github.com/Evolveum/midpoint/compare/dd4421d5b23b...0dcb81b04c07