[midPoint-git] [Evolveum/midpoint] 6e656f: MID-4061: localization keys for new metadata items

Petr Gašparík petr at gasparik.cz
Thu Nov 30 09:09:07 CET 2017 

  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6e656f78f3238e819ea3247b5cc6a07628da17ad
      https://github.com/Evolveum/midpoint/commit/6e656f78f3238e819ea3247b5cc6a07628da17ad
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  MID-4061: localization keys for new metadata items


  Commit: 22162d814f425bcd0af1a45a2205a57cdea12662
      https://github.com/Evolveum/midpoint/commit/22162d814f425bcd0af1a45a2205a57cdea12662
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties

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


  Commit: cc9db7d9e0eeaeb3d58e0ce7c3f13147074470a1
      https://github.com/Evolveum/midpoint/commit/cc9db7d9e0eeaeb3d58e0ce7c3f13147074470a1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    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/AssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java

  Log Message:
  -----------
  Moving transitive delegation seting to a correct place (MID-4176)


  Commit: 23d6f51f69efc32ef9cdaf76358975e04a946185
      https://github.com/Evolveum/midpoint/commit/23d6f51f69efc32ef9cdaf76358975e04a946185
  Author: kate <honchar at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  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/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

  Log Message:
  -----------
  filter deputy assignments on the assignments tab


  Commit: c20f30607dece1d52592f2341a0b936a91697d13
      https://github.com/Evolveum/midpoint/commit/c20f30607dece1d52592f2341a0b936a91697d13
  Author: kate <honchar at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  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/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.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.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/ModelContextUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.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/lens/LensContext.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/OperationalDataManager.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.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/TestDeputy.java
    M 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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
    M model/model-intest/src/test/resources/common/role-drinker.xml
    A model/model-intest/src/test/resources/negative/resource-dummy-broken-violet.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestMiscellaneous.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

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


  Commit: 6024104eb7505955c42fb2dcb15d89097d03858c
      https://github.com/Evolveum/midpoint/commit/6024104eb7505955c42fb2dcb15d89097d03858c
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAutoInbound.java
    M model/model-intest/src/test/resources/common/role-autocratic.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml

  Log Message:
  -----------
  fixing inbound processor delta computation


  Commit: 3340a5050def755f2161718461c6f1fbc10ed991
      https://github.com/Evolveum/midpoint/commit/3340a5050def755f2161718461c6f1fbc10ed991
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  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/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.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/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.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.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/ModelContextUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.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/lens/LensContext.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/OperationalDataManager.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.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/TestDeputy.java
    M 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/TestIteration.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/negative/TestBrokenResources.java
    M model/model-intest/src/test/resources/common/role-drinker.xml
    A model/model-intest/src/test/resources/negative/resource-dummy-broken-violet.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestMiscellaneous.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M tools/ninja/pom.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/TestResourceRestAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/NinjaContext.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/RestService.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    M tools/ninja/src/test/java/com/evolveum/midpoint/ninja/NinjaContextTest.java

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


  Commit: 91a0e310d529594001caf6ed88f625bbdd6dd2f5
      https://github.com/Evolveum/midpoint/commit/91a0e310d529594001caf6ed88f625bbdd6dd2f5
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.html

  Log Message:
  -----------
  html styles fix


  Commit: c6640fa318dc3c7eab2ddf457b24936c50c411b3
      https://github.com/Evolveum/midpoint/commit/c6640fa318dc3c7eab2ddf457b24936c50c411b3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAttorney.java

  Log Message:
  -----------
  MID-4072 url handling fix (got rid of 403)


  Commit: d43e78e42985f8b57efe496170737458d5a91caa
      https://github.com/Evolveum/midpoint/commit/d43e78e42985f8b57efe496170737458d5a91caa
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  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/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    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/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAutoInbound.java
    M model/model-intest/src/test/resources/common/role-autocratic.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml

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


  Commit: f35738abaa0a40c9ed8c6803a8de99c15f8e2acf
      https://github.com/Evolveum/midpoint/commit/f35738abaa0a40c9ed8c6803a8de99c15f8e2acf
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

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

  Log Message:
  -----------
  fixed import (maven build)


  Commit: 7045d370d2da63a7fd746223984df5517d5009f8
      https://github.com/Evolveum/midpoint/commit/7045d370d2da63a7fd746223984df5517d5009f8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M samples/evolveum/roles.xml

  Log Message:
  -----------
  More evolveum samples


  Commit: 719fa3de3f3c79d6516f87f0407edda97e0fe3f4
      https://github.com/Evolveum/midpoint/commit/719fa3de3f3c79d6516f87f0407edda97e0fe3f4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less

  Log Message:
  -----------
  Sidebar menu top-level item styles and behavior fixes


  Commit: 68704d1bd6940d84262d9aa8eb016874c7981829
      https://github.com/Evolveum/midpoint/commit/68704d1bd6940d84262d9aa8eb016874c7981829
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/resources/diff/role-1.xml
    A infra/schema/src/test/resources/diff/role-2.xml

  Log Message:
  -----------
  MID-4291 added test to TestDiffEquals, now disabled


  Commit: b3b77907a71472ecf08389b2f8196e621f442d69
      https://github.com/Evolveum/midpoint/commit/b3b77907a71472ecf08389b2f8196e621f442d69
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M samples/evolveum/roles.xml

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


  Commit: 6c11da86491b7450bd622765e4c0d68d5ac5413e
      https://github.com/Evolveum/midpoint/commit/6c11da86491b7450bd622765e4c0d68d5ac5413e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/resources/schema/piracy.xsd

  Log Message:
  -----------
  Enabling previously disabled test


  Commit: da7fe412d797f61aca5fe8476c43bca08fcd28b6
      https://github.com/Evolveum/midpoint/commit/da7fe412d797f61aca5fe8476c43bca08fcd28b6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  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/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.ast
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.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/admin/users/PageUserHistory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AllAssignmentsPreviewDialog.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentInfoDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsPreviewDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/DelegationTargetLimitationDialog.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignmentTarget.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java

  Log Message:
  -----------
  MID-3845: added relation to "show all assignments"

