[midPoint-git] [Evolveum/midpoint] 0acaa7: Fixing a-priori delta in object template and assig...

petr.gasparik petr.gasparik at ami.cz
Fri May 20 14:38:27 CEST 2016


  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 0acaa78f5827387ed710358761023d35e22f4168
      https://github.com/Evolveum/midpoint/commit/0acaa78f5827387ed710358761023d35e22f4168
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java

  Log Message:
  -----------
  Fixing a-priori delta in object template and assignment focus mappings.


  Commit: daae01af4bc3011aa30f7216f7d8ea85b42de972
      https://github.com/Evolveum/midpoint/commit/daae01af4bc3011aa30f7216f7d8ea85b42de972
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    A gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties

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


  Commit: acf5f34a1659016fcb51e3a36529538ce8e37d9f
      https://github.com/Evolveum/midpoint/commit/acf5f34a1659016fcb51e3a36529538ce8e37d9f
  Author: petr.gasparik <petr.gasparik at ami.cz>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/locale.properties

  Log Message:
  -----------
  added Russian to locales


  Commit: 4cd7c33ec790f63bb5a2ed45c5501579cd4e1cbf
      https://github.com/Evolveum/midpoint/commit/4cd7c33ec790f63bb5a2ed45c5501579cd4e1cbf
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    A model/model-intest/src/test/resources/iteration/user-template-iteration-unique-email.xml

  Log Message:
  -----------
  Tests for midpoint.isUniquePropertyValue() (MID-2887)


  Commit: 44ecf4b81b38b18021d544783d132d31b83961c8
      https://github.com/Evolveum/midpoint/commit/44ecf4b81b38b18021d544783d132d31b83961c8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

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

  Log Message:
  -----------
  Test cleanup


  Commit: 5b9abba2321f5099fe1575f3b2406a745680a39e
      https://github.com/Evolveum/midpoint/commit/5b9abba2321f5099fe1575f3b2406a745680a39e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/testng-unit.xml

  Log Message:
  -----------
  Test cleanup


  Commit: cc5f0156fc528c3197679013c5a6222816957516
      https://github.com/Evolveum/midpoint/commit/cc5f0156fc528c3197679013c5a6222816957516
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java
    A model/model-impl/src/test/resources/expr/expression-testIsUniquePropertyValue.xml

  Log Message:
  -----------
  Fixing matching rules in midpoint.isUniquePropertyValue() library function (MID-2887)


  Commit: 7c4a467e1f3d49d52ecf40aa70a5f93c013de946
      https://github.com/Evolveum/midpoint/commit/7c4a467e1f3d49d52ecf40aa70a5f93c013de946
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    R infra/util/src/main/java/com/evolveum/midpoint/util/EscapeStringBuilder.java
    R infra/util/src/main/java/com/evolveum/midpoint/util/GenericEscapeStringBuilder.java
    R infra/util/src/main/java/com/evolveum/midpoint/util/XQueryEscapeStringBuilder.java

  Log Message:
  -----------
  removed obsolete files


  Commit: bb5db18ab941f0934af6fbc2789fa7e5bf7b29fd
      https://github.com/Evolveum/midpoint/commit/bb5db18ab941f0934af6fbc2789fa7e5bf7b29fd
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.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/TestPassword.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Fixing prism findItemDelta() which also fixes password policy issues (MID-2857) +tests and cleanup


  Commit: c3a0e8a9e72e5a8296d518d6098e03c151deed1f
      https://github.com/Evolveum/midpoint/commit/c3a0e8a9e72e5a8296d518d6098e03c151deed1f
  Author: Petr Gašparík <petr.gasparik at ami.cz>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/locale.properties

  Log Message:
  -----------
  a correction to Estonian flag


  Commit: 35a9f5c7a02109e68ce16dcb5345b9822c09ab39
      https://github.com/Evolveum/midpoint/commit/35a9f5c7a02109e68ce16dcb5345b9822c09ab39
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java

  Log Message:
  -----------
  Fixing search panel on the self dashboard page


  Commit: bf575e23ad3c6676269582b34148b176ff3201f2
      https://github.com/Evolveum/midpoint/commit/bf575e23ad3c6676269582b34148b176ff3201f2
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/LoadableModel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/NonEmptyLoadableModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.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/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SingleButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DateFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ObjectReferenceChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RefinedObjectTypeChoicePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/StringChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/dto/ExpressionTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/ContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/DeltaPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/ModificationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfDeltasPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfDeltasPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfHistoryPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfHistoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
    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.html
    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/capability/AddCapabilityDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityStepDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityValuePanel.java
    A 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/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationExpressionEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/Capability.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/IterationSpecificationTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ObjectSynchronizationTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/PropertyLimitationsTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ResourceObjectTypeDefinitionTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ResourceSynchronizationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/SchemaHandlingDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionXmlPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/AceEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.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/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/StringResourceChoiceRenderer.java
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/MatchingRuleRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/MatchingRuleRegistryFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/CapabilityUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SynchronizationSituationUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/testng-unit.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAuthenticationEvaluator.java
    A model/model-impl/src/test/resources/expr/expression-testIsUniquePropertyValue.xml
    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
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/role-captain.xml
    M model/model-intest/src/test/resources/common/role-thief.xml
    A model/model-intest/src/test/resources/common/service-ship-sea-monkey.xml
    A model/model-intest/src/test/resources/iteration/user-template-iteration-unique-email.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-beige.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-ivory.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-lavender.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-peru.xml
    R model/model-intest/src/test/resources/multi/resource-dummy-yellow.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    A samples/resources/office365/office365-managed2.xml
    M samples/stories/multitenant-idm-saas/roles/role-customer-authz-enduser.xml
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

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


  Commit: 41ba639436c0f1c87a13771fd04c8061586c6f64
      https://github.com/Evolveum/midpoint/commit/41ba639436c0f1c87a13771fd04c8061586c6f64
  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/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.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/TestPassword.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: 109d9e5df18b58eebb11ad007a3120b6fe124868
      https://github.com/Evolveum/midpoint/commit/109d9e5df18b58eebb11ad007a3120b6fe124868
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 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/component/form/ValueChoosePanel.html
    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/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java

  Log Message:
  -----------
  changed valueChoosePanel to use mainPopup dialog and newly created object browser panel//


  Commit: 76da8fe43bb89f76d40ec6f7d1259709d06788f0
      https://github.com/Evolveum/midpoint/commit/76da8fe43bb89f76d40ec6f7d1259709d06788f0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java

  Log Message:
  -----------
  Fixing the build. Sorry.


  Commit: b1fb771974cd55a84741413b99c81f3dcc284aec
      https://github.com/Evolveum/midpoint/commit/b1fb771974cd55a84741413b99c81f3dcc284aec
  Author: Katarina Valalikova <k.valalikova 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.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.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/objectdetails/FocusProjectionsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.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/users/component/AbstractRoleMemberPanel.java

  Log Message:
  -----------
  ranming FocusBrowserPanel to more appropriate name => ObjectBrowserPanel


  Commit: 7e35bd436541ff832672ad818ebeec7df8740978
      https://github.com/Evolveum/midpoint/commit/7e35bd436541ff832672ad818ebeec7df8740978
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    R infra/util/src/main/java/com/evolveum/midpoint/util/EscapeStringBuilder.java
    R infra/util/src/main/java/com/evolveum/midpoint/util/GenericEscapeStringBuilder.java
    R infra/util/src/main/java/com/evolveum/midpoint/util/XQueryEscapeStringBuilder.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/testng-unit.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAuthenticationEvaluator.java
    A model/model-impl/src/test/resources/expr/expression-testIsUniquePropertyValue.xml
    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/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    A model/model-intest/src/test/resources/iteration/user-template-iteration-unique-email.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-beige.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-ivory.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-lavender.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-peru.xml
    R model/model-intest/src/test/resources/multi/resource-dummy-yellow.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    A samples/resources/office365/office365-managed2.xml
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

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


  Commit: 82f56fcfd03126715d7d7c65f11509ceae9bfc87
      https://github.com/Evolveum/midpoint/commit/82f56fcfd03126715d7d7c65f11509ceae9bfc87
  Author: honchar <honchar 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:
  -----------
  renamed FocusBrowserPanel.html to ObjectBrowserPanel.html


  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: 336689f837e0efd771ee784fd5da40d7a78c9afd
      https://github.com/Evolveum/midpoint/commit/336689f837e0efd771ee784fd5da40d7a78c9afd
  Author: Pavol Mederly <mederly 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

  Log Message:
  -----------
  Eliminating (some of) needless updates in RW.


  Commit: 6f08ef779e7a83400beede06df2d46f533cda408
      https://github.com/Evolveum/midpoint/commit/6f08ef779e7a83400beede06df2d46f533cda408
  Author: Katarina Valalikova <k.valalikova 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:
  -----------
  renaming  html file focusBrowserPanel - > ObjectBrowserPanel


  Commit: b9e18c4c30ff6da75421cf0de461d76da0225c5e
      https://github.com/Evolveum/midpoint/commit/b9e18c4c30ff6da75421cf0de461d76da0225c5e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

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


  Commit: 5d886a1bb3566909840c64826ab6f9a3b3844e08
      https://github.com/Evolveum/midpoint/commit/5d886a1bb3566909840c64826ab6f9a3b3844e08
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

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


  Commit: 7b5866dee6fab61e9bce7ba17a687faf66806f22
      https://github.com/Evolveum/midpoint/commit/7b5866dee6fab61e9bce7ba17a687faf66806f22
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties

  Log Message:
  -----------
  added property keys for run report popup


  Commit: c00406d73bac91f810866b56e678d3af28e8833e
      https://github.com/Evolveum/midpoint/commit/c00406d73bac91f810866b56e678d3af28e8833e
  Author: honchar <honchar 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

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


  Commit: cb1907488caa76f8ca13c1f69f65dc5a42d09828
      https://github.com/Evolveum/midpoint/commit/cb1907488caa76f8ca13c1f69f65dc5a42d09828
  Author: Pavol Mederly <mederly 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/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

  Log Message:
  -----------
  Fixing adduser action URI + mark deprecated action URIs as such.


  Commit: ee408375a1b35f24d8d71b2b3d49ac56d3c176a1
      https://github.com/Evolveum/midpoint/commit/ee408375a1b35f24d8d71b2b3d49ac56d3c176a1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties

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


  Commit: 9186efe47d95b33c0dc6f5106c5a9f6204a1d403
      https://github.com/Evolveum/midpoint/commit/9186efe47d95b33c0dc6f5106c5a9f6204a1d403
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    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:
  -----------
  Fixing orgtest - normal mappings in object template


  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: 4fca8c04f738d56bf379b4f7e10d6bf4ed235121
      https://github.com/Evolveum/midpoint/commit/4fca8c04f738d56bf379b4f7e10d6bf4ed235121
  Author: Martin Lízner <martin.lizner at gmail.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Bump surefire version to 2.19.1


  Commit: b5cba7c8aebe1643cfebb9611d0647b213430c12
      https://github.com/Evolveum/midpoint/commit/b5cba7c8aebe1643cfebb9611d0647b213430c12
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-18 (Wed, 18 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/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/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/ResourceUtils.java

  Log Message:
  -----------
  Fixed loadable models updating in RW. Fixed schema reload in RW.


  Commit: e17e97d9705cda1d13f7ed9aa7337b0b8b6f86e3
      https://github.com/Evolveum/midpoint/commit/e17e97d9705cda1d13f7ed9aa7337b0b8b6f86e3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M build-system/pom.xml
    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 https://github.com/Evolveum/midpoint


  Commit: cfe8a68d63c42e045963ff8357668d031213f913
      https://github.com/Evolveum/midpoint/commit/cfe8a68d63c42e045963ff8357668d031213f913
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-18 (Wed, 18 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/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/page/admin/resources/PageResourceWizard.java

  Log Message:
  -----------
  Ignoring fetchResult changes in RW. Allowing only one 'default' per kind in schema handling.


  Commit: 93f83889f5e2efd179d9bd401b60fddb5192afa5
      https://github.com/Evolveum/midpoint/commit/93f83889f5e2efd179d9bd401b60fddb5192afa5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Changed restartTask to use explicit 'schedule task now' method.


  Commit: 5621a058a64f2e65b1e7922b6241ce599f89bcfa
      https://github.com/Evolveum/midpoint/commit/5621a058a64f2e65b1e7922b6241ce599f89bcfa
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    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

  Log Message:
  -----------
  Fixing DN capitalization issues in conntests


  Commit: a305252fa098ecf13427f86384a8f41c125d2ba3
      https://github.com/Evolveum/midpoint/commit/a305252fa098ecf13427f86384a8f41c125d2ba3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.html
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  Dashboard infoboxes: change cursor to make look it like a link (MID-2868)


  Commit: 433517ed254a5a8dd31fa50cbedc101ef849e497
      https://github.com/Evolveum/midpoint/commit/433517ed254a5a8dd31fa50cbedc101ef849e497
  Author: Roman Pudil <roman.pudil at ami.cz>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    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

  Log Message:
  -----------
  Fixed: Chrome language autodetection (MID-2602)


  Commit: 1de91b92a4c53dcae9ed4aee662e245928e1f213
      https://github.com/Evolveum/midpoint/commit/1de91b92a4c53dcae9ed4aee662e245928e1f213
  Author: Roman Pudil <roman.pudil at ami.cz>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.html
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

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


  Commit: 323266334a796523c2026062b48a51237160f818
      https://github.com/Evolveum/midpoint/commit/323266334a796523c2026062b48a51237160f818
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Better NPE handling


  Commit: 808e8e8862384c289b755bf0f42c20db8830ea3b
      https://github.com/Evolveum/midpoint/commit/808e8e8862384c289b755bf0f42c20db8830ea3b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    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
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Default role for approver


  Commit: a7130c8a14134dec9f5ec542da05a16b541cf3c9
      https://github.com/Evolveum/midpoint/commit/a7130c8a14134dec9f5ec542da05a16b541cf3c9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.java

  Log Message:
  -----------
  Alignuing expand/collapse buttons (MID-2868)


  Commit: efcbf867bdf1f2ce0b3502bb560e108b348f1088
      https://github.com/Evolveum/midpoint/commit/efcbf867bdf1f2ce0b3502bb560e108b348f1088
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    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

  Log Message:
  -----------
  fixing inbound mapping processing. force load full shadow when strong mapping exists..


  Commit: a56725458c64015f1d7d8ec5d68b539d4ba66dba
      https://github.com/Evolveum/midpoint/commit/a56725458c64015f1d7d8ec5d68b539d4ba66dba
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    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/page/admin/home/PageDashboard.html
    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
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


  Commit: 897c391fdbc07b45926f0f26f9ff2784142cb0a9
      https://github.com/Evolveum/midpoint/commit/897c391fdbc07b45926f0f26f9ff2784142cb0a9
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    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

  Log Message:
  -----------
  fixing MID-3041 NPE in Resource content panel (account/entitlement/generic)


  Commit: a77ee7f0d362a650ce0ef03976d00b09b38409d5
      https://github.com/Evolveum/midpoint/commit/a77ee7f0d362a650ce0ef03976d00b09b38409d5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    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/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    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:
  -----------
  Fixed restartTask test method.


  Commit: 5e34336c1f569d8fc278cbda396805426e535d10
      https://github.com/Evolveum/midpoint/commit/5e34336c1f569d8fc278cbda396805426e535d10
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    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/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
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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

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


  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


  Commit: 5e4ec50a99b7c17cb2348364291b5c6182d7ce6e
      https://github.com/Evolveum/midpoint/commit/5e4ec50a99b7c17cb2348364291b5c6182d7ce6e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SynchronizationSituationUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-intest/src/test/resources/logback-test.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java

  Log Message:
  -----------
  fixing MID-3043 .. small refactoring - renamed and moved SynchronizationSituationUtil (schema) to SynchronizationUtil (common)


  Commit: 6a828961bc3628714ab84b6c676cdbce867069b3
      https://github.com/Evolveum/midpoint/commit/6a828961bc3628714ab84b6c676cdbce867069b3
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    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-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.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/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    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


  Commit: a76c12166a4b2577c04a03fb8a9542e7c2f545db
      https://github.com/Evolveum/midpoint/commit/a76c12166a4b2577c04a03fb8a9542e7c2f545db
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    A infra/common/src/main/java/com/evolveum/midpoint/common/SynchronizationUtils.java

  Log Message:
  -----------
  renamed SynchronziationUtil class


  Commit: a647712bf067d70193220fc8d33d059cbaf588ce
      https://github.com/Evolveum/midpoint/commit/a647712bf067d70193220fc8d33d059cbaf588ce
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java

  Log Message:
  -----------
  fixing query construction for org memebers (oneLevel vs. subtree ) MID-3049


  Commit: 2bf6ea027812a9352723ae74b0b3767e9cb69a9a
      https://github.com/Evolveum/midpoint/commit/2bf6ea027812a9352723ae74b0b3767e9cb69a9a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.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/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java

  Log Message:
  -----------
  Fixing target entries in audit log (MID-2451)


  Commit: a52192f882bca4120feb13b1829a8693ef5cda9e
      https://github.com/Evolveum/midpoint/commit/a52192f882bca4120feb13b1829a8693ef5cda9e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeDialogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java

  Log Message:
  -----------
  fixing MID-3047 - Org. tree "plus" button .. implemented for both - org members and role members.. fixing localization for popup


  Commit: 42d479214ae610be73cc778aecad503c7022932e
      https://github.com/Evolveum/midpoint/commit/42d479214ae610be73cc778aecad503c7022932e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.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/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java

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


  Commit: 5dec9dd3e2e46ec24cdde13c204f4ad57210dae5
      https://github.com/Evolveum/midpoint/commit/5dec9dd3e2e46ec24cdde13c204f4ad57210dae5
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties

  Log Message:
  -----------
  2015->2016 in footer


  Commit: 8900eb0a087d1ddc85bc1f0379868f7c5648254d
      https://github.com/Evolveum/midpoint/commit/8900eb0a087d1ddc85bc1f0379868f7c5648254d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

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

  Log Message:
  -----------
  Fixed repo tests.


  Commit: c92e3268590eb4f4ee3a39f4cd4780cd72fb73ba
      https://github.com/Evolveum/midpoint/commit/c92e3268590eb4f4ee3a39f4cd4780cd72fb73ba
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeDialogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    A infra/common/src/main/java/com/evolveum/midpoint/common/SynchronizationUtils.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SynchronizationSituationUtil.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/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/resources/logback-test.xml
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java

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


  Commit: bba078db67f03c0e149ca7d34ac817a2077da344
      https://github.com/Evolveum/midpoint/commit/bba078db67f03c0e149ca7d34ac817a2077da344
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java

  Log Message:
  -----------
  Better handling of empty resource configuration


  Commit: a343d95db5ed444d76f6c4895e807abae24ed5e3
      https://github.com/Evolveum/midpoint/commit/a343d95db5ed444d76f6c4895e807abae24ed5e3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Fixing my incredibly stupid mistake (equals URI vs QName)


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
    M gui/admin-gui/src/main/webapp/js/midpoint-theme.js

  Log Message:
  -----------
  MID-3056 vertical scrollbar stays for now, but now they can be used.


  Commit: dfc4d1eb5c4d1ade5abe5288e7fc146b42198dff
      https://github.com/Evolveum/midpoint/commit/dfc4d1eb5c4d1ade5abe5288e7fc146b42198dff
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java

  Log Message:
  -----------
  fixing intest tests - related to inbound processor..


  Commit: 832d196ffe5d185a98670b0a0b688f5740bf9e15
      https://github.com/Evolveum/midpoint/commit/832d196ffe5d185a98670b0a0b688f5740bf9e15
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

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

  Log Message:
  -----------
  Test fix after audit fixes


  Commit: b7ffb88426881507ca14ca73b5ac8f19173da2c6
      https://github.com/Evolveum/midpoint/commit/b7ffb88426881507ca14ca73b5ac8f19173da2c6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java

  Log Message:
  -----------
  fixing MID-2637


  Commit: 3079321f2c21872c2e542c51a39d47c9c0b0db52
      https://github.com/Evolveum/midpoint/commit/3079321f2c21872c2e542c51a39d47c9c0b0db52
  Author: Martin Lízner <martin.lizner at gmail.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Travis - use maven 3.3.9


  Commit: 29a7f3a9dc28ee5942642b2f1f059ea67e7b3fc7
      https://github.com/Evolveum/midpoint/commit/29a7f3a9dc28ee5942642b2f1f059ea67e7b3fc7
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfProfile.java

  Log Message:
  -----------
  MID-3030 breadcrumb fix on admin object detail pages.


  Commit: 4c79aef13c2cbea15acebd9ca460c74fe14abc30
      https://github.com/Evolveum/midpoint/commit/4c79aef13c2cbea15acebd9ca460c74fe14abc30
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    A model/model-intest/src/test/resources/sync/password-policy-azure.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-azure.xml

  Log Message:
  -----------
  resolve valuePolicyRef specific for generate exrepssion.. extented test - check if password policy was applied successfully


  Commit: c50d6bb7a4ed6e3d330eb31f9108cbc1439ad45f
      https://github.com/Evolveum/midpoint/commit/c50d6bb7a4ed6e3d330eb31f9108cbc1439ad45f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M .travis.yml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfProfile.java

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


  Commit: 03c828d167e4078d89fb2ab598fda37da411ecf9
      https://github.com/Evolveum/midpoint/commit/03c828d167e4078d89fb2ab598fda37da411ecf9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  MID-3058 fixed self dashboard


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

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    A model/model-intest/src/test/resources/sync/password-policy-azure.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-azure.xml

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


  Commit: ca7acd939226315054c74baacd12ac1656f236da
      https://github.com/Evolveum/midpoint/commit/ca7acd939226315054c74baacd12ac1656f236da
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M model/model-intest/src/test/resources/sync/resource-dummy-azure-deprecated.xml

  Log Message:
  -----------
  fixing tests


  Commit: e932e6040b23069fc4ad40a7cd4a116e65f657d9
      https://github.com/Evolveum/midpoint/commit/e932e6040b23069fc4ad40a7cd4a116e65f657d9
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

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


  Commit: 25f9672f59f969a5ddae4ff971d339c360d51a61
      https://github.com/Evolveum/midpoint/commit/25f9672f59f969a5ddae4ff971d339c360d51a61
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml

  Log Message:
  -----------
  Fixing issues with AJAX components on login page (MID-3039)


  Commit: 73c5e756cc631b707f55b1ab332c5745cfb98a13
      https://github.com/Evolveum/midpoint/commit/73c5e756cc631b707f55b1ab332c5745cfb98a13
  Author: petr.gasparik <petr.gasparik at ami.cz>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties

  Log Message:
  -----------
  new translations, thanks transifex users to AivoK, securny, petr.gasparik


  Commit: a707d5c8b3543ec7fde949369486c587fc518322
      https://github.com/Evolveum/midpoint/commit/a707d5c8b3543ec7fde949369486c587fc518322
  Author: petr.gasparik <petr.gasparik at ami.cz>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties

  Log Message:
  -----------
  Merge branch 'transifex'

# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties


Compare: https://github.com/Evolveum/midpoint/compare/51f8f4e03508...a707d5c8b354


More information about the midPoint-svn mailing list