[midPoint-git] [Evolveum/midpoint] 00e7ec: fixing reports..

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 00e7ec0d7698cb0d1eae746e40d33534d2facd19
      https://github.com/Evolveum/midpoint/commit/00e7ec0d7698cb0d1eae746e40d33534d2facd19
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/resources/common/user-administrator.xml
    M model/report-impl/src/test/resources/ctx-report-test-main.xml
    M model/report-impl/src/test/resources/reports/report-sample.xml
    M model/report-impl/src/test/resources/reports/report-test-valid.xml
    M model/report-impl/src/test/resources/reports/report-test.xml
    M model/report-impl/src/test/resources/reports/reportDataSourceTest.jrxml
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml
    M model/report-impl/src/test/resources/reports/reportUserAccounts.xml
    M model/report-impl/src/test/resources/reports/reportUserList.xml
    M model/report-impl/src/test/resources/reports/reportUserOrgs.xml
    M model/report-impl/src/test/resources/reports/reportUserRoles.xml
    M model/report-impl/src/test/resources/styles/midpoint_base_styles.jrtx
    M model/report-impl/testng.xml

  Log Message:
  -----------
  fixing reports..


  Commit: c815c0b5295648f640cd6ba0a66a2ed30922ca3d
      https://github.com/Evolveum/midpoint/commit/c815c0b5295648f640cd6ba0a66a2ed30922ca3d
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/resources/reports/report-test-without-design.xml
    M model/report-impl/src/test/resources/reports/report-test.xml
    M model/report-impl/src/test/resources/reports/reportAuditLogs.jrxml
    M model/report-impl/src/test/resources/reports/reportAuditLogs.xml
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml
    M model/report-impl/src/test/resources/reports/reportUserAccounts.xml
    M model/report-impl/src/test/resources/reports/reportUserList.xml
    M model/report-impl/src/test/resources/reports/reportUserOrgs.xml
    M model/report-impl/src/test/resources/reports/reportUserRoles.xml

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

Conflicts:
	model/report-impl/src/test/resources/reports/report-test.xml
	model/report-impl/src/test/resources/reports/reportReconciliation.xml
	model/report-impl/src/test/resources/reports/reportUserAccounts.xml
	model/report-impl/src/test/resources/reports/reportUserList.xml
	model/report-impl/src/test/resources/reports/reportUserOrgs.xml
	model/report-impl/src/test/resources/reports/reportUserRoles.xml


  Commit: d92957e8944ee5b270b262db6f91edcbbc5e79c8
      https://github.com/Evolveum/midpoint/commit/d92957e8944ee5b270b262db6f91edcbbc5e79c8
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/resources/common/user-administrator.xml

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

Conflicts:
	model/report-impl/src/test/resources/common/user-administrator.xml

fixing MID-1910.


Compare: https://github.com/Evolveum/midpoint/compare/fc3d62117aab...d92957e8944e