Merge branch 'MDL-66893-master-3' of https://github.com/ryanwyllie/moodle

diff --cc mod/forum/amd/build/grades/grader.min.js
index 72dc9e0,752c449..47b12c8
Binary files differ

diff --cc mod/forum/amd/build/grades/grader.min.js.map
index b904e3b,42c31a9..ebc195e
Binary files differ

diff --cc mod/forum/amd/src/grades/grader.js
index 84e7bf7,1c4f2d7..a8a2b20
--- 1/mod/forum/amd/src/grades/grader.js
--- 2/mod/forum/amd/src/grades/grader.js
+++ b/mod/forum/amd/src/grades/grader.js
@@@ -113,11 -123,9 +124,11 @@@ const launchWholeForumGrading = async(r
          data.gradableItemtype
      );
  
 +    const groupID = data.group ? data.group : 0;
 +
      await Grader.launch(
 -        getUsersForCmidFunction(data.cmid),
 +        getUsersForCmidFunction(data.cmid, groupID),
-         getContentForUserIdFunction(data.cmid),
+         getContentForUserIdFunction(data.cmid, data.experimentalDisplayMode == "1"),
          gradingPanelFunctions.getter,
          gradingPanelFunctions.setter,
          {

diff --cc mod/forum/lang/en/forum.php
index f4426e0,c2f27fb..8efd14f
--- 1/mod/forum/lang/en/forum.php
--- 2/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@@ -333,18 -335,15 +335,21 @@@ $string['generalforum'] = 'Standard for
  $string['generalforums'] = 'General forums';
  $string['gradeitem:forum'] = 'Forum';
  $string['hiddenforumpost'] = 'Hidden forum post';
+ $string['hidegraderpanel'] = 'Hide grader panel';
  $string['hidepreviousrepliescount'] = 'Hide previous replies ({$a})';
+ $string['hideusersearch'] = 'Hide user search';
  $string['indicator:cognitivedepth'] = 'Forum cognitive';
  $string['indicator:cognitivedepth_help'] = 'This indicator is based on the cognitive depth reached by the student in a Forum activity.';
 +$string['indicator:cognitivedepthdef'] = 'Forum cognitive';
 +$string['indicator:cognitivedepthdef_help'] = 'The participant has reached this percentage of the cognitive engagement offered by the Forum activities during this analysis interval (Levels = No view, View, Submit, View feedback, Comment on feedback, Resubmit after viewing feedback)';
 +$string['indicator:cognitivedepthdef_link'] = 'Learning_analytics_indicators#Cognitive_depth';
  $string['indicator:socialbreadth'] = 'Forum social';
  $string['indicator:socialbreadth_help'] = 'This indicator is based on the social breadth reached by the student in a Forum activity.';
 +$string['indicator:socialbreadthdef'] = 'Forum social';
 +$string['indicator:socialbreadthdef_help'] = 'The participant has reached this percentage of the social engagement offered by the Forum activities during this analysis interval (Levels = No participation, Participant alone, Participant with others)';
 +$string['indicator:socialbreadthdef_link'] = 'Learning_analytics_indicators#Social_breadth';
  $string['starredonly'] = 'Search starred discussions only';
+ $string['indexoutoftotal'] = '{$a->index} out of {$a->total}';
  $string['inforum'] = 'in {$a}';
  $string['inreplyto'] = 'In reply to {$a}';
  $string['introblog'] = 'The posts in this forum were copied here automatically from blogs of users in this course because those blog entries are no longer available';

diff --cc theme/boost/style/moodle.css
Simple merge

diff --cc theme/classic/style/moodle.css
Simple merge