[midPoint-git] [Evolveum/midpoint] d4649f: added PolicyItemDefinitionType to api-types schema...

[Pavol Mederly]

  Branch: refs/heads/feature/sod-certification
  Home:   https://github.com/Evolveum/midpoint
  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: 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


Compare: https://github.com/Evolveum/midpoint/compare/61954b37f118...30b1f99da309