[midPoint-git] [Evolveum/midpoint] 8d32d1: Merge Objects page

honchar honchar at evolveum.com
Thu Oct 20 01:07:44 CEST 2016 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8d32d1dab643c456cc9537bf72ba11d1b8960f76
      https://github.com/Evolveum/midpoint/commit/8d32d1dab643c456cc9537bf72ba11d1b8960f76
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-20 (Thu, 20 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

  Log Message:
  -----------
  Merge Objects page


  Commit: 04ad9e574c3c907adc77a3b2abad95ec67b1353a
      https://github.com/Evolveum/midpoint/commit/04ad9e574c3c907adc77a3b2abad95ec67b1353a
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    A build-system/maven/maven-wrapper.jar
    A build-system/maven/maven-wrapper.properties
    A build-system/mvnw
    A build-system/mvnw.bat
    M build-system/pom.xml
    A cli/common/maven/maven-wrapper.jar
    A cli/common/maven/maven-wrapper.properties
    A cli/common/mvnw
    A cli/common/mvnw.bat
    A cli/maven/maven-wrapper.jar
    A cli/maven/maven-wrapper.properties
    A cli/mvnw
    A cli/mvnw.bat
    A cli/ninja/maven/maven-wrapper.jar
    A cli/ninja/maven/maven-wrapper.properties
    A cli/ninja/mvnw
    A cli/ninja/mvnw.bat
    A cli/seppuku/maven/maven-wrapper.jar
    A cli/seppuku/maven/maven-wrapper.properties
    A cli/seppuku/mvnw
    A cli/seppuku/mvnw.bat
    A custom/maven/maven-wrapper.jar
    A custom/maven/maven-wrapper.properties
    A custom/mvnw
    A custom/mvnw.bat
    A dist/maven/maven-wrapper.jar
    A dist/maven/maven-wrapper.properties
    A dist/midpoint-api/maven/maven-wrapper.jar
    A dist/midpoint-api/maven/maven-wrapper.properties
    A dist/midpoint-api/mvnw
    A dist/midpoint-api/mvnw.bat
    A dist/mvnw
    A dist/mvnw.bat
    A gui/admin-gui/maven/maven-wrapper.jar
    A gui/admin-gui/maven/maven-wrapper.properties
    A gui/admin-gui/mvnw
    A gui/admin-gui/mvnw.bat
    M 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/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DateInput.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DatePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.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/PageReports.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.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/java/com/evolveum/midpoint/web/util/DateValidator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    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
    A gui/maven/maven-wrapper.jar
    A gui/maven/maven-wrapper.properties
    A gui/mvnw
    A gui/mvnw.bat
    A icf-connectors/dummy-connector-fake/maven/maven-wrapper.jar
    A icf-connectors/dummy-connector-fake/maven/maven-wrapper.properties
    A icf-connectors/dummy-connector-fake/mvnw
    A icf-connectors/dummy-connector-fake/mvnw.bat
    A icf-connectors/dummy-connector/maven/maven-wrapper.jar
    A icf-connectors/dummy-connector/maven/maven-wrapper.properties
    A icf-connectors/dummy-connector/mvnw
    A icf-connectors/dummy-connector/mvnw.bat
    A icf-connectors/dummy-resource/maven/maven-wrapper.jar
    A icf-connectors/dummy-resource/maven/maven-wrapper.properties
    A icf-connectors/dummy-resource/mvnw
    A icf-connectors/dummy-resource/mvnw.bat
    A icf-connectors/maven/maven-wrapper.jar
    A icf-connectors/maven/maven-wrapper.properties
    A icf-connectors/mvnw
    A icf-connectors/mvnw.bat
    A infra/common/maven/maven-wrapper.jar
    A infra/common/maven/maven-wrapper.properties
    A infra/common/mvnw
    A infra/common/mvnw.bat
    A infra/maven/maven-wrapper.jar
    A infra/maven/maven-wrapper.properties
    A infra/mvnw
    A infra/mvnw.bat
    A infra/prism-maven-plugin/maven/maven-wrapper.jar
    A infra/prism-maven-plugin/maven/maven-wrapper.properties
    A infra/prism-maven-plugin/mvnw
    A infra/prism-maven-plugin/mvnw.bat
    A infra/prism/maven/maven-wrapper.jar
    A infra/prism/maven/maven-wrapper.properties
    A infra/prism/mvnw
    A infra/prism/mvnw.bat
    A infra/schema/maven/maven-wrapper.jar
    A infra/schema/maven/maven-wrapper.properties
    A infra/schema/mvnw
    A infra/schema/mvnw.bat
    A infra/test-util/maven/maven-wrapper.jar
    A infra/test-util/maven/maven-wrapper.properties
    A infra/test-util/mvnw
    A infra/test-util/mvnw.bat
    A infra/util/maven/maven-wrapper.jar
    A infra/util/maven/maven-wrapper.properties
    A infra/util/mvnw
    A infra/util/mvnw.bat
    A infra/ws-util/maven/maven-wrapper.jar
    A infra/ws-util/maven/maven-wrapper.properties
    A infra/ws-util/mvnw
    A infra/ws-util/mvnw.bat
    A maven/maven-wrapper.jar
    A maven/maven-wrapper.properties
    A model/certification-api/maven/maven-wrapper.jar
    A model/certification-api/maven/maven-wrapper.properties
    A model/certification-api/mvnw
    A model/certification-api/mvnw.bat
    A model/certification-impl/maven/maven-wrapper.jar
    A model/certification-impl/maven/maven-wrapper.properties
    A model/certification-impl/mvnw
    A model/certification-impl/mvnw.bat
    A model/maven/maven-wrapper.jar
    A model/maven/maven-wrapper.properties
    A model/model-api/maven/maven-wrapper.jar
    A model/model-api/maven/maven-wrapper.properties
    A model/model-api/mvnw
    A model/model-api/mvnw.bat
    A model/model-client/maven/maven-wrapper.jar
    A model/model-client/maven/maven-wrapper.properties
    A model/model-client/mvnw
    A model/model-client/mvnw.bat
    A model/model-common/maven/maven-wrapper.jar
    A model/model-common/maven/maven-wrapper.properties
    A model/model-common/mvnw
    A model/model-common/mvnw.bat
    A model/model-impl/maven/maven-wrapper.jar
    A model/model-impl/maven/maven-wrapper.properties
    A model/model-impl/mvnw
    A model/model-impl/mvnw.bat
    M model/model-impl/src/test/resources/sync/action/account/group-change.xml
    M model/model-impl/src/test/resources/sync/action/user/existing-user-change.xml
    M model/model-impl/src/test/resources/sync/change-correct.xml
    M model/model-impl/src/test/resources/sync/change-without-object.xml
    A model/model-intest/maven/maven-wrapper.jar
    A model/model-intest/maven/maven-wrapper.properties
    A model/model-intest/mvnw
    A model/model-intest/mvnw.bat
    A model/model-test/maven/maven-wrapper.jar
    A model/model-test/maven/maven-wrapper.properties
    A model/model-test/mvnw
    A model/model-test/mvnw.bat
    A model/mvnw
    A model/mvnw.bat
    A model/notifications-api/maven/maven-wrapper.jar
    A model/notifications-api/maven/maven-wrapper.properties
    A model/notifications-api/mvnw
    A model/notifications-api/mvnw.bat
    A model/notifications-impl/maven/maven-wrapper.jar
    A model/notifications-impl/maven/maven-wrapper.properties
    A model/notifications-impl/mvnw
    A model/notifications-impl/mvnw.bat
    A model/report-api/maven/maven-wrapper.jar
    A model/report-api/maven/maven-wrapper.properties
    A model/report-api/mvnw
    A model/report-api/mvnw.bat
    A model/report-impl/maven/maven-wrapper.jar
    A model/report-impl/maven/maven-wrapper.properties
    A model/report-impl/mvnw
    A model/report-impl/mvnw.bat
    A model/workflow-api/maven/maven-wrapper.jar
    A model/workflow-api/maven/maven-wrapper.properties
    A model/workflow-api/mvnw
    A model/workflow-api/mvnw.bat
    A model/workflow-impl/maven/maven-wrapper.jar
    A model/workflow-impl/maven/maven-wrapper.properties
    A model/workflow-impl/mvnw
    A model/workflow-impl/mvnw.bat
    A mvnw
    A mvnw.bat
    M pom.xml
    A provisioning/maven/maven-wrapper.jar
    A provisioning/maven/maven-wrapper.properties
    A provisioning/mvnw
    A provisioning/mvnw.bat
    A provisioning/provisioning-api/maven/maven-wrapper.jar
    A provisioning/provisioning-api/maven/maven-wrapper.properties
    A provisioning/provisioning-api/mvnw
    A provisioning/provisioning-api/mvnw.bat
    A provisioning/provisioning-impl/maven/maven-wrapper.jar
    A provisioning/provisioning-impl/maven/maven-wrapper.properties
    A provisioning/provisioning-impl/mvnw
    A provisioning/provisioning-impl/mvnw.bat
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
    A repo/audit-api/maven/maven-wrapper.jar
    A repo/audit-api/maven/maven-wrapper.properties
    A repo/audit-api/mvnw
    A repo/audit-api/mvnw.bat
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventType.java
    A repo/audit-impl/maven/maven-wrapper.jar
    A repo/audit-impl/maven/maven-wrapper.properties
    A repo/audit-impl/mvnw
    A repo/audit-impl/mvnw.bat
    A repo/maven/maven-wrapper.jar
    A repo/maven/maven-wrapper.properties
    A repo/mvnw
    A repo/mvnw.bat
    A repo/repo-api/maven/maven-wrapper.jar
    A repo/repo-api/maven/maven-wrapper.properties
    A repo/repo-api/mvnw
    A repo/repo-api/mvnw.bat
    A repo/repo-cache/maven/maven-wrapper.jar
    A repo/repo-cache/maven/maven-wrapper.properties
    A repo/repo-cache/mvnw
    A repo/repo-cache/mvnw.bat
    A repo/repo-sql-impl-test/maven/maven-wrapper.jar
    A repo/repo-sql-impl-test/maven/maven-wrapper.properties
    A repo/repo-sql-impl-test/mvnw
    A repo/repo-sql-impl-test/mvnw.bat
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-csv.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    A repo/repo-sql-impl/maven/maven-wrapper.jar
    A repo/repo-sql-impl/maven/maven-wrapper.properties
    A repo/repo-sql-impl/mvnw
    A repo/repo-sql-impl/mvnw.bat
    A repo/repo-test-util/maven/maven-wrapper.jar
    A repo/repo-test-util/maven/maven-wrapper.properties
    A repo/repo-test-util/mvnw
    A repo/repo-test-util/mvnw.bat
    A repo/security-api/maven/maven-wrapper.jar
    A repo/security-api/maven/maven-wrapper.properties
    A repo/security-api/mvnw
    A repo/security-api/mvnw.bat
    A repo/security-impl/maven/maven-wrapper.jar
    A repo/security-impl/maven/maven-wrapper.properties
    A repo/security-impl/mvnw
    A repo/security-impl/mvnw.bat
    A repo/system-init/maven/maven-wrapper.jar
    A repo/system-init/maven/maven-wrapper.properties
    A repo/system-init/mvnw
    A repo/system-init/mvnw.bat
    A repo/task-api/maven/maven-wrapper.jar
    A repo/task-api/maven/maven-wrapper.properties
    A repo/task-api/mvnw
    A repo/task-api/mvnw.bat
    A repo/task-quartz-impl/maven/maven-wrapper.jar
    A repo/task-quartz-impl/maven/maven-wrapper.properties
    A repo/task-quartz-impl/mvnw
    A repo/task-quartz-impl/mvnw.bat
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M samples/demo-rs/resource-csv-source.xml
    M samples/demo-rs/resource-csv-xxx.xml
    M samples/demo-rs/resource-ldap-openldap.xml
    M samples/demo/hr.xml
    M samples/demo/opendj.xml
    M samples/demo/openldap.xml
    A samples/maven/maven-wrapper.jar
    A samples/maven/maven-wrapper.properties
    A samples/model-client-sample/maven/maven-wrapper.jar
    A samples/model-client-sample/maven/maven-wrapper.properties
    A samples/model-client-sample/mvnw
    A samples/model-client-sample/mvnw.bat
    M samples/model-client-sample/pom.xml
    A samples/mvnw
    A samples/mvnw.bat
    M samples/resources/389ds/389ds-legacy-connector.xml
    M samples/resources/ad/ad-resource-advanced-sync.xml
    M samples/resources/csvfile/localhost-csvfile-medium.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync-2.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml
    M samples/resources/csvfile/localhost-csvfile-resource-bulk-action.xml
    M samples/resources/dsee/odsee-localhost-advanced-nosync.xml
    M samples/resources/office365/office365-federated.xml
    M samples/resources/office365/office365-managed.xml
    M samples/resources/opendj/opendj-localhost-medium.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
    M samples/resources/opendj/piracy/opendj-localhost-resource-sync-extension-pirates.xml
    M samples/resources/openldap/openldap-localhost-medium.xml
    M samples/resources/scriptedsql/localhost-scriptedsql-advanced-nosync.xml
    M samples/resources/scriptedsql/localhost-scriptedsql-advanced-sync.xml
    M samples/rest/opendj-resource-sync.xml
    A samples/samples-test/maven/maven-wrapper.jar
    A samples/samples-test/maven/maven-wrapper.properties
    A samples/samples-test/mvnw
    A samples/samples-test/mvnw.bat
    M samples/stories/multitenant-idm-saas/resources/crm-simulation-sync.xml
    M samples/stories/multitenant-idm-saas/resources/openldap-customers.xml
    M samples/stories/unix-ldap-advanced/resources/resource-openLDAP.xml
    M samples/stories/unix-ldap/resources/ldap-posix.xml
    A testing/consistency-mechanism/maven/maven-wrapper.jar
    A testing/consistency-mechanism/maven/maven-wrapper.properties
    A testing/consistency-mechanism/mvnw
    A testing/consistency-mechanism/mvnw.bat
    M testing/consistency-mechanism/src/test/resources/request/resource-modify-synchronization.xml
    A testing/maven/maven-wrapper.jar
    A testing/maven/maven-wrapper.properties
    A testing/mvnw
    A testing/mvnw.bat
    A testing/sanity/maven/maven-wrapper.jar
    A testing/sanity/maven/maven-wrapper.properties
    A testing/sanity/mvnw
    A testing/sanity/mvnw.bat
    M testing/selenidetest/src/test/resources/mp-resources/localhost-csvfile-resource-advanced-sync.xml
    M testing/story/src/test/resources/science/resource-dummy-stats.xml
    M testing/story/src/test/resources/science/resource-dummy-unix.xml
    M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
    A tools/gui-i18n/maven/maven-wrapper.jar
    A tools/gui-i18n/maven/maven-wrapper.properties
    A tools/gui-i18n/mvnw
    A tools/gui-i18n/mvnw.bat
    A tools/maven/maven-wrapper.jar
    A tools/maven/maven-wrapper.properties
    A tools/mvnw
    A tools/mvnw.bat
    A tools/repo-ninja/maven/maven-wrapper.jar
    A tools/repo-ninja/maven/maven-wrapper.properties
    A tools/repo-ninja/mvnw
    A tools/repo-ninja/mvnw.bat
    M tools/repo-ninja/src/test/resources/objects.xml
    A tools/schema-dist-maven-plugin/maven/maven-wrapper.jar
    A tools/schema-dist-maven-plugin/maven/maven-wrapper.properties
    A tools/schema-dist-maven-plugin/mvnw
    A tools/schema-dist-maven-plugin/mvnw.bat
    A tools/test-ng/maven/maven-wrapper.jar
    A tools/test-ng/maven/maven-wrapper.properties
    A tools/test-ng/mvnw
    A tools/test-ng/mvnw.bat
    A tools/xjc-plugin/maven/maven-wrapper.jar
    A tools/xjc-plugin/maven/maven-wrapper.properties
    A tools/xjc-plugin/mvnw
    A tools/xjc-plugin/mvnw.bat

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


Compare: https://github.com/Evolveum/midpoint/compare/652e78d56b06...04ad9e574c3c

More information about the midPoint-svn mailing list