Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/…

…moodle.git with conflict resolution
ds125v · Nov 9, 2011 · e3dfd1a · e3dfd1a
2 parents 7d99144 + 274a7d3
commit e3dfd1a
Show file tree

Hide file tree

Showing 161 changed files with 4,603 additions and 3,022 deletions.
diff --git a/admin/mnet/tabs.php b/admin/mnet/tabs.php
@@ -38,7 +38,7 @@
 $strmnetedithost   = get_string('reviewhostdetails', 'mnet');
 
 $logurl = $CFG->wwwroot.
-          '/course/report/log/index.php?chooselog=1&amp;showusers=1&amp;showcourses=1&amp;host_course='.$mnet_peer->id.
+          '/report/log/index.php?chooselog=1&amp;showusers=1&amp;showcourses=1&amp;host_course='.$mnet_peer->id.
           '%2F1&amp;user='.'0'.
           '&amp;date=0'.
           '&amp;modid=&amp;modaction=0&amp;logformat=showashtml';

diff --git a/admin/report/configlog/settings.php b/admin/report/configlog/settings.php
diff --git a/admin/report/courseoverview/db/access.php b/admin/report/courseoverview/db/access.php
diff --git a/admin/report/courseoverview/index.php b/admin/report/courseoverview/index.php
diff --git a/admin/report/courseoverview/reportsgraph.php b/admin/report/courseoverview/reportsgraph.php
diff --git a/admin/report/courseoverview/settings.php b/admin/report/courseoverview/settings.php
diff --git a/admin/report/courseoverview/version.php b/admin/report/courseoverview/version.php
diff --git a/admin/report/log/settings.php b/admin/report/log/settings.php
diff --git a/admin/report/questioninstances/db/access.php b/admin/report/questioninstances/db/access.php
diff --git a/admin/report/questioninstances/settings.php b/admin/report/questioninstances/settings.php
diff --git a/admin/report/questioninstances/version.php b/admin/report/questioninstances/version.php
diff --git a/admin/report/security/db/access.php b/admin/report/security/db/access.php
diff --git a/admin/report/security/settings.php b/admin/report/security/settings.php