[midPoint-git] [Evolveum/midpoint] 289b52: possible fix for mariadb org closure problems

[Petr Gašparík]

  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 289b522e02efc0f4d038e477a3b19b6ca88dc7d8
      https://github.com/Evolveum/midpoint/commit/289b522e02efc0f4d038e477a3b19b6ca88dc7d8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

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

  Log Message:
  -----------
  possible fix for mariadb org closure problems


  Commit: 4bfb231750266b34cc539ef2ac57aedd53f5cbd6
      https://github.com/Evolveum/midpoint/commit/4bfb231750266b34cc539ef2ac57aedd53f5cbd6
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

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

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


  Commit: b20dbb9a126b20c0c3f3d68848c1847225386cee
      https://github.com/Evolveum/midpoint/commit/b20dbb9a126b20c0c3f3d68848c1847225386cee
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

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

  Log Message:
  -----------
  Fixed a typo


  Commit: e5debb88b6f662f75393dd565eba29f067761c7d
      https://github.com/Evolveum/midpoint/commit/e5debb88b6f662f75393dd565eba29f067761c7d
  Author: Petr Gašparík <petr.gasparik at ami.cz>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

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

  Log Message:
  -----------
  typo


  Commit: c6951cd25570ae8a18b131031b55c5e2c298caa7
      https://github.com/Evolveum/midpoint/commit/c6951cd25570ae8a18b131031b55c5e2c298caa7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

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

  Log Message:
  -----------
  OperationResultStatus and OperationResultMessage headers (experimental).


  Commit: 0b1a6a271e39c0aebdf572177ab29386b87fab43
      https://github.com/Evolveum/midpoint/commit/0b1a6a271e39c0aebdf572177ab29386b87fab43
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

  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
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.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/locale.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_tr.properties

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


  Commit: ba57d507cf01d549f113795f79bd68182efc767c
      https://github.com/Evolveum/midpoint/commit/ba57d507cf01d549f113795f79bd68182efc767c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultStatus.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java

  Log Message:
  -----------
  Fixed OperationResultStatus header value.


  Commit: 1e76c935e23affb69818f3ccf95e0e5072d01c8d
      https://github.com/Evolveum/midpoint/commit/1e76c935e23affb69818f3ccf95e0e5072d01c8d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

  Changed paths:
    A config/sql/midpoint/3.6/h2/h2-3.6.sql
    A config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    A config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    A config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    A config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    A config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java

  Log Message:
  -----------
  Support for FormType object type (incl. migration scripts).


  Commit: 0efb4ca08393baa1dc87fc964b80007871d8ecfd
      https://github.com/Evolveum/midpoint/commit/0efb4ca08393baa1dc87fc964b80007871d8ecfd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.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/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java

  Log Message:
  -----------
  Fail if filters in references cannot be resolved.


  Commit: f3f68a28c287b133445c3570b2b57f9a7e6515c0
      https://github.com/Evolveum/midpoint/commit/f3f68a28c287b133445c3570b2b57f9a7e6515c0
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

  Changed paths:
    A config/sql/midpoint/3.6/h2/h2-3.6.sql
    A config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    A config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    A config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    A config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    A config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.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_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.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/locale.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultStatus.java
    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_tr.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.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/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java

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


  Commit: ed1d219b2a4bd7cc9f147702e7329496b6db574d
      https://github.com/Evolveum/midpoint/commit/ed1d219b2a4bd7cc9f147702e7329496b6db574d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    A model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml

  Log Message:
  -----------
  Tests for read-modify mapping (MID-3661)


  Commit: a6c151871bdd63a537651644a9df92464a49b1f9
      https://github.com/Evolveum/midpoint/commit/a6c151871bdd63a537651644a9df92464a49b1f9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/DefaultMatchingRule.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
    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/TestPreviewChanges.java
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java

  Log Message:
  -----------
  General intest improvement (resource red)


  Commit: 462fb20b7e808559a0cc112325cb408e81d59aa4
      https://github.com/Evolveum/midpoint/commit/462fb20b7e808559a0cc112325cb408e81d59aa4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  More experiments with mapping tests


  Commit: d91d1be40151d2d0f2c053fbc96170ebc0cbbc5e
      https://github.com/Evolveum/midpoint/commit/d91d1be40151d2d0f2c053fbc96170ebc0cbbc5e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluator.java
    M testing/story/pom.xml
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/resources/machineintelligence/resource-csv-HR.xml
    A testing/story/src/test/resources/machineintelligence/shadow-chappie.xml
    A testing/story/src/test/resources/machineintelligence/shadow-rur.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  populate attributes (e.g. activation, parameters,...) for assignment in assignemntTargetSearch.. tests..


  Commit: e92437038e48387adb5f7afc5a12d880b94c5f03
      https://github.com/Evolveum/midpoint/commit/e92437038e48387adb5f7afc5a12d880b94c5f03
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java

  Log Message:
  -----------
  additional test for query convertor..


  Commit: 14f2bfdb8db81d032cd29487c502688a633bda33
      https://github.com/Evolveum/midpoint/commit/14f2bfdb8db81d032cd29487c502688a633bda33
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    A config/sql/midpoint/3.6/h2/h2-3.6.sql
    A config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    A config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    A config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    A config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    A config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.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_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.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/locale.properties
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/DefaultMatchingRule.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultStatus.java
    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_tr.properties
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.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/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.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/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/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java

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


  Commit: 6585702450b4c58b38bd6782b0baf8e332945542
      https://github.com/Evolveum/midpoint/commit/6585702450b4c58b38bd6782b0baf8e332945542
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 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/util/Utils.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ReferenceResolver.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RelationResolver.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ResourceAssignmentHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/RoleAssignmentHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/test/resources/legacy/role12.xml
    M model/workflow-impl/src/test/resources/legacy/role13.xml
    M model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    M model/workflow-impl/src/test/resources/policy/metarole-security.xml
    M model/workflow-impl/src/test/resources/policy/user-security-approver.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java

  Log Message:
  -----------
  Dynamically-resolvable approvers (except for abstractRole.approverRef item). Configurable outcome if no approvers.


  Commit: 934042a9a4652be786020c300a9b55e16d150f89
      https://github.com/Evolveum/midpoint/commit/934042a9a4652be786020c300a9b55e16d150f89
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.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/DefaultMatchingRule.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.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
    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/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
    M testing/story/pom.xml
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/resources/machineintelligence/resource-csv-HR.xml
    A testing/story/src/test/resources/machineintelligence/shadow-chappie.xml
    A testing/story/src/test/resources/machineintelligence/shadow-rur.xml
    M testing/story/testng-integration.xml

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


  Commit: d469cd04977d1a0507a71f30f0caf707bc3d01ee
      https://github.com/Evolveum/midpoint/commit/d469cd04977d1a0507a71f30f0caf707bc3d01ee
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java

  Log Message:
  -----------
  Fixed 500 error when displaying claimable items for a user that has no groups.


  Commit: 9c72d6ace7a2b420e891782e5809a93b5ebfa45b
      https://github.com/Evolveum/midpoint/commit/9c72d6ace7a2b420e891782e5809a93b5ebfa45b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java

  Log Message:
  -----------
  Showing automatically approved/rejected approval levels (via GUI)


  Commit: 1645181696353a1b83023848e408c6933a8dcc47
      https://github.com/Evolveum/midpoint/commit/1645181696353a1b83023848e408c6933a8dcc47
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    A testing/story/src/test/resources/strings/orgs/0-org-monkey-island-modified.xml
    A testing/story/src/test/resources/strings/orgs/1-teams.xml
    A testing/story/src/test/resources/strings/orgs/security-approvers.xml
    A testing/story/src/test/resources/strings/orgs/sod-approvers.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    A testing/story/src/test/resources/strings/roles/test-1.xml
    A testing/story/src/test/resources/strings/users/barkeeper.xml
    A testing/story/src/test/resources/strings/users/bob.xml
    A testing/story/src/test/resources/strings/users/carla.xml
    A testing/story/src/test/resources/strings/users/cheese.xml
    A testing/story/src/test/resources/strings/users/chef.xml
    A testing/story/src/test/resources/strings/users/elaine.xml
    A testing/story/src/test/resources/strings/users/guybrush.xml
    A testing/story/src/test/resources/strings/users/lechuck.xml

  Log Message:
  -----------
  First version of "strings" story resources.


  Commit: e2363bde8fdef2bdccf064b144f427148bd42a24
      https://github.com/Evolveum/midpoint/commit/e2363bde8fdef2bdccf064b144f427148bd42a24
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql

  Log Message:
  -----------
  updated cleanup scripts for bamboo


  Commit: b3367af97e890b1161e0c27071a95caef93a52d1
      https://github.com/Evolveum/midpoint/commit/b3367af97e890b1161e0c27071a95caef93a52d1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    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/DummyResource.java

  Log Message:
  -----------
  Fixed break mode in dummy resource


  Commit: d8b8ca02d67f92ee966434c768058c60eff5fe16
      https://github.com/Evolveum/midpoint/commit/d8b8ca02d67f92ee966434c768058c60eff5fe16
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Absolutistic mapping tests (MID-3661)


  Commit: f55b513784b9596a49dfcae6babbb904a4ac8259
      https://github.com/Evolveum/midpoint/commit/f55b513784b9596a49dfcae6babbb904a4ac8259
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql

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


  Commit: ef92012be36b7e75d69fc4588fe2656659d5a730
      https://github.com/Evolveum/midpoint/commit/ef92012be36b7e75d69fc4588fe2656659d5a730
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml

  Log Message:
  -----------
  Fixed oid in approval samples.


  Commit: 6d7649050de53a0b731d38e4ace4d0ba37a185e8
      https://github.com/Evolveum/midpoint/commit/6d7649050de53a0b731d38e4ace4d0ba37a185e8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    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/DummyResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql

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


  Commit: e8d585c3bef0f903410c4c0d6994b5f147f2344f
      https://github.com/Evolveum/midpoint/commit/e8d585c3bef0f903410c4c0d6994b5f147f2344f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M testing/story/src/test/resources/strings/roles/metarole-approval-security.xml

  Log Message:
  -----------
  Group expansion strategy (onWorkItemCreation / byClaimingWorkItem).


  Commit: 45617d4e3dc67e63abcfa0cf3040ff6fc647a447
      https://github.com/Evolveum/midpoint/commit/45617d4e3dc67e63abcfa0cf3040ff6fc647a447
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

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

  Log Message:
  -----------
  Fixed NPE in getManagers method


  Commit: 41f08936a9009749f12400d199f64c3c67089e16
      https://github.com/Evolveum/midpoint/commit/41f08936a9009749f12400d199f64c3c67089e16
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugDumpable.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/LightweightObjectRef.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/LightweightObjectRefImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyAssignment/AssignmentModification.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SerializationSafeContainer.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SingleItemSerializationSafeContainerImpl.java

  Log Message:
  -----------
  Some debug-level (administrator understandable) logging for approvals.


  Commit: cdb925c97313b0d6acf0e64633193e9949f585c6
      https://github.com/Evolveum/midpoint/commit/cdb925c97313b0d6acf0e64633193e9949f585c6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml

  Log Message:
  -----------
  Tweaking the approval samples.


  Commit: 1f8a16d13d637496315d1efb2b31023f468229a1
      https://github.com/Evolveum/midpoint/commit/1f8a16d13d637496315d1efb2b31023f468229a1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-14 (Sat, 14 Jan 2017)

  Changed paths:
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentApprovalMetaroleExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/plain/TestAssignmentApprovalPlainExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/plain/TestAssignmentApprovalPlainImplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestAssignmentApprovalGlobal.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestLifecycleGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/AbstractTestLifecycle.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/plain/TestLifecyclePlain.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentApprovalMetaroleExplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/package-info.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainExplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainImplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestLifecyclePlain.java
    A model/workflow-impl/src/test/resources/policy/assignments/role-role21-standard.xml
    A model/workflow-impl/src/test/resources/policy/assignments/role-role22-special.xml
    A model/workflow-impl/src/test/resources/policy/assignments/role-role23-special-and-security.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead21.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead22.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead23.xml
    A model/workflow-impl/src/test/resources/policy/lifecycle/user-pirate-owner.xml
    R model/workflow-impl/src/test/resources/policy/role-role21-standard.xml
    R model/workflow-impl/src/test/resources/policy/role-role22-special.xml
    R model/workflow-impl/src/test/resources/policy/role-role23-special-and-security.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1-deputy1.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1-deputy2.xml
    R model/workflow-impl/src/test/resources/policy/user-pirate-owner.xml
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Refactoring policy wf tests a bit.


  Commit: 1a2b727bdd908985262da196a6bd33c22a0dd1b6
      https://github.com/Evolveum/midpoint/commit/1a2b727bdd908985262da196a6bd33c22a0dd1b6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-15 (Sun, 15 Jan 2017)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/resources/machineintelligence/HR.csv
    M testing/story/src/test/resources/machineintelligence/resource-csv-HR.xml
    M testing/story/src/test/resources/machineintelligence/shadow-chappie.xml

  Log Message:
  -----------
  updating sotry test


  Commit: 0097cd255ce1d1d76c96986b5e8da0a6ded2d157
      https://github.com/Evolveum/midpoint/commit/0097cd255ce1d1d76c96986b5e8da0a6ded2d157
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-15 (Sun, 15 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    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/DummyResource.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugDumpable.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/OrgStructFunctionsImpl.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/TestMapping.java
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.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/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/LightweightObjectRef.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/LightweightObjectRefImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ReferenceResolver.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RelationResolver.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyAssignment/AssignmentModification.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ResourceAssignmentHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/RoleAssignmentHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SerializationSafeContainer.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SingleItemSerializationSafeContainerImpl.java
    M model/workflow-impl/src/test/resources/legacy/role12.xml
    M model/workflow-impl/src/test/resources/legacy/role13.xml
    M model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    M model/workflow-impl/src/test/resources/policy/metarole-security.xml
    M model/workflow-impl/src/test/resources/policy/user-security-approver.xml
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    A testing/story/src/test/resources/strings/orgs/0-org-monkey-island-modified.xml
    A testing/story/src/test/resources/strings/orgs/1-teams.xml
    A testing/story/src/test/resources/strings/orgs/security-approvers.xml
    A testing/story/src/test/resources/strings/orgs/sod-approvers.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    A testing/story/src/test/resources/strings/roles/test-1.xml
    A testing/story/src/test/resources/strings/users/barkeeper.xml
    A testing/story/src/test/resources/strings/users/bob.xml
    A testing/story/src/test/resources/strings/users/carla.xml
    A testing/story/src/test/resources/strings/users/cheese.xml
    A testing/story/src/test/resources/strings/users/chef.xml
    A testing/story/src/test/resources/strings/users/elaine.xml
    A testing/story/src/test/resources/strings/users/guybrush.xml
    A testing/story/src/test/resources/strings/users/lechuck.xml

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


  Commit: 47f5f6a0c458e76977374771361eb68fbee4afca
      https://github.com/Evolveum/midpoint/commit/47f5f6a0c458e76977374771361eb68fbee4afca
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

  Changed paths:
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/MappingDiagEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ExpressionEnvironment.java
    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/expr/ModelExpressionThreadLocalHolder.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/projector/MappingEvaluator.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/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java

  Log Message:
  -----------
  Refactoring ModelExpressionThreadLocalHolder (MID-3661)


  Commit: c35539b892fa844bb675d525bed00609db479d26
      https://github.com/Evolveum/midpoint/commit/c35539b892fa844bb675d525bed00609db479d26
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java

  Log Message:
  -----------
  partial fix for MID-3668


  Commit: 49278ef09add9beabca5316cb3736adda19a9b1b
      https://github.com/Evolveum/midpoint/commit/49278ef09add9beabca5316cb3736adda19a9b1b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

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

  Log Message:
  -----------
  partial fix for MID-3668


  Commit: a16f947e1b231af7d22136e023aaa3ec9d659b2d
      https://github.com/Evolveum/midpoint/commit/a16f947e1b231af7d22136e023aaa3ec9d659b2d
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/BasicInlineMenuItem.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/ButtonInlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java

  Log Message:
  -----------
  inline menu with buttons. not finished yet


  Commit: 49b191c8de32cca1be2f018bcaa5ff6361cc0b3e
      https://github.com/Evolveum/midpoint/commit/49b191c8de32cca1be2f018bcaa5ff6361cc0b3e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    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/expr/ModelExpressionThreadLocalHolder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml

  Log Message:
  -----------
  isFullShadow midpoint script function (MID-3661)


  Commit: 2893a318217b04794ec1f07c0b28a7139ae65b03
      https://github.com/Evolveum/midpoint/commit/2893a318217b04794ec1f07c0b28a7139ae65b03
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
    A model/workflow-impl/src/test/resources/policy/sod/metarole-criminal-exclusion.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-judge.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-pirate.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-respectable.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-thief.xml
    A model/workflow-impl/src/test/resources/policy/sod/user-sod-approver.xml

  Log Message:
  -----------
  SoD approval tests (disabled)


  Commit: 27bc28e928aaf2e1c874d1dd16ac0b30420095ee
      https://github.com/Evolveum/midpoint/commit/27bc28e928aaf2e1c874d1dd16ac0b30420095ee
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/MappingDiagEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ExpressionEnvironment.java
    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/expr/ModelExpressionThreadLocalHolder.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/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.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/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/resources/machineintelligence/HR.csv
    M testing/story/src/test/resources/machineintelligence/resource-csv-HR.xml
    M testing/story/src/test/resources/machineintelligence/shadow-chappie.xml

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


  Commit: d48fb19f9027feb7ebb2883726dd7bd0499bb35e
      https://github.com/Evolveum/midpoint/commit/d48fb19f9027feb7ebb2883726dd7bd0499bb35e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html

  Log Message:
  -----------
  MID-3668 left menu flickering fixed


  Commit: 331a7022a23103c3106127196b38edb0efef947a
      https://github.com/Evolveum/midpoint/commit/331a7022a23103c3106127196b38edb0efef947a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ActivationUtil.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/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java

  Log Message:
  -----------
  Some assignments-related tests (unfinished)


  Commit: ca40c6ee568191ec7f963f42defca67194ee26c3
      https://github.com/Evolveum/midpoint/commit/ca40c6ee568191ec7f963f42defca67194ee26c3
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  dynamic form first impelemtation.


  Commit: f5b72093b3e809bc0b1e729d523ba861c886f089
      https://github.com/Evolveum/midpoint/commit/f5b72093b3e809bc0b1e729d523ba861c886f089
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

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

  Log Message:
  -----------
  Fixed dump of EvaluatedAssignments in model context.


  Commit: 0e8c00904d3e48739a5e7f5deb2b17c90983f8ac
      https://github.com/Evolveum/midpoint/commit/0e8c00904d3e48739a5e7f5deb2b17c90983f8ac
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html

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


  Commit: 542de647ba6c1f122cd8f8d637a79ee4b936dd72
      https://github.com/Evolveum/midpoint/commit/542de647ba6c1f122cd8f8d637a79ee4b936dd72
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnMenuAction.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuColumn.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/BasicInlineMenuItem.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/ButtonInlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java

  Log Message:
  -----------
  inline menu with buttons.  finished on Users list page


  Commit: 6143293d89443dfd88821e19a0508db4d2bb2e5c
      https://github.com/Evolveum/midpoint/commit/6143293d89443dfd88821e19a0508db4d2bb2e5c
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M build-system/pom.xml
    A config/sql/midpoint/3.6/h2/h2-3.6.sql
    A config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    A config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    A config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    A config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    A config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    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/TabbedPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/breadcrumbs/Breadcrumb.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/breadcrumbs/BreadcrumbPageClass.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/breadcrumbs/BreadcrumbPageInstance.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReportingAwarePage.java
    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/certification/PageCertCampaigns.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/certification/PageCertDefinitions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.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/PageResources.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/ResourceDetailsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.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/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.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/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.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/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfProfile.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/session/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.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_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.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/locale.properties
    M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    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/DummyResource.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/DefaultMatchingRule.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultStatus.java
    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_tr.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/TestQueryConvertor.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugDumpable.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/MappingDiagEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ExpressionEnvironment.java
    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/expr/ModelExpressionThreadLocalHolder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/OrgStructFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.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/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.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/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.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
    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/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSource.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/LightweightObjectRef.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/LightweightObjectRefImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ReferenceResolver.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RelationResolver.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyAssignment/AssignmentModification.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ResourceAssignmentHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/RoleAssignmentHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SerializationSafeContainer.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SingleItemSerializationSafeContainerImpl.java
    M model/workflow-impl/src/test/resources/legacy/role12.xml
    M model/workflow-impl/src/test/resources/legacy/role13.xml
    M model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    M model/workflow-impl/src/test/resources/policy/metarole-security.xml
    M model/workflow-impl/src/test/resources/policy/user-security-approver.xml
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M testing/story/pom.xml
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/resources/machineintelligence/HR.csv
    A testing/story/src/test/resources/machineintelligence/resource-csv-HR.xml
    A testing/story/src/test/resources/machineintelligence/shadow-chappie.xml
    A testing/story/src/test/resources/machineintelligence/shadow-rur.xml
    A testing/story/src/test/resources/strings/orgs/0-org-monkey-island-modified.xml
    A testing/story/src/test/resources/strings/orgs/1-teams.xml
    A testing/story/src/test/resources/strings/orgs/security-approvers.xml
    A testing/story/src/test/resources/strings/orgs/sod-approvers.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    A testing/story/src/test/resources/strings/roles/test-1.xml
    A testing/story/src/test/resources/strings/users/barkeeper.xml
    A testing/story/src/test/resources/strings/users/bob.xml
    A testing/story/src/test/resources/strings/users/carla.xml
    A testing/story/src/test/resources/strings/users/cheese.xml
    A testing/story/src/test/resources/strings/users/chef.xml
    A testing/story/src/test/resources/strings/users/elaine.xml
    A testing/story/src/test/resources/strings/users/guybrush.xml
    A testing/story/src/test/resources/strings/users/lechuck.xml
    M testing/story/testng-integration.xml

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


  Commit: 13ef2910a56fb279e576aa205666fed687b2f3bd
      https://github.com/Evolveum/midpoint/commit/13ef2910a56fb279e576aa205666fed687b2f3bd
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-weak-singer.xml

  Log Message:
  -----------
  Fixing weak construction (MID-3662)


  Commit: d2159d4fa376c90c102bce88618a920824a02ee7
      https://github.com/Evolveum/midpoint/commit/d2159d4fa376c90c102bce88618a920824a02ee7
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnMenuAction.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.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/PageRequestRole.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    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/expr/ModelExpressionThreadLocalHolder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    A model/model-intest/src/test/resources/rbac/role-weak-singer.xml

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


  Commit: d69b4fcad853a05a23af86bbc3e49a85a0f0d1bd
      https://github.com/Evolveum/midpoint/commit/d69b4fcad853a05a23af86bbc3e49a85a0f0d1bd
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Schema for "prune" policy action (MID-3685)


  Commit: 1aff68f79217706f8df7370bf9ead7eb59af2d3c
      https://github.com/Evolveum/midpoint/commit/1aff68f79217706f8df7370bf9ead7eb59af2d3c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Schema for deployment info (MID-2088, MID-3290)


  Commit: f678bc31c96fb786f356cf6b662476693a61dd96
      https://github.com/Evolveum/midpoint/commit/f678bc31c96fb786f356cf6b662476693a61dd96
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Schema for deployment info: update (MID-2088, MID-3290)


  Commit: 496162b5c458c0077b524ebbb6a601732b792689
      https://github.com/Evolveum/midpoint/commit/496162b5c458c0077b524ebbb6a601732b792689
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnMenuAction.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    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/AssignmentProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-weak-singer.xml

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


  Commit: 02cd107f89fb7b6fc46f72400cedee0f3bd11682
      https://github.com/Evolveum/midpoint/commit/02cd107f89fb7b6fc46f72400cedee0f3bd11682
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

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

  Log Message:
  -----------
  Attempt to fix policy rule-based exclusions.


  Commit: 0621565080e212778fc84953c2ce1cd64427f007
      https://github.com/Evolveum/midpoint/commit/0621565080e212778fc84953c2ce1cd64427f007
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerWrapperFromObjectWrapperModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java

  Log Message:
  -----------
  dynamic form support for registration


  Commit: 33df5003c440d4ba29d68a1b4647cd910bfa1855
      https://github.com/Evolveum/midpoint/commit/33df5003c440d4ba29d68a1b4647cd910bfa1855
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java

  Log Message:
  -----------
  adding license header


  Commit: d6a6bd4638a9946083614d0c0ed544f44fc03a78
      https://github.com/Evolveum/midpoint/commit/d6a6bd4638a9946083614d0c0ed544f44fc03a78
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ActivationUtil.java
    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/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentApprovalMetaroleExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/plain/TestAssignmentApprovalPlainExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/plain/TestAssignmentApprovalPlainImplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestAssignmentApprovalGlobal.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestLifecycleGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/AbstractTestLifecycle.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/plain/TestLifecyclePlain.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentApprovalMetaroleExplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/package-info.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainExplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainImplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestLifecyclePlain.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
    A model/workflow-impl/src/test/resources/policy/assignments/role-role21-standard.xml
    A model/workflow-impl/src/test/resources/policy/assignments/role-role22-special.xml
    A model/workflow-impl/src/test/resources/policy/assignments/role-role23-special-and-security.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead21.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead22.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead23.xml
    A model/workflow-impl/src/test/resources/policy/lifecycle/user-pirate-owner.xml
    R model/workflow-impl/src/test/resources/policy/role-role21-standard.xml
    R model/workflow-impl/src/test/resources/policy/role-role22-special.xml
    R model/workflow-impl/src/test/resources/policy/role-role23-special-and-security.xml
    A model/workflow-impl/src/test/resources/policy/sod/metarole-criminal-exclusion.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-judge.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-pirate.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-respectable.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-thief.xml
    A model/workflow-impl/src/test/resources/policy/sod/user-sod-approver.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1-deputy1.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1-deputy2.xml
    R model/workflow-impl/src/test/resources/policy/user-pirate-owner.xml
    M model/workflow-impl/testng-integration.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml

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


  Commit: 8609daf0274b79617ae51425a94bb653c9a2dacf
      https://github.com/Evolveum/midpoint/commit/8609daf0274b79617ae51425a94bb653c9a2dacf
  Author: MICHAEL.GRUBER <michael.gruber at wwk.de>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java
    A testing/story/src/test/resources/ldap-dependency/org-top.xml
    A testing/story/src/test/resources/ldap-dependency/resource-opendj.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org-supervip.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org-vip.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org.xml

  Log Message:
  -----------
  test dependencies


  Commit: 66029be54cda461f86848ec8747deb0845b0ce78
      https://github.com/Evolveum/midpoint/commit/66029be54cda461f86848ec8747deb0845b0ce78
  Author: MICHAEL.GRUBER <michael.gruber at wwk.de>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

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

  Log Message:
  -----------
  possible fix


  Commit: 45a90f32190e2994d846ff49406aba07b7557bd5
      https://github.com/Evolveum/midpoint/commit/45a90f32190e2994d846ff49406aba07b7557bd5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Correcting previous fix and adding test to the test suite (MID-3683)


  Commit: 94ded2c429158e07deccdb814f7ce754efd31922
      https://github.com/Evolveum/midpoint/commit/94ded2c429158e07deccdb814f7ce754efd31922
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

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

  Log Message:
  -----------
  fix for MID-3655 Self service change credentials sends password change twice


  Commit: 62043ea178ec596d55c2897bbde2619f0be87f09
      https://github.com/Evolveum/midpoint/commit/62043ea178ec596d55c2897bbde2619f0be87f09
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerWrapperFromObjectWrapperModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    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/page/login/SelfRegistrationDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ActivationUtil.java
    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/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-weak-singer.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentApprovalMetaroleExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/plain/TestAssignmentApprovalPlainExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/plain/TestAssignmentApprovalPlainImplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestAssignmentApprovalGlobal.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestLifecycleGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/AbstractTestLifecycle.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/plain/TestLifecyclePlain.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentApprovalMetaroleExplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/package-info.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainExplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainImplicit.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestLifecyclePlain.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
    A model/workflow-impl/src/test/resources/policy/assignments/role-role21-standard.xml
    A model/workflow-impl/src/test/resources/policy/assignments/role-role22-special.xml
    A model/workflow-impl/src/test/resources/policy/assignments/role-role23-special-and-security.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead21.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead22.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead23.xml
    A model/workflow-impl/src/test/resources/policy/lifecycle/user-pirate-owner.xml
    R model/workflow-impl/src/test/resources/policy/role-role21-standard.xml
    R model/workflow-impl/src/test/resources/policy/role-role22-special.xml
    R model/workflow-impl/src/test/resources/policy/role-role23-special-and-security.xml
    A model/workflow-impl/src/test/resources/policy/sod/metarole-criminal-exclusion.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-judge.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-pirate.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-respectable.xml
    A model/workflow-impl/src/test/resources/policy/sod/role-thief.xml
    A model/workflow-impl/src/test/resources/policy/sod/user-sod-approver.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1-deputy1.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1-deputy2.xml
    R model/workflow-impl/src/test/resources/policy/user-pirate-owner.xml
    M model/workflow-impl/testng-integration.xml
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java
    A testing/story/src/test/resources/ldap-dependency/org-top.xml
    A testing/story/src/test/resources/ldap-dependency/resource-opendj.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org-supervip.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org-vip.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    M testing/story/testng-integration.xml

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


  Commit: f93b8e3e9f4e01445cf2c75441537e07bbc20d50
      https://github.com/Evolveum/midpoint/commit/f93b8e3e9f4e01445cf2c75441537e07bbc20d50
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerWrapperFromObjectWrapperModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    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/page/login/SelfRegistrationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    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/DependencyProcessor.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java
    A testing/story/src/test/resources/ldap-dependency/org-top.xml
    A testing/story/src/test/resources/ldap-dependency/resource-opendj.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org-supervip.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org-vip.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Merge branch 'master' into feature/sod


  Commit: e40e020876804d9d51adaa87cada67561ecfa4b2
      https://github.com/Evolveum/midpoint/commit/e40e020876804d9d51adaa87cada67561ecfa4b2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java

  Log Message:
  -----------
  Fix for master (after cherry-pick), enabling the two disabled tests and fixing them (MID-3683)


  Commit: 2a8e196bc533407252cae7ad6c6846fa01b6eade
      https://github.com/Evolveum/midpoint/commit/2a8e196bc533407252cae7ad6c6846fa01b6eade
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html

  Log Message:
  -----------
  little code cleanup


  Commit: c8cac31d49640a9e494ef3ad630da9a7784dff01
      https://github.com/Evolveum/midpoint/commit/c8cac31d49640a9e494ef3ad630da9a7784dff01
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/AssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestReconScript.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    A model/model-impl/src/test/resources/lens/role-judge.xml
    M model/model-impl/testng-unit.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java

  Log Message:
  -----------
  Basic policy rules unit tests. Some model-impl test refactor.


  Commit: b660cae54a0b3613695eb13be5ba08db0b516f6e
      https://github.com/Evolveum/midpoint/commit/b660cae54a0b3613695eb13be5ba08db0b516f6e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    A model/model-impl/src/test/resources/lens/role-constable.xml

  Log Message:
  -----------
  More exclusion tests, fixed bug introduced in previous commit.


  Commit: b6e33a0c8ad1a8e90b7c6b511d1a18ed22c8ae8e
      https://github.com/Evolveum/midpoint/commit/b6e33a0c8ad1a8e90b7c6b511d1a18ed22c8ae8e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java

  Log Message:
  -----------
  Refactoring AssignmentProcessor, part 1


  Commit: 67479a4072ae6111fae8012250c55c00ebe0b6cf
      https://github.com/Evolveum/midpoint/commit/67479a4072ae6111fae8012250c55c00ebe0b6cf
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java

  Log Message:
  -----------
  Refactoring AssignmentProcessor, part 2


  Commit: 25723dc548ae71c3ec04e996263beba01e67a58c
      https://github.com/Evolveum/midpoint/commit/25723dc548ae71c3ec04e996263beba01e67a58c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-impl/src/test/resources/lens/role-constable.xml
    M model/model-impl/src/test/resources/lens/role-judge.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSegregationOfDuties.java
    A model/model-intest/src/test/resources/rbac/role-prize-bronze.xml
    A model/model-intest/src/test/resources/rbac/role-prize-gold.xml
    A model/model-intest/src/test/resources/rbac/role-prize-silver.xml

  Log Message:
  -----------
  Basic role pruning seems to work (MID-3685)


  Commit: 64c273c7cbafcab13c1a08a8b444a825df64a4c4
      https://github.com/Evolveum/midpoint/commit/64c273c7cbafcab13c1a08a8b444a825df64a4c4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSegregationOfDuties.java
    A model/model-intest/src/test/resources/rbac/role-color-blue.xml
    A model/model-intest/src/test/resources/rbac/role-color-green.xml
    A model/model-intest/src/test/resources/rbac/role-color-none.xml
    A model/model-intest/src/test/resources/rbac/role-color-red.xml
    A model/model-intest/src/test/resources/rbac/role-meta-color.xml

  Log Message:
  -----------
  More role pruning tests (MID-3685)


  Commit: f489c067e603f88b18435aba10cd87f74300bceb
      https://github.com/Evolveum/midpoint/commit/f489c067e603f88b18435aba10cd87f74300bceb
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java

  Log Message:
  -----------
  some code refactoring


  Commit: 7f9e69773146871524e3a87a8012a1a99e3002dd
      https://github.com/Evolveum/midpoint/commit/7f9e69773146871524e3a87a8012a1a99e3002dd
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java

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


  Commit: 2c0bfe835f86fea848ddec5b348effe04420e155
      https://github.com/Evolveum/midpoint/commit/2c0bfe835f86fea848ddec5b348effe04420e155
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.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/TestSegregationOfDuties.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Policy rule exceptions


  Commit: a29de538d3efe4ea2daaeb70168cc0200f0a8174
      https://github.com/Evolveum/midpoint/commit/a29de538d3efe4ea2daaeb70168cc0200f0a8174
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java

  Log Message:
  -----------
  Merge branch 'master' into feature/sod


  Commit: cefef5ef8cb34169e8402737517a69410e67844b
      https://github.com/Evolveum/midpoint/commit/cefef5ef8cb34169e8402737517a69410e67844b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java

  Log Message:
  -----------
  Assignmen + policy security


  Commit: 1fb7fa6cb7e2cc6e1b22d90919d560c16623dcd3
      https://github.com/Evolveum/midpoint/commit/1fb7fa6cb7e2cc6e1b22d90919d560c16623dcd3
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-22 (Sun, 22 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java

  Log Message:
  -----------
  enable/disable buttons in the context menu


  Commit: a8eb85b4cdd77ac77d0396f8818d62037aaaa6fe
      https://github.com/Evolveum/midpoint/commit/a8eb85b4cdd77ac77d0396f8818d62037aaaa6fe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-22 (Sun, 22 Jan 2017)

  Changed paths:
    M build-system/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchemaImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemInfo.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanInspector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/GlobalDefinitionsStore.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpression.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpressionXsiType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    A infra/schema/src/test/resources/common/json/no-ns/form.json
    A infra/schema/src/test/resources/common/json/no-ns/scripting-expression.json
    A infra/schema/src/test/resources/common/json/ns/form.json
    A infra/schema/src/test/resources/common/json/ns/scripting-expression.json
    M infra/schema/src/test/resources/common/task-bulk-action-1.xml
    A infra/schema/src/test/resources/common/xml/no-ns/form.xml
    A infra/schema/src/test/resources/common/xml/no-ns/scripting-expression.xml
    A infra/schema/src/test/resources/common/xml/ns/form.xml
    A infra/schema/src/test/resources/common/xml/ns/scripting-expression-xsi-type.xml
    A infra/schema/src/test/resources/common/xml/ns/scripting-expression.xml
    A infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
    A infra/schema/src/test/resources/common/yaml/no-ns/scripting-expression.yaml
    A infra/schema/src/test/resources/common/yaml/ns/form.yaml
    A infra/schema/src/test/resources/common/yaml/ns/scripting-expression.yaml
    M infra/schema/src/test/resources/object-template/wrong-template.xml
    M infra/schema/testng-unit.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

  Log Message:
  -----------
  Heterogeneous lists almost done.


  Commit: f32ff05bb5401edb84f6ddfe6744fb860007c95b
      https://github.com/Evolveum/midpoint/commit/f32ff05bb5401edb84f6ddfe6744fb860007c95b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M build-system/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchemaImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemInfo.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanInspector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/GlobalDefinitionsStore.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpression.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpressionXsiType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    A infra/schema/src/test/resources/common/json/no-ns/form.json
    A infra/schema/src/test/resources/common/json/no-ns/scripting-expression.json
    A infra/schema/src/test/resources/common/json/ns/form.json
    A infra/schema/src/test/resources/common/json/ns/scripting-expression.json
    M infra/schema/src/test/resources/common/task-bulk-action-1.xml
    A infra/schema/src/test/resources/common/xml/no-ns/form.xml
    A infra/schema/src/test/resources/common/xml/no-ns/scripting-expression.xml
    A infra/schema/src/test/resources/common/xml/ns/form.xml
    A infra/schema/src/test/resources/common/xml/ns/scripting-expression-xsi-type.xml
    A infra/schema/src/test/resources/common/xml/ns/scripting-expression.xml
    A infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
    A infra/schema/src/test/resources/common/yaml/no-ns/scripting-expression.yaml
    A infra/schema/src/test/resources/common/yaml/ns/form.yaml
    A infra/schema/src/test/resources/common/yaml/ns/scripting-expression.yaml
    M infra/schema/src/test/resources/object-template/wrong-template.xml
    M infra/schema/testng-unit.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

  Log Message:
  -----------
  Merge branch 'feature/heterogeneous-lists'

# Conflicts:
#	infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd


  Commit: 034751536588151eb0a9719b85bd8eb11c5721ea
      https://github.com/Evolveum/midpoint/commit/034751536588151eb0a9719b85bd8eb11c5721ea
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

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

  Log Message:
  -----------
  Fixing compilation errors.


  Commit: 09e398bc3912632c1e3024461a5fb8422843d840
      https://github.com/Evolveum/midpoint/commit/09e398bc3912632c1e3024461a5fb8422843d840
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java

  Log Message:
  -----------
  Checking type/element names conflicts when using '@value' items in JSON/YAML


  Commit: 769fdc2eb84e13266c7027359093cf32702d35d9
      https://github.com/Evolveum/midpoint/commit/769fdc2eb84e13266c7027359093cf32702d35d9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java

  Log Message:
  -----------
  Stripping NS from @element names (if possible) + fixing a related bug.


  Commit: 81c71b9c07885b790141ffa3c49ce4b637aa50d0
      https://github.com/Evolveum/midpoint/commit/81c71b9c07885b790141ffa3c49ce4b637aa50d0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchemaImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemInfo.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanInspector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/GlobalDefinitionsStore.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpression.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpressionXsiType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    A infra/schema/src/test/resources/common/json/no-ns/form.json
    A infra/schema/src/test/resources/common/json/no-ns/scripting-expression.json
    A infra/schema/src/test/resources/common/json/ns/form.json
    A infra/schema/src/test/resources/common/json/ns/scripting-expression.json
    M infra/schema/src/test/resources/common/task-bulk-action-1.xml
    A infra/schema/src/test/resources/common/xml/no-ns/form.xml
    A infra/schema/src/test/resources/common/xml/no-ns/scripting-expression.xml
    A infra/schema/src/test/resources/common/xml/ns/form.xml
    A infra/schema/src/test/resources/common/xml/ns/scripting-expression-xsi-type.xml
    A infra/schema/src/test/resources/common/xml/ns/scripting-expression.xml
    A infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
    A infra/schema/src/test/resources/common/yaml/no-ns/scripting-expression.yaml
    A infra/schema/src/test/resources/common/yaml/ns/form.yaml
    A infra/schema/src/test/resources/common/yaml/ns/scripting-expression.yaml
    M infra/schema/src/test/resources/object-template/wrong-template.xml
    M infra/schema/testng-unit.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

  Log Message:
  -----------
  Merge branch 'master' into feature/sod


  Commit: ea5f880552b0014f4f6169177022e00366e5561e
      https://github.com/Evolveum/midpoint/commit/ea5f880552b0014f4f6169177022e00366e5561e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    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/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.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/validator/ResourceValidatorImpl.java

  Log Message:
  -----------
  Aligning mapping source/target schema, schema for mapping domain (MID-3692)


  Commit: 49c7441092f4417f87b5cac0b30a78136736ceac
      https://github.com/Evolveum/midpoint/commit/49c7441092f4417f87b5cac0b30a78136736ceac
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Fixing minOccurs for set in mapping domain (MID-3692)


  Commit: 3c501e734095e0425d52d259333e6b0955f23e89
      https://github.com/Evolveum/midpoint/commit/3c501e734095e0425d52d259333e6b0955f23e89
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-read-some-roles.xml

  Log Message:
  -----------
  Test for role read authorization (MID-3647)


  Commit: 63401e3a5473793386e22d8aa1c2327d970d6b2f
      https://github.com/Evolveum/midpoint/commit/63401e3a5473793386e22d8aa1c2327d970d6b2f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java

  Log Message:
  -----------
  small improvement for dynamic forms


  Commit: 95cd9f09af06a687dbe1f1997312be1f775db68f
      https://github.com/Evolveum/midpoint/commit/95cd9f09af06a687dbe1f1997312be1f775db68f
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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

  Log Message:
  -----------
  Subscription message in the footer


  Commit: 1317bf009cfd599d4d307fde2eb7e8869b103ded
      https://github.com/Evolveum/midpoint/commit/1317bf009cfd599d4d307fde2eb7e8869b103ded
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.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/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchemaImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemInfo.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanInspector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/GlobalDefinitionsStore.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpression.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpressionXsiType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    A infra/schema/src/test/resources/common/json/no-ns/form.json
    A infra/schema/src/test/resources/common/json/no-ns/scripting-expression.json
    A infra/schema/src/test/resources/common/json/ns/form.json
    A infra/schema/src/test/resources/common/json/ns/scripting-expression.json
    M infra/schema/src/test/resources/common/task-bulk-action-1.xml
    A infra/schema/src/test/resources/common/xml/no-ns/form.xml
    A infra/schema/src/test/resources/common/xml/no-ns/scripting-expression.xml
    A infra/schema/src/test/resources/common/xml/ns/form.xml
    A infra/schema/src/test/resources/common/xml/ns/scripting-expression-xsi-type.xml
    A infra/schema/src/test/resources/common/xml/ns/scripting-expression.xml
    A infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
    A infra/schema/src/test/resources/common/yaml/no-ns/scripting-expression.yaml
    A infra/schema/src/test/resources/common/yaml/ns/form.yaml
    A infra/schema/src/test/resources/common/yaml/ns/scripting-expression.yaml
    M infra/schema/src/test/resources/object-template/wrong-template.xml
    M infra/schema/testng-unit.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.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/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-read-some-roles.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

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


  Commit: 50c09558eb1690ba333672809ea204e72f42a15d
      https://github.com/Evolveum/midpoint/commit/50c09558eb1690ba333672809ea204e72f42a15d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M model/model-intest/src/test/resources/security/role-read-some-roles.xml

  Log Message:
  -----------
  Authorization name in the role


  Commit: c81258a510955b1fcd6e7e991764245cc12f834c
      https://github.com/Evolveum/midpoint/commit/c81258a510955b1fcd6e7e991764245cc12f834c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M model/model-intest/src/test/resources/rbac/role-meta-color.xml

  Log Message:
  -----------
  More compact exclusion format


  Commit: e786602a82b78168b33bdc06ba319ffc5c047040
      https://github.com/Evolveum/midpoint/commit/e786602a82b78168b33bdc06ba319ffc5c047040
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html
    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/ResetPolicyDto.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FormTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  dynamic forms for password reset, samll cleanup


  Commit: e8ed6a1e8c39ce7ffea3f2f0c7c575acb728f2ed
      https://github.com/Evolveum/midpoint/commit/e8ed6a1e8c39ce7ffea3f2f0c7c575acb728f2ed
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    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/wizard/resource/SchemaHandlingStep.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/dto/MappingTypeDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.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/dataModel/DataModelVisualizerImpl.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/validator/ResourceValidatorImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-read-some-roles.xml

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


  Commit: b2de2103ded5898f3d4d2da2478332906fbd8b86
      https://github.com/Evolveum/midpoint/commit/b2de2103ded5898f3d4d2da2478332906fbd8b86
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/DefaultProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/SpringApplicationContextHolder.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/TriggeredApprovalAction.java
    M model/workflow-impl/src/main/resources/processes/ItemApproval.bpmn20.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
    M model/workflow-impl/src/test/resources/policy/sod/metarole-criminal-exclusion.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-judge.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-pirate.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-respectable.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-thief.xml

  Log Message:
  -----------
  SoD approval. Approver instruction. Approval level information in GUI. (Still not quite finished.)


  Commit: bc881d687423b7a25a1a41643f6f9a5a20794ffd
      https://github.com/Evolveum/midpoint/commit/bc881d687423b7a25a1a41643f6f9a5a20794ffd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M model/model-intest/src/test/resources/rbac/role-meta-color.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/feature/sod' into feature/sod


  Commit: 2befe7ebc609cb5c7e649fbd569f20019df91d45
      https://github.com/Evolveum/midpoint/commit/2befe7ebc609cb5c7e649fbd569f20019df91d45
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/VisibleBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.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/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/ApprovalUtils.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/Decision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareResult.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.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/WfTask.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java

  Log Message:
  -----------
  Generalized level to stage (for all process types). Applied approvalInstruction to all process types. Using stage info in audit log and decision information in GUI.


  Commit: 1a56dd996b84605ba398b0bb521b4bce7f40391b
      https://github.com/Evolveum/midpoint/commit/1a56dd996b84605ba398b0bb521b4bce7f40391b
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/pom.xml
    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

  Log Message:
  -----------
  Subscription id check


  Commit: d7c25154ff90ef66cfaf21deca23ebba1dd1329f
      https://github.com/Evolveum/midpoint/commit/d7c25154ff90ef66cfaf21deca23ebba1dd1329f
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html
    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/ResetPolicyDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FormTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/src/test/resources/security/role-read-some-roles.xml

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


  Commit: 7a6d01304f96a354deba7fa3163a0ec9c7796758
      https://github.com/Evolveum/midpoint/commit/7a6d01304f96a354deba7fa3163a0ec9c7796758
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/ApprovalUtils.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WorkflowResult.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/WfTestUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java

  Log Message:
  -----------
  Fixing wf tests.


  Commit: 8e5e8d37b0c2005fa4473c87cf9e730f68f24f71
      https://github.com/Evolveum/midpoint/commit/8e5e8d37b0c2005fa4473c87cf9e730f68f24f71
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java

  Log Message:
  -----------
  Improvements for inline menu buttons


  Commit: d01ea0de6e5856e779c7a81da4c5a9074c9a9292
      https://github.com/Evolveum/midpoint/commit/d01ea0de6e5856e779c7a81da4c5a9074c9a9292
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituaion.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.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/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    A model/model-impl/src/test/resources/lens/role-thief.xml

  Log Message:
  -----------
  "Secondary" policy situations ... constraints acting on pre-computed policy situations.


  Commit: 0dfd3a91b68d67b8cf867c302afd23d85fd3e79b
      https://github.com/Evolveum/midpoint/commit/0dfd3a91b68d67b8cf867c302afd23d85fd3e79b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    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/admin/workflow/dto/ProcessInstanceDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTask.java

  Log Message:
  -----------
  Showing stage in process instance lists.


  Commit: 2b62c2ee87a827aaf872d5bfa81cb9ab5f29b9e3
      https://github.com/Evolveum/midpoint/commit/2b62c2ee87a827aaf872d5bfa81cb9ab5f29b9e3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    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/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.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/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html
    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/ResetPolicyDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FormTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.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/dataModel/DataModelVisualizerImpl.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/validator/ResourceValidatorImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-read-some-roles.xml

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


  Commit: 62a623ce7c1c93529134422e59e3811cc0245bd5
      https://github.com/Evolveum/midpoint/commit/62a623ce7c1c93529134422e59e3811cc0245bd5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java

  Log Message:
  -----------
  Fixed NPE in GUI (non-recomputed users)


  Commit: 2aa87aa54673ef76eb5c978623f65ebf33e35e7d
      https://github.com/Evolveum/midpoint/commit/2aa87aa54673ef76eb5c978623f65ebf33e35e7d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java

  Log Message:
  -----------
  Stage info also for wf notifications.


  Commit: fef96a7790bbb9f0a899550599722eac0fd24740
      https://github.com/Evolveum/midpoint/commit/fef96a7790bbb9f0a899550599722eac0fd24740
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SerializableBooleanProducer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/VisibleBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.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

  Log Message:
  -----------
  Fixed serialization bug for lambdas in VisibleBehavior. Added experimental "all relations" for role members page.


  Commit: 83999b3121a9f789c8b505e225dd8eb973977448
      https://github.com/Evolveum/midpoint/commit/83999b3121a9f789c8b505e225dd8eb973977448
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  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/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java

  Log Message:
  -----------
  Added stage info to various places in GUI.


  Commit: d2094381c56b5d4428f8a0505ecaf6f74b3802da
      https://github.com/Evolveum/midpoint/commit/d2094381c56b5d4428f8a0505ecaf6f74b3802da
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  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/workflow/dto/WorkItemDto.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughLevels.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTask.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java

  Log Message:
  -----------
  Added stage info to yet another places in GUI. Added stage-related info to WorkItemType for easier access.


  Commit: 156c2d2a14aaa1505f104e3512c3f4cef18b7633
      https://github.com/Evolveum/midpoint/commit/156c2d2a14aaa1505f104e3512c3f4cef18b7633
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    A testing/story/src/test/resources/strings/roles-2/a-test-1.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-2a.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-2b.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    R testing/story/src/test/resources/strings/roles/test-1.xml
    M testing/story/src/test/resources/strings/users/cheese.xml
    M testing/story/src/test/resources/strings/users/chef.xml

  Log Message:
  -----------
  Updated wf samples.


  Commit: 4ebbb52c1072ca06fb6946d4c26e30163bd8172c
      https://github.com/Evolveum/midpoint/commit/4ebbb52c1072ca06fb6946d4c26e30163bd8172c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
    M model/model-intest/src/test/resources/rbac/role-cannibal.xml
    M model/model-intest/src/test/resources/rbac/role-governor.xml

  Log Message:
  -----------
  Fixed default policy actions for legacy constraints. Fixed defaults in test data.


  Commit: 67a118dacf9685dfbb69d51eef87cff14b10ca5a
      https://github.com/Evolveum/midpoint/commit/67a118dacf9685dfbb69d51eef87cff14b10ca5a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M infra/schema/pom.xml
    M samples/model-client-sample/pom.xml
    M tools/repo-ninja/pom.xml

  Log Message:
  -----------
  Some maven magic to get rid of dependency problems.


  Commit: 53af3fdcf10957dd1dff6572c7ec967f14812490
      https://github.com/Evolveum/midpoint/commit/53af3fdcf10957dd1dff6572c7ec967f14812490
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml

  Log Message:
  -----------
  Fixing the fix...


  Commit: 2ebd620b70bff76fcbc5c276ea610ec2d9c55516
      https://github.com/Evolveum/midpoint/commit/2ebd620b70bff76fcbc5c276ea610ec2d9c55516
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java

  Log Message:
  -----------
  HTML notification messages


  Commit: 48497f89d683a216a63b0065c5183a4f507c30b3
      https://github.com/Evolveum/midpoint/commit/48497f89d683a216a63b0065c5183a4f507c30b3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java

  Log Message:
  -----------
  Turned off H2 MVCC for Activiti by default.


  Commit: 75a6ba52f13f222185cf95e732701fe6111ec691
      https://github.com/Evolveum/midpoint/commit/75a6ba52f13f222185cf95e732701fe6111ec691
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java
    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/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java

  Log Message:
  -----------
  Inline menu buttons are implemented in Roles, Services, Resources lists tables.


  Commit: 498935adec788086090ea7a97696646adcb94c2e
      https://github.com/Evolveum/midpoint/commit/498935adec788086090ea7a97696646adcb94c2e
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SerializableBooleanProducer.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/VisibleBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java
    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/roles/RoleMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.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/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.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/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituaion.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.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/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.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/AssignmentProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestReconScript.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    A model/model-impl/src/test/resources/lens/role-constable.xml
    A model/model-impl/src/test/resources/lens/role-judge.xml
    A model/model-impl/src/test/resources/lens/role-thief.xml
    M model/model-impl/testng-unit.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/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSegregationOfDuties.java
    M model/model-intest/src/test/resources/rbac/role-cannibal.xml
    A model/model-intest/src/test/resources/rbac/role-color-blue.xml
    A model/model-intest/src/test/resources/rbac/role-color-green.xml
    A model/model-intest/src/test/resources/rbac/role-color-none.xml
    A model/model-intest/src/test/resources/rbac/role-color-red.xml
    M model/model-intest/src/test/resources/rbac/role-governor.xml
    A model/model-intest/src/test/resources/rbac/role-meta-color.xml
    A model/model-intest/src/test/resources/rbac/role-prize-bronze.xml
    A model/model-intest/src/test/resources/rbac/role-prize-gold.xml
    A model/model-intest/src/test/resources/rbac/role-prize-silver.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyTransport.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/ApprovalUtils.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/DefaultProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/SpringApplicationContextHolder.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WorkflowResult.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/Decision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughLevels.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareResult.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/TriggeredApprovalAction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTask.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
    M model/workflow-impl/src/main/resources/processes/ItemApproval.bpmn20.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/WfTestUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
    M model/workflow-impl/src/test/resources/policy/sod/metarole-criminal-exclusion.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-judge.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-pirate.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-respectable.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-thief.xml
    M samples/model-client-sample/pom.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-1.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-2a.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-2b.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    R testing/story/src/test/resources/strings/roles/test-1.xml
    M testing/story/src/test/resources/strings/users/cheese.xml
    M testing/story/src/test/resources/strings/users/chef.xml
    M tools/repo-ninja/pom.xml

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java


  Commit: 1f9ca1546a8e571495307fe4a228616ef249c09f
      https://github.com/Evolveum/midpoint/commit/1f9ca1546a8e571495307fe4a228616ef249c09f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.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/projector/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java

  Log Message:
  -----------
  Refactored EvaluatedPolicyRuleTrigger into subclasses. Better diagnostic messages.


  Commit: c0ae761521711271f8553a82bdd1874d21cd8660
      https://github.com/Evolveum/midpoint/commit/c0ae761521711271f8553a82bdd1874d21cd8660
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java
    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/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java

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


  Commit: f1085be5b6d75cf4185de3e32859fc0fe8728e82
      https://github.com/Evolveum/midpoint/commit/f1085be5b6d75cf4185de3e32859fc0fe8728e82
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

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

  Log Message:
  -----------
  Fixing stupid NPE


  Commit: 1ccfe98118ebbbe8a809ded6da5f49c2ef0a24ac
      https://github.com/Evolveum/midpoint/commit/1ccfe98118ebbbe8a809ded6da5f49c2ef0a24ac
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Fixing activation processing in object template (MID-3695)


  Commit: 36157ce824f432de57552ce6852d047a0019e616
      https://github.com/Evolveum/midpoint/commit/36157ce824f432de57552ce6852d047a0019e616
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/ModelInvocationContext.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.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/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/TriggeredApprovalAction.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/resources/policy/metarole-default.xml

  Log Message:
  -----------
  Preparing for serious implementation of approver instructions.


  Commit: fc53ed875f86cd6f68687e43c4376c0baae09bad
      https://github.com/Evolveum/midpoint/commit/fc53ed875f86cd6f68687e43c4376c0baae09bad
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalSpecificContent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

  Log Message:
  -----------
  Evaluated policy rules are now available in wf context. Preliminary default "approver instruction" computation (not much usable yet).


  Commit: d1e8403794ebf8e246c56548d5d4a1b1b6a03d8b
      https://github.com/Evolveum/midpoint/commit/d1e8403794ebf8e246c56548d5d4a1b1b6a03d8b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

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


  Commit: 09056bebc78ea59b064ef1faaf178a00c434857d
      https://github.com/Evolveum/midpoint/commit/09056bebc78ea59b064ef1faaf178a00c434857d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml

  Log Message:
  -----------
  Fixed SoD approval sample.


  Commit: 7ed723e9cb536d0ba568c89f7108b9abdc772e27
      https://github.com/Evolveum/midpoint/commit/7ed723e9cb536d0ba568c89f7108b9abdc772e27
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M repo/task-api/pom.xml

  Log Message:
  -----------
  Fixing build (maven dependencies)


  Commit: 50511eed08a32870347f42be24866004bac7d555
      https://github.com/Evolveum/midpoint/commit/50511eed08a32870347f42be24866004bac7d555
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.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 infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties

  Log Message:
  -----------
  Translation update.
Thanks to the contributors: AivoK (et), ggalard (es), securny (ru),
petr.gasparik (cz), SPozharnenov (ru), OlgaMirsanova (ru), carlos18619
(pt_BR)!


Compare: https://github.com/Evolveum/midpoint/compare/ca7f24dd3ce6...50511eed08a3