[midPoint-git] [Evolveum/midpoint] 9edd39: MID-2914 user photo disappear fix when using AddWi...

Viliam Repan vilo.repan at evolveum.com
Thu May 19 11:31:20 CEST 2016 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 9edd3997f2842ff4f6055886477a3716143cace2
      https://github.com/Evolveum/midpoint/commit/9edd3997f2842ff4f6055886477a3716143cace2
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java

  Log Message:
  -----------
  MID-2914 user photo disappear fix when using AddWithOverwrite=true, KeepOid=false


  Commit: b4d47bff3697cb84c94607a26c02d8afe599af80
      https://github.com/Evolveum/midpoint/commit/b4d47bff3697cb84c94607a26c02d8afe599af80
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.html

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


  Commit: 0afcb67f04107e3fa2cdd57cf6a41a39f4493d35
      https://github.com/Evolveum/midpoint/commit/0afcb67f04107e3fa2cdd57cf6a41a39f4493d35
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/SynchronizationActionTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/Action.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
    M model/model-intest/src/test/resources/common/user-template-org-assignment.xml

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


  Commit: 15447eb45188b47347ebc5c699ae096602c6be4f
      https://github.com/Evolveum/midpoint/commit/15447eb45188b47347ebc5c699ae096602c6be4f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/AttributeEditorUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    A gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    A gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/locale.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
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/ResourceUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.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/AbstractInitializedModelIntegrationTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml
    A model/model-intest/src/test/resources/common/role-buccaneer-green.xml
    A model/model-intest/src/test/resources/common/role-pirate-green.xml
    A model/model-intest/src/test/resources/common/user-template-inbounds.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/Checker.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/resources/opendj-dumber/resource.xml
    M testing/conntest/src/test/resources/opendj/resource.xml
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java

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


Compare: https://github.com/Evolveum/midpoint/compare/5e34336c1f56...15447eb45188

More information about the midPoint-svn mailing list