[midPoint-git] [Evolveum/midpoint] bbd76b: fixing label for assignments (showing tenant and o...

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: bbd76b5b86b0ce7f43ac7817902b372f86529872
      https://github.com/Evolveum/midpoint/commit/bbd76b5b86b0ce7f43ac7817902b372f86529872
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

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

  Log Message:
  -----------
  fixing label for assignments (showing tenant and org if defined)


  Commit: d775942c02d56f914a9cde1f2abde364c016a26e
      https://github.com/Evolveum/midpoint/commit/d775942c02d56f914a9cde1f2abde364c016a26e
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java

  Log Message:
  -----------
  support for midpoint and log libraries for reports.. small refactoring..


  Commit: 21476d1fb0e02a836d4ea1bb15f798c8f4b7cec0
      https://github.com/Evolveum/midpoint/commit/21476d1fb0e02a836d4ea1bb15f798c8f4b7cec0
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml

  Log Message:
  -----------
  Test for and filter (Ref + ref)


  Commit: 6ebe1dce2ed33533c130dce2a9c1cc244e9725d1
      https://github.com/Evolveum/midpoint/commit/6ebe1dce2ed33533c130dce2a9c1cc244e9725d1
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M config/sql/_all/h2-upgrade-3.2-3.3.sql
    M config/sql/_all/mysql-upgrade-3.2-3.3.sql
    M config/sql/_all/oracle-upgrade-3.2-3.3.sql
    M config/sql/_all/postgresql-upgrade-3.2-3.3.sql
    M config/sql/_all/sqlserver-upgrade-3.2-3.3.sql
    A config/sql/midpoint/3.2/mysql/mysql-3.2-norm.sql
    A config/sql/midpoint/3.2/mysql/mysql-schema-norm.sql
    A config/sql/midpoint/3.2/mysql/mysql-schema.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/StringResourceChoiceRenderer.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/TestActivationComputer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
    M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/EntityDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M samples/objects/simple-notifications.xml

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

Conflicts:
	repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java


Compare: https://github.com/Evolveum/midpoint/compare/4bdfe429eb9c...6ebe1dce2ed3