[midPoint-git] [Evolveum/midpoint] 40d32c: Fixing conversion from scripting expression to Exe...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 40d32c4c1df6275c565a20bb723aa1172750dc1d
      https://github.com/Evolveum/midpoint/commit/40d32c4c1df6275c565a20bb723aa1172750dc1d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/JaxbHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ScriptingJaxbUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

  Log Message:
  -----------
  Fixing conversion from scripting expression to ExecuteScriptType. Allowing ExecuteScriptType in GUI.


  Commit: 31f17a2d3dad67fa1f85d5ee468be8f7b4fa49a6
      https://github.com/Evolveum/midpoint/commit/31f17a2d3dad67fa1f85d5ee468be8f7b4fa49a6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 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 infra/schema/src/main/resources/localization/schema.properties

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


Compare: https://github.com/Evolveum/midpoint/compare/93e47a231fcc...31f17a2d3dad