[midPoint-git] [Evolveum/midpoint] 17a156: MID-2308 fix

[erik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 17a156ad9340ac323ad12e86407eb22d69c5e903
      https://github.com/Evolveum/midpoint/commit/17a156ad9340ac323ad12e86407eb22d69c5e903
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java

  Log Message:
  -----------
  MID-2308 fix


  Commit: 51fae25b871edf748499e5bcb98e54c910926cd6
      https://github.com/Evolveum/midpoint/commit/51fae25b871edf748499e5bcb98e54c910926cd6
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableOrgPopupContent.java

  Log Message:
  -----------
  fix for MID-2300


  Commit: fd02c007e4f660dccc548d0a3105fd693608cdbd
      https://github.com/Evolveum/midpoint/commit/fd02c007e4f660dccc548d0a3105fd693608cdbd
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LookupPropertyModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.java

  Log Message:
  -----------
  MID-2316 fixes.


  Commit: 662699f1f30ca031433d244a74997a2f62981293
      https://github.com/Evolveum/midpoint/commit/662699f1f30ca031433d244a74997a2f62981293
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    A config/initial-objects/010-value-policy.xml
    A config/initial-objects/020-system-configuration.xml
    A config/initial-objects/030-role-superuser.xml
    A config/initial-objects/040-role-enduser.xml
    A config/initial-objects/050-user-administrator.xml
    A config/initial-objects/060-task-cleanup.xml
    A config/initial-objects/070-task-validity.xml
    A config/initial-objects/080-task-trigger.xml
    A config/initial-objects/090-report-audit.xml
    A config/initial-objects/100-report-reconciliation.xml
    A config/initial-objects/107-report-user-accounts.xml
    A config/initial-objects/108-report-user-orgs.xml
    A config/initial-objects/109-report-user-roles.xml
    A config/initial-objects/110-report-user-list.xml
    A config/initial-objects/111-report-reconciliation-shadow-owner.xml
    A config/sql/_all/mysql-upgrade-3.1-3.1.1.sql
    A config/sql/_all/oracle-upgrade-3.1-3.1.1.sql
    A config/sql/_all/postgresql-upgrade-3.1-3.1.1.sql
    A config/sql/_all/sqlserver-upgrade-3.1-3.1.1.sql

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


Compare: https://github.com/Evolveum/midpoint/compare/7b0cf2bdec7c...662699f1f30c