+ added deputy relations there
+ refactored assignments info dialog


  Commit: b320c560a7beb1031abe3e16ec631bfb0e8a93f2
      https://github.com/Evolveum/midpoint/commit/b320c560a7beb1031abe3e16ec631bfb0e8a93f2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  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/assignment/AbstractRoleAssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.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/workflow/PageWorkItemsAttorney.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/resources/diff/role-1.xml
    A infra/schema/src/test/resources/diff/role-2.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAutoInbound.java
    M model/model-intest/src/test/resources/common/role-autocratic.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml
    M model/model-intest/src/test/resources/schema/piracy.xsd
    M samples/evolveum/roles.xml

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

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java


  Commit: 59b3a8c3e22626122c071fd3b19776b0487f94c8
      https://github.com/Evolveum/midpoint/commit/59b3a8c3e22626122c071fd3b19776b0487f94c8
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    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/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java

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


  Commit: 9ee4a6fa9ead1910feca0b0a9b71b43f1a0b0b0a
      https://github.com/Evolveum/midpoint/commit/9ee4a6fa9ead1910feca0b0a9b71b43f1a0b0b0a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/resources/diff/role-1.xml
    A infra/schema/src/test/resources/diff/role-2.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/resources/schema/piracy.xsd
    M samples/evolveum/roles.xml

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


  Commit: 3a6bfad5ee52c896be7690c2b8681141ba63e16a
      https://github.com/Evolveum/midpoint/commit/3a6bfad5ee52c896be7690c2b8681141ba63e16a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseMisc.java
    A infra/schema/src/test/resources/misc/role-filters.xml
    M infra/schema/testng-unit.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    A model/model-intest/src/test/resources/misc/role-import-filters.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Tests for inducements+filters (MID-3879)


  Commit: 404f99281b9b7f74462a2d39590cffaacd0ab5f8
      https://github.com/Evolveum/midpoint/commit/404f99281b9b7f74462a2d39590cffaacd0ab5f8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    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/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java

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


  Commit: c49205d99a4cea6b3fd815b8f8570c1324ed194d
      https://github.com/Evolveum/midpoint/commit/c49205d99a4cea6b3fd815b8f8570c1324ed194d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java

  Log Message:
  -----------
  MID-3879/MID-4291: comparing reference values with filters


  Commit: 1d22f92caf6954606367df9383726d57e8a14bb9
      https://github.com/Evolveum/midpoint/commit/1d22f92caf6954606367df9383726d57e8a14bb9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    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/web/component/assignment/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.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/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java

  Log Message:
  -----------
  MID-4157 MID-4158 focus editors fixed, when accessed through org. unit tree page


  Commit: 75f588ddf28d98713b0792ded933963d0184271a
      https://github.com/Evolveum/midpoint/commit/75f588ddf28d98713b0792ded933963d0184271a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M infra/schema/testng-unit.xml

  Log Message:
  -----------
  Fixing test package


  Commit: 0c8692e641fc317ccc1e2f3a12656d14d574e09c
      https://github.com/Evolveum/midpoint/commit/0c8692e641fc317ccc1e2f3a12656d14d574e09c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeDialogPanel.html
    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/component/input/QNameChoiceRenderer.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java

  Log Message:
  -----------
  choose focus type dialog localization


  Commit: d5a7b06a22d1da42d0dc8cb8f27bd534884936f1
      https://github.com/Evolveum/midpoint/commit/d5a7b06a22d1da42d0dc8cb8f27bd534884936f1
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    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/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseMisc.java
    A infra/schema/src/test/resources/misc/role-filters.xml
    M infra/schema/testng-unit.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    A model/model-intest/src/test/resources/misc/role-import-filters.xml
    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: 503e64169ce6ad06b8c62492445c9dbb1b4be7b2
      https://github.com/Evolveum/midpoint/commit/503e64169ce6ad06b8c62492445c9dbb1b4be7b2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

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

  Log Message:
  -----------
  Better loging failure logging (MID-4131)


  Commit: 6bd06bd62d3dd4c2d119dd3a826b9b6b070ed9d6
      https://github.com/Evolveum/midpoint/commit/6bd06bd62d3dd4c2d119dd3a826b9b6b070ed9d6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    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/assignment/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeDialogPanel.html
    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/component/input/QNameChoiceRenderer.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.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/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseMisc.java
    A infra/schema/src/test/resources/misc/role-filters.xml
    M infra/schema/testng-unit.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    A model/model-intest/src/test/resources/misc/role-import-filters.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java


  Commit: a6843bc949927e3fcadba832faa312f92380b387
      https://github.com/Evolveum/midpoint/commit/a6843bc949927e3fcadba832faa312f92380b387
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_fi.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M infra/schema/src/main/resources/localization/schema_zh_CN.properties

  Log Message:
  -----------
  Translation, WIP


Compare: https://github.com/Evolveum/midpoint/compare/36aa4297ab10...a6843bc94992

More information about the midPoint-svn mailing list