[midPoint-git] [Evolveum/midpoint] 77caa0: fix resource XMLs

[gpalos]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 77caa015e7b24d3b4be18994b97cda0441943225
      https://github.com/Evolveum/midpoint/commit/77caa015e7b24d3b4be18994b97cda0441943225
  Author: gpalos <gustav.palos at gmail.com>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    M samples/resources/scriptedrest/bitbucket/SearchScript.groovy
    M samples/resources/scriptedrest/bitbucket/UpdateScript.groovy
    M samples/resources/scriptedrest/bitbucket/resource.xml
    M samples/resources/scriptedrest/confluence-wiki/resource.xml
    M samples/resources/scriptedrest/jira/resource.xml

  Log Message:
  -----------
  fix resource XMLs
update foto for bitbucket finished
convert foto to JPG in read for midPoint


  Commit: b97d75b54e590f51a3048009be80474a00face41
      https://github.com/Evolveum/midpoint/commit/b97d75b54e590f51a3048009be80474a00face41
  Author: gpalos <gustav.palos at gmail.com>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java

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


Compare: https://github.com/Evolveum/midpoint/compare/6a04d691ba90...b97d75b54e59