[midPoint-git] [Evolveum/midpoint] fdabee: little fixes

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  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: 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: 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


Compare: https://github.com/Evolveum/midpoint/compare/739863c1e7e7...9b0a70294b17