[midPoint-git] [Evolveum/midpoint] 2aefbe: addidng missing localization keys..

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 2aefbe732c7ea5b48e7cff9c1c74040432de9728
      https://github.com/Evolveum/midpoint/commit/2aefbe732c7ea5b48e7cff9c1c74040432de9728
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

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

  Log Message:
  -----------
  addidng missing localization keys..


  Commit: ff78a98e6ff710d2138e3a7959fa64e261c218be
      https://github.com/Evolveum/midpoint/commit/ff78a98e6ff710d2138e3a7959fa64e261c218be
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    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/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItem.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
    M samples/resources/oracle/resource-oracle-medium.xml

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

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


  Commit: b84b0b6cb0d95845652269469f75c67cf89946c7
      https://github.com/Evolveum/midpoint/commit/b84b0b6cb0d95845652269469f75c67cf89946c7
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java

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


  Commit: eac6f15f0e9f2259a04944f5da335690479f70a9
      https://github.com/Evolveum/midpoint/commit/eac6f15f0e9f2259a04944f5da335690479f70a9
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    A infra/test-util/src/main/java/com/evolveum/midpoint/test/util/Lsof.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M samples/stories/multitenant-idm-saas/objectTemplates/object-template-org.xml
    M samples/stories/multitenant-idm-saas/objectTemplates/object-template-user.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.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

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


  Commit: ea8765b421521d6390d960c6c5811eac72f7f63e
      https://github.com/Evolveum/midpoint/commit/ea8765b421521d6390d960c6c5811eac72f7f63e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  fixing MID-3094 - Creating child organization with Keep displaying results shows "Illegal shadow state 'MODIFY'"


  Commit: f01ef3a0b30707ac11e938dfb0345772feed949b
      https://github.com/Evolveum/midpoint/commit/f01ef3a0b30707ac11e938dfb0345772feed949b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ConnectorOperationalStatus.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/Lsof.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConfigurationTransformer.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfDummy.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java

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


Compare: https://github.com/Evolveum/midpoint/compare/a419eb1014ca...f01ef3a0b307