[midPoint-git] [Evolveum/midpoint] 6950e3: MID-4043 fix

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6950e31e1c18df460701ecf925cf509744d46f9f
      https://github.com/Evolveum/midpoint/commit/6950e31e1c18df460701ecf925cf509744d46f9f
  Author: honchar <honchar at evolveum.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectLinkColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  MID-4043 fix


  Commit: 471f518694c4d31cf086e83d0a947c3b18003989
      https://github.com/Evolveum/midpoint/commit/471f518694c4d31cf086e83d0a947c3b18003989
  Author: honchar <honchar at evolveum.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M build-system/pom.xml
    R config/sql/_all/h2-3.5-all.sql
    A config/sql/_all/h2-3.6-all.sql
    R config/sql/_all/h2-upgrade-3.4-3.5.sql
    A config/sql/_all/h2-upgrade-3.5-3.6.sql
    R config/sql/_all/mysql-3.5-all.sql
    A config/sql/_all/mysql-3.6-all.sql
    R config/sql/_all/mysql-upgrade-3.4-3.5.sql
    A config/sql/_all/mysql-upgrade-3.5-3.6.sql
    R config/sql/_all/oracle-3.5-all.sql
    A config/sql/_all/oracle-3.6-all.sql
    R config/sql/_all/oracle-upgrade-3.4-3.5.sql
    A config/sql/_all/oracle-upgrade-3.5-3.6.sql
    R config/sql/_all/postgresql-3.5-all.sql
    A config/sql/_all/postgresql-3.6-all.sql
    R config/sql/_all/postgresql-upgrade-3.4-3.5.sql
    A config/sql/_all/postgresql-upgrade-3.5-3.6.sql
    R config/sql/_all/sqlserver-3.5-all.sql
    A config/sql/_all/sqlserver-3.6-all.sql
    R config/sql/_all/sqlserver-upgrade-3.4-3.5.sql
    A config/sql/_all/sqlserver-upgrade-3.5-3.6.sql
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml
    M testing/conntest/src/test/resources/logback-test.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/141586af8a20...471f518694c4