[midPoint-git] [Evolveum/midpoint] b4c5ce: Storing policy situation in focus/assignment, firs...

Petr Gašparík petr at gasparik.cz
Tue Mar 7 10:36:31 CET 2017


  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: b4c5ce204cb0c83a2770a2c1aac4996d7fa2b756
      https://github.com/Evolveum/midpoint/commit/b4c5ce204cb0c83a2770a2c1aac4996d7fa2b756
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-21 (Tue, 21 Feb 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/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/AssignmentTripleEvaluator.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
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
    A model/model-impl/src/test/resources/lens/role-judge-situation-only.xml
    A model/model-impl/src/test/resources/lens/role-pirate-situation-only.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml

  Log Message:
  -----------
  Storing policy situation in focus/assignment, first draft (not much tested).


  Commit: c62bb4966ab5031bb9da9b711ffdc9a65de0f27f
      https://github.com/Evolveum/midpoint/commit/c62bb4966ab5031bb9da9b711ffdc9a65de0f27f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/FullTextRestriction.java

  Log Message:
  -----------
  First working version (although not configurable for now).


  Commit: b51632b4620004bb689c1496b03591864845b30a
      https://github.com/Evolveum/midpoint/commit/b51632b4620004bb689c1496b03591864845b30a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.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/EvaluatedSituationTrigger.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/EvaluatedPolicyRuleImpl.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:
  -----------
  Helper methods to deal with "aggregated" rules/triggers in policy situation rules triggers.


  Commit: 057ec9e25924f438930d522fbe5047e86f92e6dc
      https://github.com/Evolveum/midpoint/commit/057ec9e25924f438930d522fbe5047e86f92e6dc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.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

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


  Commit: f738f38f94abaaea3dab57e2a6a9acdead9acb71
      https://github.com/Evolveum/midpoint/commit/f738f38f94abaaea3dab57e2a6a9acdead9acb71
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectTextInfoId.java

  Log Message:
  -----------
  Removed artificial index from RObjectTextInfo.


  Commit: e61e277d5205f6e3dc42812df97d2eea4a1cfa53
      https://github.com/Evolveum/midpoint/commit/e61e277d5205f6e3dc42812df97d2eea4a1cfa53
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  full text search implementation


  Commit: 0a6e13a5ea965fb1a0dcb415c8736c6a85823d09
      https://github.com/Evolveum/midpoint/commit/0a6e13a5ea965fb1a0dcb415c8736c6a85823d09
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.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 infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.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/EvaluatedSituationTrigger.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/EvaluatedPolicyRuleImpl.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
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java

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


  Commit: 3d2a40134cc47b8457c044c78bf04e8e7fad0437
      https://github.com/Evolveum/midpoint/commit/3d2a40134cc47b8457c044c78bf04e8e7fad0437
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.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/controller/SystemConfigurationHandler.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/RepositoryContext.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M 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/RGenericObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationDecision.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCertCaseReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RContainerReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RActivation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedNamedReference.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/embedded/ROperationalState.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/CertificationCaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java

  Log Message:
  -----------
  Configurable indexing for full text search.


  Commit: 0e6d8c2508a24b572ba2e22b559c4ef533a7838e
      https://github.com/Evolveum/midpoint/commit/0e6d8c2508a24b572ba2e22b559c4ef533a7838e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/ModelInitialSetup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/init/RepoInitialSetup.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-init.xml
    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/controller/SystemConfigurationHandler.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
    A samples/objects/full-text-search.xml

  Log Message:
  -----------
  Applying full text indexing (and logging) configuration earlier in the startup sequence. Other minor tweaks.


  Commit: f4da9ee1beb2c6605d34dcdbeefc1c15e947fd67
      https://github.com/Evolveum/midpoint/commit/f4da9ee1beb2c6605d34dcdbeefc1c15e947fd67
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M build-system/pom.xml
    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/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentConflictDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.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/webapp/less/admin-lte/bootstrap-less/mixins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/background-variant.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/border-radius.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/buttons.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/forms.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/gradients.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid-framework.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/hide-text.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/image.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/list-group.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/pagination.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/reset-text.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/responsive-visibility.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/text-emphasis.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/vendor-prefixes.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/variables.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/.csslintrc
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/404_500_errors.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/AdminLTE-without-plugins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/AdminLTE.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/alerts.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/bootstrap-social.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/boxes.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/buttons.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/control-sidebar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/core.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/direct-chat.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/dropdown.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/forms.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/fullcalendar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/header.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/labels.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/lockscreen.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/login_and_register.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/mailbox.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/miscellaneous.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/mixins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/modal.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/navs.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/plugins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/print.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/products.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/profile.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/progress-bars.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/select2.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/sidebar-mini.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/sidebar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-black-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-black.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-blue-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-green-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-green.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-purple-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-purple.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-red-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-red.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-yellow-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-yellow.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/small-box.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/social-widgets.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/timeline.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/users-list.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/variables.less
    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/EvaluatedSituationTrigger.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/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/resources/ctx-model.xml
    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:
  -----------
  Merge remote-tracking branch 'origin/master' into features/full-text-search


  Commit: a6ac49928cf6fc1abc273e4971bce22c702b59c9
      https://github.com/Evolveum/midpoint/commit/a6ac49928cf6fc1abc273e4971bce22c702b59c9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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/TestSecurity.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Schema for object lists (adminGuiConfig). Just search box mode.


  Commit: b2e5dd601e6168619cb650c7cc467ef0251c0a4a
      https://github.com/Evolveum/midpoint/commit/b2e5dd601e6168619cb650c7cc467ef0251c0a4a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M config/sql/midpoint/3.6/h2/h2-3.6.sql
    M config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    M config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    M config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    M config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    M config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql

  Log Message:
  -----------
  Migration scripts.


  Commit: 19fd55619de9f91638c77bea1a68875318a572ed
      https://github.com/Evolveum/midpoint/commit/19fd55619de9f91638c77bea1a68875318a572ed
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M config/sql/midpoint/3.6/h2/h2-3.6.sql
    M config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    M config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    M config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    M config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    M config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/ModelInitialSetup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/init/RepoInitialSetup.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-init.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.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/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SystemConfigurationHandler.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/RepositoryContext.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M 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/RGenericObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationDecision.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCertCaseReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RContainerReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RActivation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedNamedReference.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/embedded/ROperationalState.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectTextInfoId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/CertificationCaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/FullTextRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    A samples/objects/full-text-search.xml

  Log Message:
  -----------
  Merge branch 'features/full-text-search'


  Commit: e6f20a24de0c9d4984653e38c68b18481b336f3e
      https://github.com/Evolveum/midpoint/commit/e6f20a24de0c9d4984653e38c68b18481b336f3e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 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/rest/MidpointXmlProvider.java
    M testing/rest/pom.xml
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestProvider.java
    R testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceJson.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceXml.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceYaml.java
    M testing/rest/src/test/resources/ctx-rest-test-main.xml
    M testing/rest/src/test/resources/logback-test.xml
    R testing/rest/src/test/resources/repo/account-chuck.xml
    A testing/rest/src/test/resources/repo/json/account-chuck.json
    A testing/rest/src/test/resources/repo/json/role-adder.json
    A testing/rest/src/test/resources/repo/json/role-modifier.json
    A testing/rest/src/test/resources/repo/json/user-darthadder.json
    A testing/rest/src/test/resources/repo/json/user-nopassword.json
    A testing/rest/src/test/resources/repo/json/user-template.json
    R testing/rest/src/test/resources/repo/role-adder.xml
    R testing/rest/src/test/resources/repo/role-modifier.xml
    R testing/rest/src/test/resources/repo/user-darthadder.xml
    R testing/rest/src/test/resources/repo/user-nopassword.xml
    R testing/rest/src/test/resources/repo/user-template.xml
    A testing/rest/src/test/resources/repo/xml/account-chuck.xml
    A testing/rest/src/test/resources/repo/xml/role-adder.xml
    A testing/rest/src/test/resources/repo/xml/role-modifier.xml
    A testing/rest/src/test/resources/repo/xml/user-darthadder.xml
    A testing/rest/src/test/resources/repo/xml/user-nopassword.xml
    A testing/rest/src/test/resources/repo/xml/user-template.xml
    A testing/rest/src/test/resources/repo/yaml/account-chuck.yml
    A testing/rest/src/test/resources/repo/yaml/role-adder.yml
    A testing/rest/src/test/resources/repo/yaml/role-modifier.yml
    A testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
    A testing/rest/src/test/resources/repo/yaml/user-nopassword.yml
    A testing/rest/src/test/resources/repo/yaml/user-template.yml
    A testing/rest/src/test/resources/req/json/modification-assign-role-modifier.json
    A testing/rest/src/test/resources/req/json/modification-disable.json
    A testing/rest/src/test/resources/req/json/modification-enable.json
    R testing/rest/src/test/resources/req/modification-assign-role-modifier.xml
    R testing/rest/src/test/resources/req/modification-disable.xml
    R testing/rest/src/test/resources/req/modification-enable.xml
    A testing/rest/src/test/resources/req/xml/modification-assign-role-modifier.xml
    A testing/rest/src/test/resources/req/xml/modification-disable.xml
    A testing/rest/src/test/resources/req/xml/modification-enable.xml
    A testing/rest/src/test/resources/req/yaml/modification-assign-role-modifier.yml
    A testing/rest/src/test/resources/req/yaml/modification-disable.yml
    A testing/rest/src/test/resources/req/yaml/modification-enable.yml
    M testing/rest/testng-integration.xml

  Log Message:
  -----------
  JSON/YAML support for REST


  Commit: a7a053c349bbb744748d8cf86821345f5de25cc6
      https://github.com/Evolveum/midpoint/commit/a7a053c349bbb744748d8cf86821345f5de25cc6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 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/rest/MidpointXmlProvider.java
    M testing/rest/pom.xml

  Log Message:
  -----------
  cleanup - removing unused imports and dependecies


  Commit: 0af0a7c9f00a207a5659603851ee49d98d1ace9e
      https://github.com/Evolveum/midpoint/commit/0af0a7c9f00a207a5659603851ee49d98d1ace9e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M config/sql/midpoint/3.6/h2/h2-3.6.sql
    M config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    M config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    M config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    M config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    M config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/ModelInitialSetup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/init/RepoInitialSetup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-init.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.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/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SystemConfigurationHandler.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/TestSecurity.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/RepositoryContext.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M 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/RGenericObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationDecision.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCertCaseReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RContainerReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RActivation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedNamedReference.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/embedded/ROperationalState.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectTextInfoId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/CertificationCaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/FullTextRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    A samples/objects/full-text-search.xml

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


  Commit: 4c7cdaf27097ebfbef4c4e76fbc3f407d7d321c7
      https://github.com/Evolveum/midpoint/commit/4c7cdaf27097ebfbef4c4e76fbc3f407d7d321c7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

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

  Log Message:
  -----------
  Adapted TestLoggingConfiguration.


  Commit: 8ef4bfe9cb0e0286082ff5de76978613afada9e8
      https://github.com/Evolveum/midpoint/commit/8ef4bfe9cb0e0286082ff5de76978613afada9e8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-24 (Fri, 24 Feb 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/rest/MidpointXmlProvider.java
    M testing/rest/pom.xml
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestProvider.java
    R testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceJson.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceXml.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceYaml.java
    M testing/rest/src/test/resources/ctx-rest-test-main.xml
    M testing/rest/src/test/resources/logback-test.xml
    R testing/rest/src/test/resources/repo/account-chuck.xml
    A testing/rest/src/test/resources/repo/json/account-chuck.json
    A testing/rest/src/test/resources/repo/json/role-adder.json
    A testing/rest/src/test/resources/repo/json/role-modifier.json
    A testing/rest/src/test/resources/repo/json/user-darthadder.json
    A testing/rest/src/test/resources/repo/json/user-nopassword.json
    A testing/rest/src/test/resources/repo/json/user-template.json
    R testing/rest/src/test/resources/repo/role-adder.xml
    R testing/rest/src/test/resources/repo/role-modifier.xml
    R testing/rest/src/test/resources/repo/user-darthadder.xml
    R testing/rest/src/test/resources/repo/user-nopassword.xml
    R testing/rest/src/test/resources/repo/user-template.xml
    A testing/rest/src/test/resources/repo/xml/account-chuck.xml
    A testing/rest/src/test/resources/repo/xml/role-adder.xml
    A testing/rest/src/test/resources/repo/xml/role-modifier.xml
    A testing/rest/src/test/resources/repo/xml/user-darthadder.xml
    A testing/rest/src/test/resources/repo/xml/user-nopassword.xml
    A testing/rest/src/test/resources/repo/xml/user-template.xml
    A testing/rest/src/test/resources/repo/yaml/account-chuck.yml
    A testing/rest/src/test/resources/repo/yaml/role-adder.yml
    A testing/rest/src/test/resources/repo/yaml/role-modifier.yml
    A testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
    A testing/rest/src/test/resources/repo/yaml/user-nopassword.yml
    A testing/rest/src/test/resources/repo/yaml/user-template.yml
    A testing/rest/src/test/resources/req/json/modification-assign-role-modifier.json
    A testing/rest/src/test/resources/req/json/modification-disable.json
    A testing/rest/src/test/resources/req/json/modification-enable.json
    R testing/rest/src/test/resources/req/modification-assign-role-modifier.xml
    R testing/rest/src/test/resources/req/modification-disable.xml
    R testing/rest/src/test/resources/req/modification-enable.xml
    A testing/rest/src/test/resources/req/xml/modification-assign-role-modifier.xml
    A testing/rest/src/test/resources/req/xml/modification-disable.xml
    A testing/rest/src/test/resources/req/xml/modification-enable.xml
    A testing/rest/src/test/resources/req/yaml/modification-assign-role-modifier.yml
    A testing/rest/src/test/resources/req/yaml/modification-disable.yml
    A testing/rest/src/test/resources/req/yaml/modification-enable.yml
    M testing/rest/testng-integration.xml

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


  Commit: 17193c674e0d9e9d1793a3b4cfe484930a2e7f9a
      https://github.com/Evolveum/midpoint/commit/17193c674e0d9e9d1793a3b4cfe484930a2e7f9a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-02-25 (Sat, 25 Feb 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointJsonProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointXmlProvider.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointYamlProvider.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
    R testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceJson.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceXml.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceYaml.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
    M testing/rest/src/test/resources/ctx-rest-test-main.xml
    M testing/rest/testng-integration.xml

  Log Message:
  -----------
  small refactoring, enabling test for yaml (rest), adding licence headers


  Commit: 81f456325e03a3ed04145a07caece159ba7fabd5
      https://github.com/Evolveum/midpoint/commit/81f456325e03a3ed04145a07caece159ba7fabd5
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-02-25 (Sat, 25 Feb 2017)

  Changed paths:
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceJson.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceXml.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceYaml.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
    M testing/rest/src/test/resources/repo/yaml/account-chuck.yml
    M testing/rest/src/test/resources/repo/yaml/role-adder.yml
    M testing/rest/src/test/resources/repo/yaml/role-modifier.yml
    M testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
    M testing/rest/src/test/resources/repo/yaml/user-nopassword.yml
    M testing/rest/src/test/resources/repo/yaml/user-template.yml
    M testing/rest/src/test/resources/req/yaml/modification-assign-role-modifier.yml
    M testing/rest/src/test/resources/req/yaml/modification-disable.yml
    M testing/rest/src/test/resources/req/yaml/modification-enable.yml

  Log Message:
  -----------
  some additional licence headers.


  Commit: 1f870c3efe4b9c7c3b936224d852272f104e98b1
      https://github.com/Evolveum/midpoint/commit/1f870c3efe4b9c7c3b936224d852272f104e98b1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-02-25 (Sat, 25 Feb 2017)

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

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


  Commit: 95969fd6b850c4e2c69a3cf53c37785f62e99cdf
      https://github.com/Evolveum/midpoint/commit/95969fd6b850c4e2c69a3cf53c37785f62e99cdf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java

  Log Message:
  -----------
  Helper method to determine full text search configuration presence.


  Commit: 336865966ea3915680bd6d49295b7d1156f42f64
      https://github.com/Evolveum/midpoint/commit/336865966ea3915680bd6d49295b7d1156f42f64
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointJsonProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointXmlProvider.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointYamlProvider.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
    R testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceJson.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceXml.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceYaml.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
    M testing/rest/src/test/resources/ctx-rest-test-main.xml
    M testing/rest/src/test/resources/repo/yaml/account-chuck.yml
    M testing/rest/src/test/resources/repo/yaml/role-adder.yml
    M testing/rest/src/test/resources/repo/yaml/role-modifier.yml
    M testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
    M testing/rest/src/test/resources/repo/yaml/user-nopassword.yml
    M testing/rest/src/test/resources/repo/yaml/user-template.yml
    M testing/rest/src/test/resources/req/yaml/modification-assign-role-modifier.yml
    M testing/rest/src/test/resources/req/yaml/modification-disable.yml
    M testing/rest/src/test/resources/req/yaml/modification-enable.yml
    M testing/rest/testng-integration.xml

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


  Commit: 18673ef643e8f9b9f5cfa5e41e1ef550fe0d6598
      https://github.com/Evolveum/midpoint/commit/18673ef643e8f9b9f5cfa5e41e1ef550fe0d6598
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.html

  Log Message:
  -----------
  some improvements for full text search panel, role catalog conflicts panel


  Commit: 00d0e6aeb333c84ebb1d2bb84c2761d6245587bf
      https://github.com/Evolveum/midpoint/commit/00d0e6aeb333c84ebb1d2bb84c2761d6245587bf
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java

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


  Commit: 6a172f3a66efa0afc6d97e89550068ab902a2787
      https://github.com/Evolveum/midpoint/commit/6a172f3a66efa0afc6d97e89550068ab902a2787
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

  Log Message:
  -----------
  ScriptExecutionResultType


  Commit: c31ebe1da6bf3efce65978ac8007055c7f035ad6
      https://github.com/Evolveum/midpoint/commit/c31ebe1da6bf3efce65978ac8007055c7f035ad6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.html

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


  Commit: 49bb96d8d8d23c41d591765580932a7fb347b1e7
      https://github.com/Evolveum/midpoint/commit/49bb96d8d8d23c41d591765580932a7fb347b1e7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M build-system/pom.xml
    M config/sql/midpoint/3.6/h2/h2-3.6.sql
    M config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    M config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    M config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    M config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    M config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
    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/init/ModelInitialSetup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/init/RepoInitialSetup.java
    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/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.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/component/AssignmentConflictPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentConflictDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.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/webapp/WEB-INF/ctx-init.xml
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/background-variant.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/border-radius.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/buttons.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/forms.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/gradients.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid-framework.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/hide-text.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/image.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/list-group.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/pagination.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/reset-text.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/responsive-visibility.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/text-emphasis.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/vendor-prefixes.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/variables.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/.csslintrc
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/404_500_errors.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/AdminLTE-without-plugins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/AdminLTE.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/alerts.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/bootstrap-social.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/boxes.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/buttons.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/control-sidebar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/core.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/direct-chat.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/dropdown.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/forms.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/fullcalendar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/header.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/labels.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/lockscreen.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/login_and_register.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/mailbox.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/miscellaneous.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/mixins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/modal.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/navs.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/plugins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/print.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/products.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/profile.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/progress-bars.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/select2.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/sidebar-mini.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/sidebar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-black-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-black.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-blue-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-green-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-green.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-purple-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-purple.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-red-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-red.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-yellow-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-yellow.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/small-box.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/social-widgets.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/timeline.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/users-list.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/variables.less
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/query/FullTextFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/R_Filter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_AtomicFilterEntry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectType.java
    M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    A infra/prism/src/test/resources/query/filter-not-full-text.xml
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/AbstractOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/certification-impl/pom.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-impl/pom.xml
    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/controller/SystemConfigurationHandler.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/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/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ProjectorComponentRunnable.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/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointJsonProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointXmlProvider.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointYamlProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-impl/src/main/resources/ctx-model.xml
    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/TestLoggingConfiguration.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/TestSecurity.java
    M model/model-intest/src/test/resources/common/system-configuration.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/processors/primary/policy/PolicyRuleBasedAspect.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/RepositoryContext.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M 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/RGenericObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationDecision.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCertCaseReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RContainerReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RActivation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedNamedReference.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/embedded/ROperationalState.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectTextInfoId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/CertificationCaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/FullTextRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    A samples/objects/full-text-search.xml
    M testing/rest/pom.xml
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
    R testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceJson.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceXml.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceYaml.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
    M testing/rest/src/test/resources/ctx-rest-test-main.xml
    M testing/rest/src/test/resources/logback-test.xml
    R testing/rest/src/test/resources/repo/account-chuck.xml
    A testing/rest/src/test/resources/repo/json/account-chuck.json
    A testing/rest/src/test/resources/repo/json/role-adder.json
    A testing/rest/src/test/resources/repo/json/role-modifier.json
    A testing/rest/src/test/resources/repo/json/user-darthadder.json
    A testing/rest/src/test/resources/repo/json/user-nopassword.json
    A testing/rest/src/test/resources/repo/json/user-template.json
    R testing/rest/src/test/resources/repo/role-adder.xml
    R testing/rest/src/test/resources/repo/role-modifier.xml
    R testing/rest/src/test/resources/repo/user-darthadder.xml
    R testing/rest/src/test/resources/repo/user-nopassword.xml
    R testing/rest/src/test/resources/repo/user-template.xml
    A testing/rest/src/test/resources/repo/xml/account-chuck.xml
    A testing/rest/src/test/resources/repo/xml/role-adder.xml
    A testing/rest/src/test/resources/repo/xml/role-modifier.xml
    A testing/rest/src/test/resources/repo/xml/user-darthadder.xml
    A testing/rest/src/test/resources/repo/xml/user-nopassword.xml
    A testing/rest/src/test/resources/repo/xml/user-template.xml
    A testing/rest/src/test/resources/repo/yaml/account-chuck.yml
    A testing/rest/src/test/resources/repo/yaml/role-adder.yml
    A testing/rest/src/test/resources/repo/yaml/role-modifier.yml
    A testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
    A testing/rest/src/test/resources/repo/yaml/user-nopassword.yml
    A testing/rest/src/test/resources/repo/yaml/user-template.yml
    A testing/rest/src/test/resources/req/json/modification-assign-role-modifier.json
    A testing/rest/src/test/resources/req/json/modification-disable.json
    A testing/rest/src/test/resources/req/json/modification-enable.json
    R testing/rest/src/test/resources/req/modification-assign-role-modifier.xml
    R testing/rest/src/test/resources/req/modification-disable.xml
    R testing/rest/src/test/resources/req/modification-enable.xml
    A testing/rest/src/test/resources/req/xml/modification-assign-role-modifier.xml
    A testing/rest/src/test/resources/req/xml/modification-disable.xml
    A testing/rest/src/test/resources/req/xml/modification-enable.xml
    A testing/rest/src/test/resources/req/yaml/modification-assign-role-modifier.yml
    A testing/rest/src/test/resources/req/yaml/modification-disable.yml
    A testing/rest/src/test/resources/req/yaml/modification-enable.yml
    M testing/rest/testng-integration.xml

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

# Conflicts:
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java


  Commit: 21ce210192a7d1872ff1bd40a792d687b504a098
      https://github.com/Evolveum/midpoint/commit/21ce210192a7d1872ff1bd40a792d687b504a098
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java

  Log Message:
  -----------
  implemented the check for full text search if it is enabled in sysConfig


  Commit: 7c0b5f21f5fdf9d6b9acf2a985b25f40720fbcae
      https://github.com/Evolveum/midpoint/commit/7c0b5f21f5fdf9d6b9acf2a985b25f40720fbcae
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

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


  Commit: 54f0e44ec6181111373b41e7cf7bdb2660228898
      https://github.com/Evolveum/midpoint/commit/54f0e44ec6181111373b41e7cf7bdb2660228898
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FullTextSearchConfigurationUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java

  Log Message:
  -----------
  Another helper method for full-text search.


  Commit: 0544d1f7c175f60f8dee6600ca870d0f04771d1e
      https://github.com/Evolveum/midpoint/commit/0544d1f7c175f60f8dee6600ca870d0f04771d1e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java

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


  Commit: bfaf5851cdd0ece3c7861c5ac4b54ad839c9dcaa
      https://github.com/Evolveum/midpoint/commit/bfaf5851cdd0ece3c7861c5ac4b54ad839c9dcaa
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertExpressionHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    M model/certification-impl/src/test/resources/common/certification-of-role-inducements.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandler.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java

  Log Message:
  -----------
  Implemented reviewer expressions.


  Commit: 29269d92feb9bbc950a2d3dd72634281d9f56cea
      https://github.com/Evolveum/midpoint/commit/29269d92feb9bbc950a2d3dd72634281d9f56cea
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

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


  Commit: af8f1e9fccc78e6377f61266b246c65d76741c5f
      https://github.com/Evolveum/midpoint/commit/af8f1e9fccc78e6377f61266b246c65d76741c5f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 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

  Log Message:
  -----------
  getMembers helper method


  Commit: ea5cad136117de6c225a090082aba626b3f1b959
      https://github.com/Evolveum/midpoint/commit/ea5cad136117de6c225a090082aba626b3f1b959
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FullTextSearchConfigurationUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertExpressionHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    M model/certification-impl/src/test/resources/common/certification-of-role-inducements.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.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/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.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/expr/ExpressionHandler.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java

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


  Commit: 6f9034498431baf3e6a51c39861d262e7f0ac0a0
      https://github.com/Evolveum/midpoint/commit/6f9034498431baf3e6a51c39861d262e7f0ac0a0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    A model/certification-impl/src/test/resources/common/org-security-team.xml
    M model/certification-impl/src/test/resources/common/user-jack.xml
    M model/certification-impl/src/test/resources/sod/sod-certification.xml

  Log Message:
  -----------
  Ability to specify abstract role as a certification reviewer (expanding when resolving reviewers for cert case).


  Commit: 0d089834a7334c9f7196c86d5f367bb340f79e4d
      https://github.com/Evolveum/midpoint/commit/0d089834a7334c9f7196c86d5f367bb340f79e4d
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  some improvement for full text search


  Commit: 5062b45e851b43edefdc83cd4ffc5246c0c20e43
      https://github.com/Evolveum/midpoint/commit/5062b45e851b43edefdc83cd4ffc5246c0c20e43
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java

  Log Message:
  -----------
  some more improvement for full text search


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

  Changed paths:
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/resources/truststore.jks

  Log Message:
  -----------
  Conntest AD certification update


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/resources/truststore.jks

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


  Commit: c8517b461f4490aaf39025f127f42690915846c6
      https://github.com/Evolveum/midpoint/commit/c8517b461f4490aaf39025f127f42690915846c6
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  MID-3693 Assignment request comment field improvement


  Commit: ab5cbf04501b09337ce0d1e8e1f9362bc04ab69a
      https://github.com/Evolveum/midpoint/commit/ab5cbf04501b09337ce0d1e8e1f9362bc04ab69a
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/resources/truststore.jks

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


  Commit: 64679606a91e58a8850d8f639a365ab9185530b0
      https://github.com/Evolveum/midpoint/commit/64679606a91e58a8850d8f639a365ab9185530b0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java

  Log Message:
  -----------
  Fixed mapping range related logging message.


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

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  improved gitignore


  Commit: 5711993d3e7da5174b2d0b5f8cc90cfbd17038cb
      https://github.com/Evolveum/midpoint/commit/5711993d3e7da5174b2d0b5f8cc90cfbd17038cb
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    A config/rest/swagger.yml

  Log Message:
  -----------
  swagger rest api yaml doc


  Commit: 6423d23fa2556704a60e7e419275a49b9b3a2629
      https://github.com/Evolveum/midpoint/commit/6423d23fa2556704a60e7e419275a49b9b3a2629
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/resources/truststore.jks

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


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

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java

  Log Message:
  -----------
  Mapping range is checked only if condition is true (old or new one).


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

  Changed paths:
    A config/rest/swagger.yml

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


  Commit: eb3526b550eb4814808fd681ec62fc8513589356
      https://github.com/Evolveum/midpoint/commit/eb3526b550eb4814808fd681ec62fc8513589356
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

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

  Log Message:
  -----------
  Search box default configuration (taken from sysConfig)


  Commit: 06a1add5c2294af6cd1558f7bbb10f3d074dea56
      https://github.com/Evolveum/midpoint/commit/06a1add5c2294af6cd1558f7bbb10f3d074dea56
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    A config/rest/swagger.yml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java

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


  Commit: 8b6ab87a8f88a98fc35dff1f85e073dcc6166f43
      https://github.com/Evolveum/midpoint/commit/8b6ab87a8f88a98fc35dff1f85e073dcc6166f43
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
    A samples/rest/query-paging.xml

  Log Message:
  -----------
  fixing query parsing for REST, adding additional sample for query


  Commit: 11cc533819b37e19c7236457cb9e378833663936
      https://github.com/Evolveum/midpoint/commit/11cc533819b37e19c7236457cb9e378833663936
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java

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


  Commit: f2e3bc8778ce6226b754ac65ee97fe958715b818
      https://github.com/Evolveum/midpoint/commit/f2e3bc8778ce6226b754ac65ee97fe958715b818
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 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/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java

  Log Message:
  -----------
  improving error hanlding - REST API


  Commit: ba3982d873f70db65b25e72af0db442af115a813
      https://github.com/Evolveum/midpoint/commit/ba3982d873f70db65b25e72af0db442af115a813
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 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/FocusProcessor.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/common/system-configuration.xml

  Log Message:
  -----------
  Global policy rules also for assignments.


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

  Changed paths:
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Workflow tests with global policy rules for assignments.


  Commit: a9385c415996315c3bf727db94f5ca457bfe4a63
      https://github.com/Evolveum/midpoint/commit/a9385c415996315c3bf727db94f5ca457bfe4a63
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 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/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java

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


  Commit: 17cb2a877cabcce568c565519d5e0cc659eb5fe3
      https://github.com/Evolveum/midpoint/commit/17cb2a877cabcce568c565519d5e0cc659eb5fe3
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M config/rest/swagger.yml
    M gui/admin-gui/pom.xml

  Log Message:
  -----------
  swagger documentation + generated index.html


  Commit: 420f2cedd496c703d864d0622ffcfbf83dd421ff
      https://github.com/Evolveum/midpoint/commit/420f2cedd496c703d864d0622ffcfbf83dd421ff
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 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/FocusProcessor.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/common/system-configuration.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    M model/workflow-impl/testng-integration.xml

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


  Commit: 833b7ff2d588d30e01c9ea99243f8ec776a0868e
      https://github.com/Evolveum/midpoint/commit/833b7ff2d588d30e01c9ea99243f8ec776a0868e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    A config/rest/index.html

  Log Message:
  -----------
  generated swagger doc


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

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/resources/strings/roles-specific/a-test-1.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3x.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3y.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-4.xml
    A testing/story/src/test/resources/strings/roles/global-policy-rules.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-escalation-then-rejection.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-rejection.xml
    R 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
    R testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Simplified TestStrings story test by using global policy rules.


  Commit: 39c5fdd045687b989a7c8ee86f1c6c112e79ccf1
      https://github.com/Evolveum/midpoint/commit/39c5fdd045687b989a7c8ee86f1c6c112e79ccf1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    A config/rest/index.html
    M config/rest/swagger.yml
    M gui/admin-gui/pom.xml

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


  Commit: 406405e44e4cc736f86c7f9254e296b1c48d39b2
      https://github.com/Evolveum/midpoint/commit/406405e44e4cc736f86c7f9254e296b1c48d39b2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.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/processors/primary/PcpChildWfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestSimpleCompletion.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Storing operation business context in workflow process (in "process created" event).


  Commit: 0e2d36add7ad86689199b0c230ff4e87037add8a
      https://github.com/Evolveum/midpoint/commit/0e2d36add7ad86689199b0c230ff4e87037add8a
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

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

  Log Message:
  -----------
  Requester comment fiels is added to work item page


  Commit: c4b42ab46d05aa72fcec26f06b6c16b712af52bd
      https://github.com/Evolveum/midpoint/commit/c4b42ab46d05aa72fcec26f06b6c16b712af52bd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    A config/rest/index.html
    A config/rest/swagger.yml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.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/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/ModelRestService.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/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-impl/src/test/resources/common/system-configuration.xml
    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/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestSimpleCompletion.java
    M model/workflow-impl/testng-integration.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    A samples/rest/query-paging.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/resources/strings/roles-specific/a-test-1.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3x.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3y.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-4.xml
    A testing/story/src/test/resources/strings/roles/global-policy-rules.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-escalation-then-rejection.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-rejection.xml
    R 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
    R testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    M testing/story/testng-integration.xml

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

# Conflicts:
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java


  Commit: 650afd61168ca8ad2f186bce6dcf98502e46e4ae
      https://github.com/Evolveum/midpoint/commit/650afd61168ca8ad2f186bce6dcf98502e46e4ae
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

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

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


  Commit: d4649ff3801596b982aebfd1b461e9a2b788ab4a
      https://github.com/Evolveum/midpoint/commit/d4649ff3801596b982aebfd1b461e9a2b788ab4a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M config/rest/index.html
    M config/rest/swagger.yml
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd

  Log Message:
  -----------
  added PolicyItemDefinitionType to api-types schema. needed for generate/validate methods.. updated swagger doc + generated html


  Commit: 46f874e50fabb7a88ac35a5cf2fb063ffb81c7a2
      https://github.com/Evolveum/midpoint/commit/46f874e50fabb7a88ac35a5cf2fb063ffb81c7a2
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    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/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    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/processors/primary/PcpChildWfTaskCreationInstruction.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/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestSimpleCompletion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/resources/strings/roles-specific/a-test-1.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3x.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3y.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-4.xml
    A testing/story/src/test/resources/strings/roles/global-policy-rules.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-escalation-then-rejection.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-rejection.xml
    R 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
    R 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: 1226980c28e49f64cd6bc4922d989c5b1d1ba563
      https://github.com/Evolveum/midpoint/commit/1226980c28e49f64cd6bc4922d989c5b1d1ba563
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M testing/story/src/test/resources/strings/roles/global-policy-rules.xml

  Log Message:
  -----------
  Fixed story sample + minor GUI 'null' issue


  Commit: ca2ab3c3563d937bf640cd9c8ddc0b83ef5f0864
      https://github.com/Evolveum/midpoint/commit/ca2ab3c3563d937bf640cd9c8ddc0b83ef5f0864
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java

  Log Message:
  -----------
  SoD certification test.


  Commit: 09602fbb4b5f1389d2fb17cd7fba5630a99c8664
      https://github.com/Evolveum/midpoint/commit/09602fbb4b5f1389d2fb17cd7fba5630a99c8664
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    A samples/certification/sod/a-test-2a.xml
    A samples/certification/sod/a-test-2b.xml
    A samples/certification/sod/a-test-3a.xml
    A samples/certification/sod/a-test-3b.xml
    A samples/certification/sod/a-test-3x.xml
    A samples/certification/sod/a-test-3y.xml
    A samples/certification/sod/sod-certification.xml
    A samples/certification/sod/user-jack.xml

  Log Message:
  -----------
  SoD certification samples.


  Commit: 61954b37f118cf47ca5fa208475c0f210fbb162e
      https://github.com/Evolveum/midpoint/commit/61954b37f118cf47ca5fa208475c0f210fbb162e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandlerRegistry.java

  Log Message:
  -----------
  GUI fixes related to SoD certification.


  Commit: 30b1f99da3097d26ed5849451bf06327aaa15afe
      https://github.com/Evolveum/midpoint/commit/30b1f99da3097d26ed5849451bf06327aaa15afe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M config/rest/index.html
    M config/rest/swagger.yml
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd

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


  Commit: 6ae38f2321eed763a0b3d5c10baeeda2b0e9956b
      https://github.com/Evolveum/midpoint/commit/6ae38f2321eed763a0b3d5c10baeeda2b0e9956b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

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

  Log Message:
  -----------
  Fixed TestPasswordPolicyProcessor


  Commit: 7ba07673cb3544cc4d5aa2fb82a6fd1112fc841b
      https://github.com/Evolveum/midpoint/commit/7ba07673cb3544cc4d5aa2fb82a6fd1112fc841b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java

  Log Message:
  -----------
  Fixed NPE in workflows.


  Commit: 2f53ee1f89cc6dcc73c23abb5f94277d5e965500
      https://github.com/Evolveum/midpoint/commit/2f53ee1f89cc6dcc73c23abb5f94277d5e965500
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java

  Log Message:
  -----------
  Simplified getBusinessContext method.


  Commit: 410078721bd3c235f1a82fae84cb7f506ac6802b
      https://github.com/Evolveum/midpoint/commit/410078721bd3c235f1a82fae84cb7f506ac6802b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.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/PolicyRuleProcessor.java

  Log Message:
  -----------
  Fixed another NPE in model. Also saving recomputed (pruned) triples back into the context.


  Commit: 9c254aa199ea015feea86809c118729ad914f200
      https://github.com/Evolveum/midpoint/commit/9c254aa199ea015feea86809c118729ad914f200
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java

  Log Message:
  -----------
  Adapted TestPolicyRules (pruned conflicting roles and their conflicts are no longer present in the evaluated assignment triple)


  Commit: 8048da6220201380c066617d1eb6a9078232132d
      https://github.com/Evolveum/midpoint/commit/8048da6220201380c066617d1eb6a9078232132d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/certification-impl/src/test/resources/common/certification-of-critical-roles.xml
    M model/certification-impl/src/test/resources/common/user-jack.xml
    M model/certification-impl/testng-integration.xml

  Log Message:
  -----------
  Configurable deadline rounding for certification stages.


  Commit: bfe4c39611ba52abe53a332b93eefa006c76dca3
      https://github.com/Evolveum/midpoint/commit/bfe4c39611ba52abe53a332b93eefa006c76dca3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    A config/rest/index.html
    A config/rest/swagger.yml
    M gui/admin-gui/pom.xml
    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/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandlerRegistry.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/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-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/common/common-workflows-3.xsd
    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/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/certification-impl/src/test/resources/common/certification-of-critical-roles.xml
    A model/certification-impl/src/test/resources/common/org-security-team.xml
    M model/certification-impl/src/test/resources/sod/sod-certification.xml
    M model/certification-impl/testng-integration.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.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/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.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/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
    M model/model-impl/src/test/resources/common/system-configuration.xml
    A model/model-impl/src/test/resources/lens/role-judge-situation-only.xml
    A model/model-impl/src/test/resources/lens/role-pirate-situation-only.xml
    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/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestSimpleCompletion.java
    M model/workflow-impl/testng-integration.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    A samples/certification/sod/a-test-2a.xml
    A samples/certification/sod/a-test-2b.xml
    A samples/certification/sod/a-test-3a.xml
    A samples/certification/sod/a-test-3b.xml
    A samples/certification/sod/a-test-3x.xml
    A samples/certification/sod/a-test-3y.xml
    A samples/certification/sod/sod-certification.xml
    A samples/certification/sod/user-jack.xml
    A samples/rest/query-paging.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/resources/strings/roles-specific/a-test-1.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3x.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3y.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-4.xml
    A testing/story/src/test/resources/strings/roles/global-policy-rules.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-escalation-then-rejection.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-rejection.xml
    R 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
    R testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    M testing/story/testng-integration.xml

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


  Commit: 3387256da8b9857bc7732e6ac5addb3c4b8e506d
      https://github.com/Evolveum/midpoint/commit/3387256da8b9857bc7732e6ac5addb3c4b8e506d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M build-system/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PropertyArrayList.java

  Log Message:
  -----------
  (Hopefully) fixed JVM crashes on some certification definitions.


  Commit: b34a2ef2aa2b3ba001bfd896d3928a7808fca6a6
      https://github.com/Evolveum/midpoint/commit/b34a2ef2aa2b3ba001bfd896d3928a7808fca6a6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M .gitignore

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


  Commit: de1b3a88c5e090aacc35159cd5fa60e0a3b6b5cd
      https://github.com/Evolveum/midpoint/commit/de1b3a88c5e090aacc35159cd5fa60e0a3b6b5cd
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ReferenceDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    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/ModelExecuteOptions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.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/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ContextFactory.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/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.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/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/sync/task-user-recompute-light.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Light recompute/clockwork partial execution (MID-3384, MID-1876)


  Commit: f39f00f0856211efa3b6669ee61b26e106abdabb
      https://github.com/Evolveum/midpoint/commit/f39f00f0856211efa3b6669ee61b26e106abdabb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M .gitignore
    M build-system/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PropertyArrayList.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/certification-impl/src/test/resources/common/certification-of-critical-roles.xml
    M model/certification-impl/src/test/resources/common/user-jack.xml
    M model/certification-impl/testng-integration.xml
    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/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java

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


  Commit: 35b261b1c799041e0f47a37e8141cfb0359a21c0
      https://github.com/Evolveum/midpoint/commit/35b261b1c799041e0f47a37e8141cfb0359a21c0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestSimpleCompletion.java

  Log Message:
  -----------
  Requester comment is stored into process start/end events.


  Commit: 914fc8623a76383724e3d7bd68a572f223780b2a
      https://github.com/Evolveum/midpoint/commit/914fc8623a76383724e3d7bd68a572f223780b2a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestSimpleCompletion.java

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


  Commit: 6cd4d4e82ee1a9b78990a3181e81b4a958578bae
      https://github.com/Evolveum/midpoint/commit/6cd4d4e82ee1a9b78990a3181e81b4a958578bae
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

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

  Log Message:
  -----------
  Schema for configurable GUI columns


  Commit: 2cc43c60af45d105a371241d01986d9b80ca647b
      https://github.com/Evolveum/midpoint/commit/2cc43c60af45d105a371241d01986d9b80ca647b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.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 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
    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/projector/PolicyRuleProcessor.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyMetadata.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
    M model/model-impl/testng-unit.xml

  Log Message:
  -----------
  Storing policy triggers in assignments (preliminary version).


  Commit: 8d15793846e8b864bdd8eed8cab394ddcf780f25
      https://github.com/Evolveum/midpoint/commit/8d15793846e8b864bdd8eed8cab394ddcf780f25
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/certification-impl/src/test/resources/sod/a-test-2a.xml
    M model/certification-impl/src/test/resources/sod/a-test-2b.xml
    A model/certification-impl/src/test/resources/sod/a-test-2c.xml

  Log Message:
  -----------
  Enhanced test with 3-way exclusion.


  Commit: 18dcf96cedf7116f9cc672d8530c78c891a29e28
      https://github.com/Evolveum/midpoint/commit/18dcf96cedf7116f9cc672d8530c78c891a29e28
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.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/dto/CertCaseOrDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M samples/certification/sod/a-test-2a.xml
    M samples/certification/sod/a-test-2b.xml
    A samples/certification/sod/a-test-2c.xml
    M samples/certification/sod/sod-certification.xml

  Log Message:
  -----------
  Conflicting objects in certification GUI (SoD certification).


  Commit: 06b423572516c27a17b97723b8a5d756e1dc1367
      https://github.com/Evolveum/midpoint/commit/06b423572516c27a17b97723b8a5d756e1dc1367
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

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

  Log Message:
  -----------
  Fixed schema tests.


  Commit: a988fb9435179348afc3e03cf4ccb29ce6f4a8e2
      https://github.com/Evolveum/midpoint/commit/a988fb9435179348afc3e03cf4ccb29ce6f4a8e2
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Export data from objects list page: just added the button


  Commit: 4cd61efa748333427881820235c93a03e804aebb
      https://github.com/Evolveum/midpoint/commit/4cd61efa748333427881820235c93a03e804aebb
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

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

  Log Message:
  -----------
  Subscription check improvements


  Commit: c77731ff73bb6c8e5cbc0485d04c6e6907eb2634
      https://github.com/Evolveum/midpoint/commit/c77731ff73bb6c8e5cbc0485d04c6e6907eb2634
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml

  Log Message:
  -----------
  Two ugly hacks for unmarshalling (TODO: clean that out!)


  Commit: 9c5a2edecefb6077e654a0be3a10e2c66c1c6bbf
      https://github.com/Evolveum/midpoint/commit/9c5a2edecefb6077e654a0be3a10e2c66c1c6bbf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-05 (Sun, 05 Mar 2017)

  Changed paths:
    M infra/schema/src/test/resources/common/json/no-ns/user-jack.json
    M infra/schema/src/test/resources/common/json/ns/user-jack.json
    M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
    M infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml
    M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml

  Log Message:
  -----------
  Fixing schema tests.


  Commit: e15fa588485068a879d831ff774854d08094986d
      https://github.com/Evolveum/midpoint/commit/e15fa588485068a879d831ff774854d08094986d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
    M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml

  Log Message:
  -----------
  More serious implementation of Saturday's prism hacks.


  Commit: 9091be743d26fe643b3036d832512844bdab167a
      https://github.com/Evolveum/midpoint/commit/9091be743d26fe643b3036d832512844bdab167a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    A model/workflow-impl/src/test/resources/policy/escalation/role-e2.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Writing tests for MID-3799:4 (wrong messages when auto-rejecting work items). In progress.


  Commit: 7a5039926e0730e4820fc814e10c67553c4b6e15
      https://github.com/Evolveum/midpoint/commit/7a5039926e0730e4820fc814e10c67553c4b6e15
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.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/dto/CertCaseOrDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.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/PrismParserImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.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/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/schema/src/test/resources/common/json/no-ns/user-jack.json
    M infra/schema/src/test/resources/common/json/ns/user-jack.json
    M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
    M infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml
    M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/certification-impl/src/test/resources/sod/a-test-2a.xml
    M model/certification-impl/src/test/resources/sod/a-test-2b.xml
    A model/certification-impl/src/test/resources/sod/a-test-2c.xml
    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
    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/projector/PolicyRuleProcessor.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyMetadata.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
    M model/model-impl/testng-unit.xml
    M samples/certification/sod/a-test-2a.xml
    M samples/certification/sod/a-test-2b.xml
    A samples/certification/sod/a-test-2c.xml
    M samples/certification/sod/sod-certification.xml

  Log Message:
  -----------
  Merge branch 'feature/sod-certification'


  Commit: 82421c232458dcaa17c67fd15a357220dda6d1f2
      https://github.com/Evolveum/midpoint/commit/82421c232458dcaa17c67fd15a357220dda6d1f2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

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

  Log Message:
  -----------
  Fixed double removal of already executed triggers.


  Commit: 49fe8680a05e22330ded859e6ad94dd7bf468031
      https://github.com/Evolveum/midpoint/commit/49fe8680a05e22330ded859e6ad94dd7bf468031
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    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/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/policy/StringPolicyUtils.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/policy/ValuePolicyGenerator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    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-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/ExpressionVariables.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/StringPolicyUtils.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicy.java
    A model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
    A model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/password-policy-global.xml
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Value policy generator partial refactoring, check expression (MID-1657)


  Commit: 0c2df16ec4535490acf45802cb37a8ca502a55e8
      https://github.com/Evolveum/midpoint/commit/0c2df16ec4535490acf45802cb37a8ca502a55e8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    A model/model-intest/src/test/resources/password/password-policy-ugly.xml
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml

  Log Message:
  -----------
  Fixing projection password policy (MID-3769)


  Commit: 2964b1994b1368e78b83c0384466706b5a626516
      https://github.com/Evolveum/midpoint/commit/2964b1994b1368e78b83c0384466706b5a626516
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionVariables.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java

  Log Message:
  -----------
  Fixing value policy expressions (MID-1657)


  Commit: a63e0fa8361ab627b0a3927408e63f623dbf61db
      https://github.com/Evolveum/midpoint/commit/a63e0fa8361ab627b0a3927408e63f623dbf61db
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.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/api/WorkItemListener.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/TaskEvent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
    M 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/SummarizeDecisionsInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCompleteListener.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskDeleteListener.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/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/BaseGcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.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/WfTaskController.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
    M model/workflow-impl/src/test/resources/policy/escalation/role-e2.xml
    M model/workflow-impl/src/test/resources/policy/system-configuration.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  When multiple work items are cancelled by timed actions at once (approximately), all of them are marked as completed.
(Internally, only one is completed. All the others are usually cancelled.)


  Commit: 291b132a296a7b3269544ae5668e2c6e845b4367
      https://github.com/Evolveum/midpoint/commit/291b132a296a7b3269544ae5668e2c6e845b4367
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    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/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/policy/StringPolicyUtils.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/policy/ValuePolicyGenerator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    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-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/ExpressionVariables.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/StringPolicyUtils.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicy.java
    A model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
    A model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.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/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/password-policy-global.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/password/password-policy-ugly.xml
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml

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


  Commit: a0e1e51ef1852397d7180cb28c1a523167b2c777
      https://github.com/Evolveum/midpoint/commit/a0e1e51ef1852397d7180cb28c1a523167b2c777
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M repo/repo-test-util/pom.xml

  Log Message:
  -----------
  Added missing dependency.


  Commit: f29db26ffb1a5233f8b25bea10ba4f8fe924cec6
      https://github.com/Evolveum/midpoint/commit/f29db26ffb1a5233f8b25bea10ba4f8fe924cec6
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

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

  Log Message:
  -----------
  some work for configurable columns


  Commit: 6c33c93c2a6aa153f688bfcbe0fabfe103c39853
      https://github.com/Evolveum/midpoint/commit/6c33c93c2a6aa153f688bfcbe0fabfe103c39853
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.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/dto/CertCaseOrDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    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
    R infra/common/src/main/java/com/evolveum/midpoint/common/policy/StringPolicyUtils.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/policy/ValuePolicyGenerator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.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/PrismParserImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.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 infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/schema/src/test/resources/common/json/no-ns/user-jack.json
    M infra/schema/src/test/resources/common/json/ns/user-jack.json
    M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
    M infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml
    M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/certification-impl/src/test/resources/sod/a-test-2a.xml
    M model/certification-impl/src/test/resources/sod/a-test-2b.xml
    A model/certification-impl/src/test/resources/sod/a-test-2c.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    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
    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/ExpressionVariables.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/StringPolicyUtils.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/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/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicy.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyMetadata.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
    A model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
    A model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.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/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/password-policy-global.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/password/password-policy-ugly.xml
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.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/api/WorkItemListener.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/TaskEvent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.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 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/itemApproval/TaskCompleteListener.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskDeleteListener.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/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/BaseGcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.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/WfTaskController.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    A model/workflow-impl/src/test/resources/policy/escalation/role-e2.xml
    M model/workflow-impl/src/test/resources/policy/system-configuration.xml
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M samples/certification/sod/a-test-2a.xml
    M samples/certification/sod/a-test-2b.xml
    A samples/certification/sod/a-test-2c.xml
    M samples/certification/sod/sod-certification.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

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


  Commit: 65e80f9e557498253fa08d15102d41e6d9eb8918
      https://github.com/Evolveum/midpoint/commit/65e80f9e557498253fa08d15102d41e6d9eb8918
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-03-07 (Tue, 07 Mar 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_pl.properties

  Log Message:
  -----------
  New and updated translations.
Cudos to Transifex contributors: petr.gasparik (cs), AivoK (et), wstaszewski (pl), carlos18619 (pt_BR), OlgaMirsanova (ru). Thank you!


Compare: https://github.com/Evolveum/midpoint/compare/6126b4c5c96e...65e80f9e5574


More information about the midPoint-svn mailing list