[midPoint-git] [Evolveum/midpoint] 321e98: more work with associations panel

Petr Gašparík petr at gasparik.cz
Tue Nov 28 21:21:05 CET 2017 

  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 321e98788dba1c46c8114c54bfb22a5d064caa78
      https://github.com/Evolveum/midpoint/commit/321e98788dba1c46c8114c54bfb22a5d064caa78
  Author: kate <honchar at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
    A 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/assignment/InducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  more work with associations panel


  Commit: e61ce8816e2f7f603d7018a38b71b89741e4b29b
      https://github.com/Evolveum/midpoint/commit/e61ce8816e2f7f603d7018a38b71b89741e4b29b
  Author: kate <honchar at evolveum.com>
  Date:   2017-11-27 (Mon, 27 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_pl.properties

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


  Commit: a320c833859ff6be72ddafdffdd665ba8d53c7d2
      https://github.com/Evolveum/midpoint/commit/a320c833859ff6be72ddafdffdd665ba8d53c7d2
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M testing/sanity/src/test/resources/repo/resource-opendj.xml

  Log Message:
  -----------
  fixing sanity test


  Commit: aceaf0704e228e6d42eb7ca12a2a7e6deed5eedd
      https://github.com/Evolveum/midpoint/commit/aceaf0704e228e6d42eb7ca12a2a7e6deed5eedd
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.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/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
    A 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/assignment/InducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.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/PageAdminAbstractRole.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/PageMergeObjects.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/util/ExpressionUtil.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/schema/src/main/resources/localization/schema_pl.properties

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


  Commit: 5d0d8b0845efca7d1247454087c97379309d6c44
      https://github.com/Evolveum/midpoint/commit/5d0d8b0845efca7d1247454087c97379309d6c44
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError401.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError403.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError404.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError410.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java

  Log Message:
  -----------
  fixed permitAll for some urls


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

  Changed paths:
    M testing/sanity/src/test/resources/repo/resource-opendj.xml

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


  Commit: 75d62d04eb7f7ca7491443c7385707c8d509241a
      https://github.com/Evolveum/midpoint/commit/75d62d04eb7f7ca7491443c7385707c8d509241a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-27 (Mon, 27 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/logback-test.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml

  Log Message:
  -----------
  fix for resolving entitlement variable in association inbound mapping


  Commit: 3f592c1b38e606d43923fdf37797f840bb3a0625
      https://github.com/Evolveum/midpoint/commit/3f592c1b38e606d43923fdf37797f840bb3a0625
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError401.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError403.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError404.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError410.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java

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


  Commit: 22aa4a5d718ccb46403f3cbc38561a428b47c332
      https://github.com/Evolveum/midpoint/commit/22aa4a5d718ccb46403f3cbc38561a428b47c332
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

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

  Log Message:
  -----------
  MID-4228 fixed search on org tree page


  Commit: 9aa55e8ecb1d32634145909082bdc6adf486b0f9
      https://github.com/Evolveum/midpoint/commit/9aa55e8ecb1d32634145909082bdc6adf486b0f9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-27 (Mon, 27 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/logback-test.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml

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


  Commit: d3ec654136e25ca447aefecde58ae2a70faff228
      https://github.com/Evolveum/midpoint/commit/d3ec654136e25ca447aefecde58ae2a70faff228
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.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/ContainerWrapper.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/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.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/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java

  Log Message:
  -----------
  fizing #1 Profile - basic tab is empty, no attributes (MID-4185)


  Commit: 981ab180d9423e1cae3b1807c2be2644c17906cf
      https://github.com/Evolveum/midpoint/commit/981ab180d9423e1cae3b1807c2be2644c17906cf
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

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

  Log Message:
  -----------
  fixing association visibility


  Commit: 25524283a056b74d0074d2ab714bf35da740f879
      https://github.com/Evolveum/midpoint/commit/25524283a056b74d0074d2ab714bf35da740f879
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

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

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


  Commit: 7c98ae4abb0affbd73f4f78131f8d2132ef03c01
      https://github.com/Evolveum/midpoint/commit/7c98ae4abb0affbd73f4f78131f8d2132ef03c01
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-27 (Mon, 27 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/web/page/admin/users/PageUser.java

  Log Message:
  -----------
  disablng unfinished GDPR features (MID-4281)


  Commit: caeec7ccef659d3bc911aaa3998b23f51ce2a837
      https://github.com/Evolveum/midpoint/commit/caeec7ccef659d3bc911aaa3998b23f51ce2a837
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPage.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPage.java

  Log Message:
  -----------
  removing old unused files (thanks to MID-4221)


  Commit: 5efc72992122f3b17b0ef659c88d1a8ddd13bfe9
      https://github.com/Evolveum/midpoint/commit/5efc72992122f3b17b0ef659c88d1a8ddd13bfe9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M tools/ninja/pom.xml
    R tools/ninja/src/assembly/assembly.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRestAction.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ImportRestAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/BaseImportExportOptions.java

  Log Message:
  -----------
  some ninja bugfixing and cleanup, not finished yet


  Commit: b3b2830e97a5ea24eb51bc7ecbcd0aa5c7c47bd4
      https://github.com/Evolveum/midpoint/commit/b3b2830e97a5ea24eb51bc7ecbcd0aa5c7c47bd4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-27 (Mon, 27 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/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.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/ContainerWrapper.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/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.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/component/wizard/resource/ConfigurationStep.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPage.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

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


  Commit: 82df41dadadc6443bdddc0028869aece723efd6b
      https://github.com/Evolveum/midpoint/commit/82df41dadadc6443bdddc0028869aece723efd6b
  Author: kate <honchar at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    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/resources/localization/Midpoint.properties

  Log Message:
  -----------
  add new association button


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

  Changed paths:
    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:
  -----------
  preparing rest impl for import/export


  Commit: 10560276c9858ba70c6fd54430b445f7fa8bf717
      https://github.com/Evolveum/midpoint/commit/10560276c9858ba70c6fd54430b445f7fa8bf717
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

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

  Log Message:
  -----------
  Cosmetic code fixes.


  Commit: 5f2025499042beabcaeea71bc723a2f85d5232ba
      https://github.com/Evolveum/midpoint/commit/5f2025499042beabcaeea71bc723a2f85d5232ba
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

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

  Log Message:
  -----------
  Cleaning up iteration test


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.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/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.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/ContainerWrapper.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/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.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/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPage.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.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/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError401.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError403.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError404.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError410.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    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/logback-test.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml
    M testing/sanity/src/test/resources/repo/resource-opendj.xml
    M tools/ninja/pom.xml
    R tools/ninja/src/assembly/assembly.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRestAction.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ImportRestAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/BaseImportExportOptions.java

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

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


  Commit: 17028e8cd86e37cafce8c9d3c3a77d480e76641e
      https://github.com/Evolveum/midpoint/commit/17028e8cd86e37cafce8c9d3c3a77d480e76641e
  Author: kate <honchar at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.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: e20ec81a89198a7984cb60bbc2e1aba8b692be90
      https://github.com/Evolveum/midpoint/commit/e20ec81a89198a7984cb60bbc2e1aba8b692be90
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
    A model/model-intest/src/test/resources/negative/resource-dummy-broken-violet.xml

  Log Message:
  -----------
  Test for groovy syntax error in expression (MID-4255)


  Commit: 038bc09ed46767bc590d10d308086ea655ca000e
      https://github.com/Evolveum/midpoint/commit/038bc09ed46767bc590d10d308086ea655ca000e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    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/resources/localization/Midpoint.properties

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


  Commit: 5c87e4b0f23d2ef5eb47405510048c6af1e72c86
      https://github.com/Evolveum/midpoint/commit/5c87e4b0f23d2ef5eb47405510048c6af1e72c86
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java

  Log Message:
  -----------
  crypto self test NPE fix


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java

  Log Message:
  -----------
  breadcrumbs fix for new org unit page


  Commit: 07f4f5401b4adb46e12a2c07b171d87a1a6ce632
      https://github.com/Evolveum/midpoint/commit/07f4f5401b4adb46e12a2c07b171d87a1a6ce632
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    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/resources/localization/Midpoint.properties
    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/negative/TestBrokenResources.java
    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

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


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

  Changed paths:
    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-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/resources/common/role-drinker.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  allowTransitive option for assignment limitations (MID-4176)


  Commit: 2f6e7786e0c140fdc5250899d0422c0a6daa7f93
      https://github.com/Evolveum/midpoint/commit/2f6e7786e0c140fdc5250899d0422c0a6daa7f93
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    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/ModelContextUtil.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-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-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

  Log Message:
  -----------
  MID-4061: added missing pieces

Added requestorMetadata.
Renamed autoCreateIdentifier to originMappingName.
Fixed requestor-related metadata handling when approvals are present.
Minor code cleanup.


  Commit: 71de541800402194e7b0c4b8432de8edf38e7f12
      https://github.com/Evolveum/midpoint/commit/71de541800402194e7b0c4b8432de8edf38e7f12
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.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/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    A 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/assignment/InducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.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/ContainerWrapper.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/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.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/component/prism/PropertyOrReferenceWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.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/page/admin/PageAdminAbstractRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPage.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPage.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/server/handlers/dto/GenericHandlerDto.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/PageMergeObjects.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/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError401.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError403.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError404.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError410.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.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_pl.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-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/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAutoInbound.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
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.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 testing/sanity/src/test/resources/repo/resource-opendj.xml
    M tools/ninja/pom.xml
    R tools/ninja/src/assembly/assembly.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRestAction.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ImportRestAction.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/opts/BaseImportExportOptions.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 remote-tracking branch 'origin/master'


  Commit: 5e009c408009f8e94aa8fbdbc912ac5cf32fc4d5
      https://github.com/Evolveum/midpoint/commit/5e009c408009f8e94aa8fbdbc912ac5cf32fc4d5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java

  Log Message:
  -----------
  Adapted schema tests.


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

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.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:
  -----------
  Fixed "Progress: NNN out of 0" message for reconciliation tasks.


  Commit: 185639016723c02583c1af3e5c2355ffb4d580b8
      https://github.com/Evolveum/midpoint/commit/185639016723c02583c1af3e5c2355ffb4d580b8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

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

  Log Message:
  -----------
  GUI support for allowTransitive in deputy (MID-4176)


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

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

  Log Message:
  -----------
  Fixed TestAssignmentProcessor2.


  Commit: 9999dc500a1c8fa1c2bece9fc1cd4b56f138f246
      https://github.com/Evolveum/midpoint/commit/9999dc500a1c8fa1c2bece9fc1cd4b56f138f246
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

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

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


  Commit: 36aa4297ab10a8bc96be58bd258f0cbd0c39f2b2
      https://github.com/Evolveum/midpoint/commit/36aa4297ab10a8bc96be58bd258f0cbd0c39f2b2
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-11-28 (Tue, 28 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:
  -----------
  Translation, WIP


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

More information about the midPoint-svn mailing list