Moodle release 3.4

NOBUG: Change travis.yml to MOODLE_34_STABLE
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-11-11 19:31:19 +01:00 · 2017-11-11 19:31:18 +01:00 · 2017-11-11 19:31:14 +01:00 · 2017-11-11 13:03:54 +01:00 · 2017-11-11 22:28:38 +13:00 · 2017-11-11 00:05:36 +00:00
573 changed files with 6172 additions and 3203 deletions
@@ -13,7 +13,7 @@ language: php

 php:
    # We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
-    - 7.1
+    - 7.2
    - 7.0

 addons:
@@ -30,7 +30,7 @@ env:
    # Although we want to run these jobs and see failures as quickly as possible, we also want to get the slowest job to
    # start first so that the total run time is not too high.
    #
-    # We only run MySQL on PHP 7.1, so run that first.
+    # We only run MySQL on PHP 7.2, so run that first.
    # CI Tests should be second-highest in priority as these only take <= 60 seconds to run under normal circumstances.
    # Postgres is significantly is pretty reasonable in its run-time.

@@ -54,12 +54,12 @@ matrix:

    include:
          # Run grunt/npm install on highest version ('node' is an alias for the latest node.js version.)
-        - php: 7.1
+        - php: 7.2
          env: DB=none     TASK=GRUNT   NVM_VERSION='8.9'

    exclude:
        # MySQL - it's just too slow.
-        # Exclude it on all versions except for 7.1
+        # Exclude it on all versions except for 7.2

        - env: DB=mysqli   TASK=PHPUNIT
          php: 7.0
@@ -204,7 +204,7 @@ before_script:
        # We need the official upstream for comparison
        git remote add upstream https://github.com/moodle/moodle.git;

-        git fetch upstream master;
+        git fetch upstream MOODLE_34_STABLE;
        export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
        export GIT_COMMIT="$TRAVIS_COMMIT";
        export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`
@@ -264,8 +264,13 @@ class models_list implements \renderable, \templatable {
        } else {
            $url = new \moodle_url('/admin/settings.php', array('section' => 'analyticssettings'),
                'id_s_analytics_onlycli');
+
+            $langstrid = 'clievaluationandpredictionsnoadmin';
+            if (is_siteadmin()) {
+                $langstrid = 'clievaluationandpredictions';
+            }
            $data->infos = array(
-                (object)array('message' => get_string('clievaluationandpredictions', 'tool_analytics', $url->out()),
+                (object)array('message' => get_string($langstrid, 'tool_analytics', $url->out()),
                    'closebutton' => true)
            );
        }
@@ -117,12 +117,21 @@ function tool_analytics_calculate_course_dates($course, $options) {

    $notification = $course->shortname . ' (id = ' . $course->id . '): ';

+    $originalenddate = null;
+    $guessedstartdate = null;
+    $guessedenddate = null;
+    $samestartdate = null;
+    $lowerenddate = null;
+
    if ($options['guessstart'] || $options['guessall']) {

        $originalstartdate = $course->startdate;

        $guessedstartdate = $courseman->guess_start();
-        if ($guessedstartdate == $originalstartdate) {
+        $samestartdate = ($guessedstartdate == $originalstartdate);
+        $lowerenddate = ($course->enddate && ($course->enddate < $guessedstartdate));
+
+        if ($samestartdate) {
            if (!$guessedstartdate) {
                $notification .= PHP_EOL . '  ' . get_string('cantguessstartdate', 'tool_analytics');
            } else {
@@ -131,6 +140,9 @@ function tool_analytics_calculate_course_dates($course, $options) {
            }
        } else if (!$guessedstartdate) {
            $notification .= PHP_EOL . '  ' . get_string('cantguessstartdate', 'tool_analytics');
+        } else if ($lowerenddate) {
+            $notification .= PHP_EOL . '  ' . get_string('cantguessstartdate', 'tool_analytics') . ': ' .
+                get_string('enddatebeforestartdate', 'error') . ' - ' . userdate($guessedstartdate);
        } else {
            // Update it to something we guess.

@@ -151,16 +163,21 @@ function tool_analytics_calculate_course_dates($course, $options) {

    if ($options['guessend'] || $options['guessall']) {

+        if (!empty($lowerenddate) && !empty($guessedstartdate)) {
+            $course->startdate = $guessedstartdate;
+        }
+
        $originalenddate = $course->enddate;

        $format = course_get_format($course);
        $formatoptions = $format->get_format_options();

-        if ($course->format === 'weeks' && $formatoptions['automaticenddate']) {
-            // Special treatment for weeks with automatic end date.
+        // Change this for a course formats API level call in MDL-60702.
+        if (method_exists($format, 'update_end_date') && $formatoptions['automaticenddate']) {
+            // Special treatment for weeks-based formats with automatic end date.

            if ($options['update']) {
-                format_weeks::update_end_date($course->id);
+                $format::update_end_date($course->id);
                $course->enddate = $DB->get_field('course', 'enddate', array('id' => $course->id));
                $notification .= PHP_EOL . '  ' . get_string('weeksenddateautomaticallyset', 'tool_analytics') . ': ' .
                    userdate($course->enddate);
@@ -195,10 +212,8 @@ function tool_analytics_calculate_course_dates($course, $options) {
                    $updateit = true;
                }

-                if ($options['update']) {
-                    if ($course->enddate > $course->startdate) {
-                        update_course($course);
-                    }
+                if ($options['update'] && $updateit) {
+                    update_course($course);
                }
            }
        }
@@ -33,6 +33,7 @@ $string['clearpredictions'] = 'Clear predictions';
 $string['clearmodelpredictions'] = 'Are you sure you want to clear all "{$a}" predictions?';
 $string['clienablemodel'] = 'You can enable the model by selecting a time-splitting method by its ID. Note that you can also enable it later using the web interface (\'none\' to exit).';
 $string['clievaluationandpredictions'] = 'A scheduled task iterates through enabled models and gets predictions. Models evaluation via the web interface is disabled. You can allow these processes to be executed manually via the web interface by disabling the <a href="{$a}">\'onlycli\'</a> analytics setting.';
+$string['clievaluationandpredictionsnoadmin'] = 'A scheduled task iterates through enabled models and gets predictions. Models evaluation via the web interface is disabled. It may be enabled by a site administrator.';
 $string['editmodel'] = 'Edit "{$a}" model';
 $string['edittrainedwarning'] = 'This model has already been trained. Note that changing its indicators or its time-splitting method will delete its previous predictions and start generating new predictions.';
 $string['enabled'] = 'Enabled';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_analytics'; // Full name of the plugin (used for diagnostics).
@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;
-$plugin->requires  = 2017050500;
+$plugin->version   = 2017111300;
+$plugin->requires  = 2017110800;
 $plugin->component = 'tool_assignmentupgrade';
-$plugin->dependencies = array('mod_assign' => 2017050500);
+$plugin->dependencies = array('mod_assign' => 2017110800);
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500;
-$plugin->requires = 2017050500;
+$plugin->version = 2017111300;
+$plugin->requires = 2017110800;
 $plugin->component = 'tool_availabilityconditions';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;   // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;   // Requires this Moodle version
+$plugin->version   = 2017111300;   // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;   // Requires this Moodle version
 $plugin->component = 'tool_behat'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_capability'; // Full name of the plugin (used for diagnostics).
@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_cohortroles'; // Full name of the plugin (used for diagnostics).

 $plugin->dependencies = array(
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;
-$plugin->requires  = 2017050500;
+$plugin->version   = 2017111300;
+$plugin->requires  = 2017110800;
 $plugin->component = 'tool_customlang'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_dbtransfer'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500;
-$plugin->requires = 2017050500;
+$plugin->version = 2017111300;
+$plugin->requires = 2017110800;
 $plugin->component = 'tool_filetypes';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500;
-$plugin->requires = 2017050500;
+$plugin->version = 2017111300;
+$plugin->requires = 2017110800;
 $plugin->component = 'tool_generator';
@@ -25,8 +25,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_health'; // Full name of the plugin (used for diagnostics)

 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017082500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017082400; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_httpsreplace'; // Full name of the plugin (used for diagnostics).
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_innodb'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component  = 'tool_installaddon';
-$plugin->version    = 2017051500;
-$plugin->requires   = 2017050500;
+$plugin->version    = 2017111300;
+$plugin->requires   = 2017110800;
 $plugin->maturity   = MATURITY_STABLE;
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_langimport'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017062600; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2017050500; // Requires this Moodle version.
+$plugin->version = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2017110800; // Requires this Moodle version.
 $plugin->component = 'logstore_database'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2017050500; // Requires this Moodle version.
+$plugin->version = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2017110800; // Requires this Moodle version.
 $plugin->component = 'logstore_legacy'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2017050500; // Requires this Moodle version.
+$plugin->version = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2017110800; // Requires this Moodle version.
 $plugin->component = 'logstore_standard'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2017050500; // Requires this Moodle version.
+$plugin->version = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_log'; // Full name of the plugin (used for diagnostics).
@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2017062700; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_lp'; // Full name of the plugin (used for diagnostics).
@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_lpimportcsv'; // Full name of the plugin (used for diagnostics).
-$plugin->dependencies = array('tool_lp' => 2017050500);
+$plugin->dependencies = array('tool_lp' => 2017110800);

@@ -24,8 +24,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_lpmigrate'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
    'tool_lp' => ANY_VERSION
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;
-$plugin->requires  = 2017050500;
+$plugin->version   = 2017111300;
+$plugin->requires  = 2017110800;
 $plugin->component = 'tool_messageinbound';
@@ -23,9 +23,9 @@
 */

 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2017051501; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_mobile'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'webservice_rest' => 2017050500
+    'webservice_rest' => 2017110800
 );
@@ -26,6 +26,6 @@

 defined('MOODLE_INTERNAL') || die;

-$plugin->version   = 2017051500;     // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500;     // Requires this Moodle version.
+$plugin->version   = 2017111300;     // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800;     // Requires this Moodle version.
 $plugin->component = 'tool_monitor'; // Full name of the plugin (used for diagnostics).
@@ -25,7 +25,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_multilangupgrade'; // Full name of the plugin (used for diagnostics)

@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_oauth2'; // Full name of the plugin (used for diagnostics).

@@ -74,7 +74,7 @@ if ($options['run']) {
        }
    }
    $_SERVER['argv'] = array_values($_SERVER['argv']);
-    PHPUnit_TextUI_Command::main();
+    PHPUnit\TextUI\Command::main();
    exit(0);
 }

@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_phpunit'; // Full name of the plugin (used for diagnostics)

@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_profiling'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_recyclebin'; // Full name of the plugin (used for diagnostics).
@@ -25,8 +25,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_replace'; // Full name of the plugin (used for diagnostics)

 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level
@@ -25,7 +25,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;
-$plugin->requires  = 2017050500;
+$plugin->version   = 2017111300;
+$plugin->requires  = 2017110800;
 $plugin->component = 'tool_spamcleaner'; // Full name of the plugin (used for diagnostics)

@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_task'; // Full name of the plugin (used for diagnostics)

@@ -21,6 +21,6 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500; // Requires this Moodle version.
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // Requires this Moodle version.
 $plugin->component = 'tool_templatelibrary'; // Full name of the plugin (used for diagnostics).
@@ -25,7 +25,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_unsuproles'; // Full name of the plugin (used for diagnostics)

@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;            // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500;            // Requires this Moodle version.
+$plugin->version   = 2017111300;            // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800;            // Requires this Moodle version.
 $plugin->component = 'tool_uploadcourse';   // Full name of the plugin (used for diagnostics).
@@ -25,7 +25,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_uploaduser'; // Full name of the plugin (used for diagnostics)

@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;            // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500;            // Requires this Moodle version.
+$plugin->version   = 2017111300;            // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800;            // Requires this Moodle version.
 $plugin->component = 'tool_usertours';      // Full name of the plugin (used for diagnostics).
@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500; // Requires this Moodle version
+$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800; // Requires this Moodle version
 $plugin->component = 'tool_xmldb'; // Full name of the plugin (used for diagnostics)

@@ -356,7 +356,7 @@ class course implements \core_analytics\analysable {
        $monthsago = time() - (WEEKSECS * 4 * 2);
        $select = $filterselect . ' AND timeaccess > :timeaccess';
        $params = $filterparams + array('timeaccess' => $monthsago);
-        $sql = "SELECT timeaccess FROM {user_lastaccess} ula
+        $sql = "SELECT DISTINCT timeaccess FROM {user_lastaccess} ula
                  JOIN {enrol} e ON e.courseid = ula.courseid
                  JOIN {user_enrolments} ue ON e.id = ue.enrolid AND ue.userid = ula.userid
                 WHERE $select";
@@ -364,7 +364,7 @@ class course implements \core_analytics\analysable {
            return 0;
        }

-        $sql = "SELECT timeaccess FROM {user_lastaccess} ula
+        $sql = "SELECT DISTINCT timeaccess FROM {user_lastaccess} ula
                  JOIN {enrol} e ON e.courseid = ula.courseid
                  JOIN {user_enrolments} ue ON e.id = ue.enrolid AND ue.userid = ula.userid
                 WHERE $filterselect AND ula.timeaccess != 0
@@ -547,172 +547,6 @@ class course implements \core_analytics\analysable {
        return $grades;
    }

-    /**
-     * Guesses all activities that were available during a period of time.
-     *
-     * @param string $activitytype
-     * @param int $starttime
-     * @param int $endtime
-     * @param \stdClass $student
-     * @return array
-     */
-    public function get_activities($activitytype, $starttime, $endtime, $student = false) {
-
-        // Var $student may not be available, default to not calculating dynamic data.
-        $studentid = -1;
-        if ($student) {
-            $studentid = $student->id;
-        }
-        $modinfo = get_fast_modinfo($this->get_course_data(), $studentid);
-        $activities = $modinfo->get_instances_of($activitytype);
-
-        $timerangeactivities = array();
-        foreach ($activities as $activity) {
-            if (!$this->completed_by($activity, $starttime, $endtime)) {
-                continue;
-            }
-
-            $timerangeactivities[$activity->context->id] = $activity;
-        }
-
-        return $timerangeactivities;
-    }
-
-    /**
-     * Was the activity supposed to be completed during the provided time range?.
-     *
-     * @param \cm_info $activity
-     * @param int $starttime
-     * @param int $endtime
-     * @return bool
-     */
-    protected function completed_by(\cm_info $activity, $starttime, $endtime) {
-
-        // We can't check uservisible because:
-        // - Any activity with available until would not be counted.
-        // - Sites may block student's course view capabilities once the course is closed.
-
-        // Students can not view hidden activities by default, this is not reliable 100% but accurate in most of the cases.
-        if ($activity->visible === false) {
-            return false;
-        }
-
-        // We skip activities that were not yet visible or their 'until' was not in this $starttime - $endtime range.
-        if ($activity->availability) {
-            $info = new \core_availability\info_module($activity);
-            $activityavailability = $this->availability_completed_by($info, $starttime, $endtime);
-            if ($activityavailability === false) {
-                return false;
-            } else if ($activityavailability === true) {
-                // This activity belongs to this time range.
-                return true;
-            }
-        }
-
-        // We skip activities in sections that were not yet visible or their 'until' was not in this $starttime - $endtime range.
-        $section = $activity->get_modinfo()->get_section_info($activity->sectionnum);
-        if ($section->availability) {
-            $info = new \core_availability\info_section($section);
-            $sectionavailability = $this->availability_completed_by($info, $starttime, $endtime);
-            if ($sectionavailability === false) {
-                return false;
-            } else if ($sectionavailability === true) {
-                // This activity belongs to this section time range.
-                return true;
-            }
-        }
-
-        // When the course is using format weeks we use the week's end date.
-        $format = course_get_format($activity->get_modinfo()->get_course());
-        if ($this->get_course_data()->format === 'weeks') {
-            $dates = $format->get_section_dates($section);
-
-            // We need to consider the +2 hours added by get_section_dates.
-            // Avoid $starttime <= $dates->end because $starttime may be the start of the next week.
-            if ($starttime < ($dates->end - 7200) && $endtime >= ($dates->end - 7200)) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        if ($activity->sectionnum == 0) {
-            return false;
-        }
-
-        if (!$this->get_end() || !$this->get_start()) {
-            debugging('Activities which due date is in a time range can not be calculated ' .
-                'if the course doesn\'t have start and end date', DEBUG_DEVELOPER);
-            return false;
-        }
-
-        if (!course_format_uses_sections($this->get_course_data()->format)) {
-            // If it does not use sections and there are no availability conditions to access it it is available
-            // and we can not magically classify it into any other time range than this one.
-            return true;
-        }
-
-        // Split the course duration in the number of sections and consider the end of each section the due
-        // date of all activities contained in that section.
-        $formatoptions = $format->get_format_options();
-        if (!empty($formatoptions['numsections'])) {
-            $nsections = $formatoptions['numsections'];
-        } else {
-            // There are course format that use sections but without numsections, we fallback to the number
-            // of cached sections in get_section_info_all, not that accurate though.
-            $coursesections = $activity->get_modinfo()->get_section_info_all();
-            $nsections = count($coursesections);
-            if (isset($coursesections[0])) {
-                // We don't count section 0 if it exists.
-                $nsections--;
-            }
-        }
-
-        $courseduration = $this->get_end() - $this->get_start();
-        $sectionduration = round($courseduration / $nsections);
-        $activitysectionenddate = $this->get_start() + ($sectionduration * $activity->sectionnum);
-        if ($activitysectionenddate > $starttime && $activitysectionenddate <= $endtime) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if the activity/section should have been completed during the provided period according to its availability rules.
-     *
-     * @param \core_availability\info $info
-     * @param int $starttime
-     * @param int $endtime
-     * @return bool|null
-     */
-    protected function availability_completed_by(\core_availability\info $info, $starttime, $endtime) {
-
-        $dateconditions = $info->get_availability_tree()->get_all_children('\availability_date\condition');
-        foreach ($dateconditions as $condition) {
-            // Availability API does not allow us to check from / to dates nicely, we need to be naughty.
-            $conditiondata = $condition->save();
-
-            if ($conditiondata->d === \availability_date\condition::DIRECTION_FROM &&
-                    $conditiondata->t > $endtime) {
-                // Skip this activity if any 'from' date is later than the end time.
-                return false;
-
-            } else if ($conditiondata->d === \availability_date\condition::DIRECTION_UNTIL &&
-                    ($conditiondata->t < $starttime || $conditiondata->t > $endtime)) {
-                // Skip activity if any 'until' date is not in $starttime - $endtime range.
-                return false;
-            } else if ($conditiondata->d === \availability_date\condition::DIRECTION_UNTIL &&
-                    $conditiondata->t < $endtime && $conditiondata->t > $starttime) {
-                return true;
-            }
-        }
-
-        // This can be interpreted as 'the activity was available but we don't know if its expected completion date
-        // was during this period.
-        return null;
-    }
-
    /**
     * Used by get_user_ids to extract the user id.
     *
@@ -35,6 +35,13 @@ defined('MOODLE_INTERNAL') || die();
 */
 abstract class community_of_inquiry_activity extends linear {

+    /**
+     * instancedata
+     *
+     * @var array
+     */
+    protected $instancedata = array();
+
    /**
     * @var \core_analytics\course
     */
@@ -478,8 +485,8 @@ abstract class community_of_inquiry_activity extends linear {
            // Samples are at cm level or below.
            $useractivities = array(\context_module::instance($cm->id)->id => $cm);
        } else {
-            // All course activities.
-            $useractivities = $this->course->get_activities($this->get_activity_type(), $starttime, $endtime, $user);
+            // Activities that should be completed during this time period.
+            $useractivities = $this->get_activities($starttime, $endtime, $user);
        }

        return $useractivities;
@@ -741,6 +748,250 @@ abstract class community_of_inquiry_activity extends linear {
        $this->grades = $course->get_student_grades($courseactivities);
    }

+    /**
+     * Guesses all activities that were available during a period of time.
+     *
+     * @param int $starttime
+     * @param int $endtime
+     * @param \stdClass|false $student
+     * @return array
+     */
+    protected function get_activities($starttime, $endtime, $student = false) {
+
+        $activitytype = $this->get_activity_type();
+
+        // Var $student may not be available, default to not calculating dynamic data.
+        $studentid = -1;
+        if ($student) {
+            $studentid = $student->id;
+        }
+        $modinfo = get_fast_modinfo($this->course->get_course_data(), $studentid);
+        $activities = $modinfo->get_instances_of($activitytype);
+
+        $timerangeactivities = array();
+        foreach ($activities as $activity) {
+
+            if (!$this->activity_completed_by($activity, $starttime, $endtime, $student)) {
+                continue;
+            }
+
+            $timerangeactivities[$activity->context->id] = $activity;
+        }
+
+        return $timerangeactivities;
+    }
+
+    /**
+     * Was the activity supposed to be completed during the provided time range?.
+     *
+     * @param \cm_info $activity
+     * @param int $starttime
+     * @param int $endtime
+     * @param \stdClass|false $student
+     * @return bool
+     */
+    protected function activity_completed_by(\cm_info $activity, $starttime, $endtime, $student = false) {
+
+        // We can't check uservisible because:
+        // - Any activity with available until would not be counted.
+        // - Sites may block student's course view capabilities once the course is closed.
+
+        // Students can not view hidden activities by default, this is not reliable 100% but accurate in most of the cases.
+        if ($activity->visible === false) {
+            return false;
+        }
+
+        // Give priority to the different methods activities have to set a "due" date.
+        $return = $this->activity_type_completed_by($activity, $starttime, $endtime, $student);
+        if (!is_null($return)) {
+            // Method activity_type_completed_by returns null if there is no due date method or there is but it is not set.
+            return $return;
+        }
+
+        // We skip activities that were not yet visible or their 'until' was not in this $starttime - $endtime range.
+        if ($activity->availability) {
+            $info = new \core_availability\info_module($activity);
+            $activityavailability = $this->availability_completed_by($info, $starttime, $endtime);
+            if ($activityavailability === false) {
+                return false;
+            } else if ($activityavailability === true) {
+                // This activity belongs to this time range.
+                return true;
+            }
+        }
+
+        // We skip activities in sections that were not yet visible or their 'until' was not in this $starttime - $endtime range.
+        $section = $activity->get_modinfo()->get_section_info($activity->sectionnum);
+        if ($section->availability) {
+            $info = new \core_availability\info_section($section);
+            $sectionavailability = $this->availability_completed_by($info, $starttime, $endtime);
+            if ($sectionavailability === false) {
+                return false;
+            } else if ($sectionavailability === true) {
+                // This activity belongs to this section time range.
+                return true;
+            }
+        }
+
+        // When the course is using format weeks we use the week's end date.
+        $format = course_get_format($activity->get_modinfo()->get_course());
+        // We should change this in MDL-60702.
+        if (method_exists($format, 'get_section_dates')) {
+            $dates = $format->get_section_dates($section);
+
+            // We need to consider the +2 hours added by get_section_dates.
+            // Avoid $starttime <= $dates->end because $starttime may be the start of the next week.
+            if ($starttime < ($dates->end - 7200) && $endtime >= ($dates->end - 7200)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        if ($activity->sectionnum == 0) {
+            return false;
+        }
+
+        if (!$this->course->get_end() || !$this->course->get_start()) {
+            debugging('Activities which due date is in a time range can not be calculated ' .
+                'if the course doesn\'t have start and end date', DEBUG_DEVELOPER);
+            return false;
+        }
+
+        if (!course_format_uses_sections($this->course->get_course_data()->format)) {
+            // If it does not use sections and there are no availability conditions to access it it is available
+            // and we can not magically classify it into any other time range than this one.
+            return true;
+        }
+
+        // Split the course duration in the number of sections and consider the end of each section the due
+        // date of all activities contained in that section.
+        $formatoptions = $format->get_format_options();
+        if (!empty($formatoptions['numsections'])) {
+            $nsections = $formatoptions['numsections'];
+        } else {
+            // There are course format that use sections but without numsections, we fallback to the number
+            // of cached sections in get_section_info_all, not that accurate though.
+            $coursesections = $activity->get_modinfo()->get_section_info_all();
+            $nsections = count($coursesections);
+            if (isset($coursesections[0])) {
+                // We don't count section 0 if it exists.
+                $nsections--;
+            }
+        }
+
+        $courseduration = $this->course->get_end() - $this->course->get_start();
+        $sectionduration = round($courseduration / $nsections);
+        $activitysectionenddate = $this->course->get_start() + ($sectionduration * $activity->sectionnum);
+        if ($activitysectionenddate > $starttime && $activitysectionenddate <= $endtime) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * True if the activity is due or it has been closed during this period, false if during another period, null if no due time.
+     *
+     * It can be overwritten by activities that allow teachers to set a due date or a time close separately
+     * from Moodle availability system. Note that in most of the cases overwriting get_timeclose_field should
+     * be enough.
+     *
+     * Returns true or false if the time close date falls into the provided time range. Null otherwise.
+     *
+     * @param \cm_info $activity
+     * @param int $starttime
+     * @param int $endtime
+     * @param \stdClass|false $student
+     * @return null
+     */
+    protected function activity_type_completed_by(\cm_info $activity, $starttime, $endtime, $student = false) {
+
+        $fieldname = $this->get_timeclose_field();
+        if (!$fieldname) {
+            // This activity type do not have its own availability control.
+            return null;
+        }
+
+        $this->fill_instance_data($activity);
+        $instance = $this->instancedata[$activity->instance];
+
+        if (!$instance->{$fieldname}) {
+            return null;
+        }
+
+        if ($starttime < $instance->{$fieldname} && $endtime >= $instance->{$fieldname}) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the name of the field that controls activity availability.
+     *
+     * Should be overwritten by activities that allow teachers to set a due date or a time close separately
+     * from Moodle availability system.
+     *
+     * Just 1 field will not be enough for all cases, but for the most simple ones without
+     * overrides and stuff like that.
+     *
+     * @return null|string
+     */
+    protected function get_timeclose_field() {
+        return null;
+    }
+
+    /**
+     * Check if the activity/section should have been completed during the provided period according to its availability rules.
+     *
+     * @param \core_availability\info $info
+     * @param int $starttime
+     * @param int $endtime
+     * @return bool|null
+     */
+    protected function availability_completed_by(\core_availability\info $info, $starttime, $endtime) {
+
+        $dateconditions = $info->get_availability_tree()->get_all_children('\availability_date\condition');
+        foreach ($dateconditions as $condition) {
+            // Availability API does not allow us to check from / to dates nicely, we need to be naughty.
+            $conditiondata = $condition->save();
+
+            if ($conditiondata->d === \availability_date\condition::DIRECTION_FROM &&
+                    $conditiondata->t > $endtime) {
+                // Skip this activity if any 'from' date is later than the end time.
+                return false;
+
+            } else if ($conditiondata->d === \availability_date\condition::DIRECTION_UNTIL &&
+                    ($conditiondata->t < $starttime || $conditiondata->t > $endtime)) {
+                // Skip activity if any 'until' date is not in $starttime - $endtime range.
+                return false;
+            } else if ($conditiondata->d === \availability_date\condition::DIRECTION_UNTIL &&
+                    $conditiondata->t < $endtime && $conditiondata->t > $starttime) {
+                return true;
+            }
+        }
+
+        // This can be interpreted as 'the activity was available but we don't know if its expected completion date
+        // was during this period.
+        return null;
+    }
+
+    /**
+     * Fills in activity instance data.
+     *
+     * @param \cm_info $cm
+     * @return void
+     */
+    protected function fill_instance_data(\cm_info $cm) {
+        global $DB;
+
+        if (!isset($this->instancedata[$cm->instance])) {
+            $this->instancedata[$cm->instance] = $DB->get_record($this->get_activity_type(), array('id' => $cm->instance),
+                '*', MUST_EXIST);
+        }
+    }
+
    /**
     * Defines indicator type.
     *
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

 /**
- * Unit tests for course activities.
+ * Unit tests for activities completed by classification.
 *
 * @package   core_analytics
 * @copyright 2017 David Monllaó {@link http://www.davidmonllao.com}
@@ -25,13 +25,13 @@
 defined('MOODLE_INTERNAL') || die();

 /**
- * Unit tests for course activities
+ * Unit tests for activities completed by classification.
 *
 * @package   core_analytics
 * @copyright 2017 David Monllaó {@link http://www.davidmonllao.com}
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class core_analytics_course_activities_testcase extends advanced_testcase {
+class community_of_inquiry_activities_completed_by_testcase extends advanced_testcase {

    /**
     * availability_levels
@@ -59,8 +59,6 @@ class core_analytics_course_activities_testcase extends advanced_testcase {
        // Forum1 is ignored as section 0 does not count.
        $forum = $this->getDataGenerator()->create_module('forum', array('course' => $course->id));

-        $courseman = new \core_analytics\course($course);
-
        $modinfo = get_fast_modinfo($course, $stu1->id);
        $cm = $modinfo->get_cm($forum->cmid);

@@ -93,20 +91,23 @@ class core_analytics_course_activities_testcase extends advanced_testcase {

        $cm = $modinfo->get_cm($forum->cmid);

+        $course = new \core_analytics\course($course);
+        list($indicator, $method) = $this->instantiate_indicator('mod_forum', $course);
+
        // Condition from after provided end time.
-        $this->assertCount(0, $courseman->get_activities('forum', strtotime('2015-10-20 00:00:00 GMT'),
+        $this->assertCount(0, $method->invoke($indicator, strtotime('2015-10-20 00:00:00 GMT'),
            strtotime('2015-10-21 00:00:00 GMT'), $stu1));

        // Condition until before provided start time
-        $this->assertCount(0, $courseman->get_activities('forum', strtotime('2015-10-25 00:00:00 GMT'),
+        $this->assertCount(0, $method->invoke($indicator, strtotime('2015-10-25 00:00:00 GMT'),
            strtotime('2015-10-26 00:00:00 GMT'), $stu1));

        // Condition until after provided end time.
-        $this->assertCount(0, $courseman->get_activities('forum', strtotime('2015-10-22 00:00:00 GMT'),
+        $this->assertCount(0, $method->invoke($indicator, strtotime('2015-10-22 00:00:00 GMT'),
            strtotime('2015-10-23 00:00:00 GMT'), $stu1));

        // Condition until after provided start time and before provided end time.
-        $this->assertCount(1, $courseman->get_activities('forum', strtotime('2015-10-22 00:00:00 GMT'),
+        $this->assertCount(1, $method->invoke($indicator, strtotime('2015-10-22 00:00:00 GMT'),
            strtotime('2015-10-25 00:00:00 GMT'), $stu1));
    }

@@ -138,7 +139,8 @@ class core_analytics_course_activities_testcase extends advanced_testcase {
        $forum5 = $this->getDataGenerator()->create_module('forum', array('course' => $course->id),
            array('section' => 4));

-        $courseman = new \core_analytics\course($course);
+        $course = new \core_analytics\course($course);
+        list($indicator, $method) = $this->instantiate_indicator('mod_forum', $course);

        $this->setUser($stu1);

@@ -146,10 +148,10 @@ class core_analytics_course_activities_testcase extends advanced_testcase {
        $second = $startdate + WEEKSECS;
        $third = $startdate + (WEEKSECS * 2);
        $forth = $startdate + (WEEKSECS * 3);
-        $this->assertCount(1, $courseman->get_activities('forum', $first, $first + WEEKSECS, $stu1));
-        $this->assertCount(1, $courseman->get_activities('forum', $second, $second + WEEKSECS, $stu1));
-        $this->assertCount(0, $courseman->get_activities('forum', $third, $third + WEEKSECS, $stu1));
-        $this->assertCount(2, $courseman->get_activities('forum', $forth, $forth + WEEKSECS, $stu1));
+        $this->assertCount(1, $method->invoke($indicator, $first, $first + WEEKSECS, $stu1));
+        $this->assertCount(1, $method->invoke($indicator, $second, $second + WEEKSECS, $stu1));
+        $this->assertCount(0, $method->invoke($indicator, $third, $third + WEEKSECS, $stu1));
+        $this->assertCount(2, $method->invoke($indicator, $forth, $forth + WEEKSECS, $stu1));
    }

    /**
@@ -189,7 +191,8 @@ class core_analytics_course_activities_testcase extends advanced_testcase {
        $forum6 = $this->getDataGenerator()->create_module('forum', array('course' => $course->id),
            array('section' => 12));

-        $courseman = new \core_analytics\course($course);
+        $course = new \core_analytics\course($course);
+        list($indicator, $method) = $this->instantiate_indicator('mod_forum', $course);

        $this->setUser($stu1);

@@ -199,10 +202,10 @@ class core_analytics_course_activities_testcase extends advanced_testcase {
        $second = $startdate + $duration;
        $third = $startdate + ($duration * 2);
        $forth = $startdate + ($duration * 3);
-        $this->assertCount(1, $courseman->get_activities('forum', $first, $first + $duration, $stu1));
-        $this->assertCount(1, $courseman->get_activities('forum', $second, $second + $duration, $stu1));
-        $this->assertCount(1, $courseman->get_activities('forum', $third, $third + $duration, $stu1));
-        $this->assertCount(2, $courseman->get_activities('forum', $forth, $forth + $duration, $stu1));
+        $this->assertCount(1, $method->invoke($indicator, $first, $first + $duration, $stu1));
+        $this->assertCount(1, $method->invoke($indicator, $second, $second + $duration, $stu1));
+        $this->assertCount(1, $method->invoke($indicator, $third, $third + $duration, $stu1));
+        $this->assertCount(2, $method->invoke($indicator, $forth, $forth + $duration, $stu1));

        // Split the course in as many parts as sections.
        $duration = ($enddate - $startdate) / $numsections;
@@ -210,15 +213,94 @@ class core_analytics_course_activities_testcase extends advanced_testcase {
            // The -1 because section 1 start represents the course start.
            $timeranges[$i] = $startdate + ($duration * ($i - 1));
        }
-        $this->assertCount(1, $courseman->get_activities('forum', $timeranges[1], $timeranges[1] + $duration, $stu1));
-        $this->assertCount(1, $courseman->get_activities('forum', $timeranges[4], $timeranges[4] + $duration, $stu1));
-        $this->assertCount(1, $courseman->get_activities('forum', $timeranges[8], $timeranges[8] + $duration, $stu1));
-        $this->assertCount(1, $courseman->get_activities('forum', $timeranges[10], $timeranges[10] + $duration, $stu1));
-        $this->assertCount(1, $courseman->get_activities('forum', $timeranges[12], $timeranges[12] + $duration, $stu1));
+        $this->assertCount(1, $method->invoke($indicator, $timeranges[1], $timeranges[1] + $duration, $stu1));
+        $this->assertCount(1, $method->invoke($indicator, $timeranges[4], $timeranges[4] + $duration, $stu1));
+        $this->assertCount(1, $method->invoke($indicator, $timeranges[8], $timeranges[8] + $duration, $stu1));
+        $this->assertCount(1, $method->invoke($indicator, $timeranges[10], $timeranges[10] + $duration, $stu1));
+        $this->assertCount(1, $method->invoke($indicator, $timeranges[12], $timeranges[12] + $duration, $stu1));

        // Nothing here.
-        $this->assertCount(0, $courseman->get_activities('forum', $timeranges[2], $timeranges[2] + $duration, $stu1));
-        $this->assertCount(0, $courseman->get_activities('forum', $timeranges[3], $timeranges[3] + $duration, $stu1));
+        $this->assertCount(0, $method->invoke($indicator, $timeranges[2], $timeranges[2] + $duration, $stu1));
+        $this->assertCount(0, $method->invoke($indicator, $timeranges[3], $timeranges[3] + $duration, $stu1));
+    }
+
+    /**
+     * test_get_activities_with_specific_restrictions
+     *
+     * @return void
+     */
+    public function test_get_activities_with_specific_restrictions() {
+
+        list($course, $stu1) = $this->setup_course();
+
+        $end = strtotime('2015-10-24 00:00:00 GMT');
+
+        // 1 with time close, one without.
+        $params = array('course' => $course->id);
+        $assign1 = $this->getDataGenerator()->create_module('assign', $params);
+        $params['duedate'] = $end;
+        $assign2 = $this->getDataGenerator()->create_module('assign', $params);
+
+        // 1 with time close, one without.
+        $params = array('course' => $course->id);
+        $choice1 = $this->getDataGenerator()->create_module('choice', $params);
+        $params['timeclose'] = $end;
+        $choice1 = $this->getDataGenerator()->create_module('choice', $params);
+
+        // 1 with time close, one without.
+        $params = array('course' => $course->id);
+        $data1 = $this->getDataGenerator()->create_module('data', $params);
+        $params['timeavailableto'] = $end;
+        $data1 = $this->getDataGenerator()->create_module('data', $params);
+
+        // 1 with time close, one without.
+        $params = array('course' => $course->id);
+        $feedback1 = $this->getDataGenerator()->create_module('feedback', $params);
+        $params['timeclose'] = $end;
+        $feedback1 = $this->getDataGenerator()->create_module('feedback', $params);
+
+        // 1 with time close, one without.
+        $params = array('course' => $course->id);
+        $lesson1 = $this->getDataGenerator()->create_module('lesson', $params);
+        $params['deadline'] = $end;
+        $lesson1 = $this->getDataGenerator()->create_module('lesson', $params);
+
+        // 1 with time close, one without.
+        $params = array('course' => $course->id);
+        $quiz1 = $this->getDataGenerator()->create_module('quiz', $params);
+        $params['timeclose'] = $end;
+        $quiz1 = $this->getDataGenerator()->create_module('quiz', $params);
+
+        // 1 with time close, one without.
+        $params = array('course' => $course->id);
+        $scorm1 = $this->getDataGenerator()->create_module('scorm', $params);
+        $params['timeclose'] = $end;
+        $scorm1 = $this->getDataGenerator()->create_module('scorm', $params);
+
+        // 1 with time close, one without.
+        $params = array('course' => $course->id);
+        $workshop1 = $this->getDataGenerator()->create_module('workshop', $params);
+        $params['submissionend'] = $end;
+        $workshop1 = $this->getDataGenerator()->create_module('workshop', $params);
+
+        $course = new \core_analytics\course($course);
+
+        $activitytypes = array('mod_assign', 'mod_choice', 'mod_data', 'mod_feedback', 'mod_lesson',
+            'mod_quiz', 'mod_scorm', 'mod_workshop');
+        foreach ($activitytypes as $activitytype) {
+
+            list($indicator, $method) = $this->instantiate_indicator($activitytype, $course);
+
+            $message = $activitytype . ' activity type returned activities do not match expected size';
+            $this->assertCount(0, $method->invoke($indicator, strtotime('2015-10-20 00:00:00 GMT'),
+                strtotime('2015-10-21 00:00:00 GMT'), $stu1), $message);
+
+            $this->assertCount(0, $method->invoke($indicator, strtotime('2015-10-25 00:00:00 GMT'),
+                strtotime('2015-10-26 00:00:00 GMT'), $stu1), $message);
+
+            $this->assertCount(1, $method->invoke($indicator, strtotime('2015-10-22 00:00:00 GMT'),
+                strtotime('2015-10-25 00:00:00 GMT'), $stu1), $message);
+        }
    }

    /**
@@ -243,4 +325,27 @@ class core_analytics_course_activities_testcase extends advanced_testcase {
        return array($course, $stu1);
    }

+    /**
+     * Returns the module cognitive depth indicator and the reflection method.
+     *
+     * @param string $modulename
+     * @param \core_analytics\course $course
+     * @return array
+     */
+    private function instantiate_indicator($modulename, \core_analytics\course $course) {
+
+        $classname = '\\' . $modulename . '\analytics\indicator\cognitive_depth';
+        $indicator = new $classname();
+        $class = new ReflectionClass($indicator);
+
+        $property = $class->getProperty('course');
+        $property->setAccessible(true);
+        $property->setValue($indicator, $course);
+
+        $method = new ReflectionMethod($indicator, 'get_activities');
+        $method->setAccessible(true);
+
+        return array($indicator, $method);
+    }
+
 }
@@ -26,8 +26,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'auth_cas';        // Full name of the plugin (used for diagnostics)

-$plugin->dependencies = array('auth_ldap' => 2017050500);
+$plugin->dependencies = array('auth_ldap' => 2017110800);
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'auth_db';         // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die;

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'auth_email';      // Full name of the plugin (used for diagnostics)
@@ -121,7 +121,7 @@ $string['didntgetusersfromldap'] = "Did not get any users from LDAP -- error? --
 $string['gotcountrecordsfromldap'] = "Got {\$a} records from LDAP\n";
 $string['ldapnotconfigured'] = 'The LDAP host url is currently not configured';
 $string['morethanoneuser'] = 'Strange! More than one user record found in ldap. Only using the first one.';
-$string['needbcmath'] = 'You need the BCMath extension to use grace logins with Active Directory';
+$string['needbcmath'] = 'You need the BCMath extension to use expired password checking with Active Directory.';
 $string['needmbstring'] = 'You need the mbstring extension to change passwords in Active Directory';
 $string['nodnforusername'] = 'Error in user_update_password(). No DN for: {$a->username}';
 $string['noemail'] = 'Tried to send you an email but failed!';
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017080100;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'auth_ldap';       // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2017050500; // Requires this Moodle version (3.1).
+$plugin->version = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2017110800; // Requires this Moodle version.
 $plugin->component = 'auth_lti'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'auth_manual';     // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'auth_mnet';       // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'auth_nologin';    // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'auth_none';       // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051501;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500;        // Requires this Moodle version.
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800;        // Requires this Moodle version.
 $plugin->component = 'auth_oauth2';       // Full name of the plugin (used for diagnostics).
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'auth_shibboleth'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'auth_webservice'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500;
-$plugin->requires = 2017050500;
+$plugin->version = 2017111300;
+$plugin->requires = 2017110800;
 $plugin->component = 'availability_completion';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500;
-$plugin->requires = 2017050500;
+$plugin->version = 2017111300;
+$plugin->requires = 2017110800;
 $plugin->component = 'availability_date';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500;
-$plugin->requires = 2017050500;
+$plugin->version = 2017111300;
+$plugin->requires = 2017110800;
 $plugin->component = 'availability_grade';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500;
-$plugin->requires = 2017050500;
+$plugin->version = 2017111300;
+$plugin->requires = 2017110800;
 $plugin->component = 'availability_group';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500;
-$plugin->requires = 2017050500;
+$plugin->version = 2017111300;
+$plugin->requires = 2017110800;
 $plugin->component = 'availability_grouping';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2017051500;
-$plugin->requires = 2017050500;
+$plugin->version = 2017111300;
+$plugin->requires = 2017110800;
 $plugin->component = 'availability_profile';
@@ -136,7 +136,7 @@ abstract class backup implements checksumable {
     * point is backup when some behavior/approach channged, in order to allow
     * conditional coding based on it.
     */
-    const VERSION = 2017051500;
+    const VERSION = 2017111300;
    /**
     * Usually same than major release zero version, mainly for informative/historic purposes.
     */
@@ -112,7 +112,7 @@ class cc_forum extends entities {

    public function get_topic_data ($instance) {

-        $topic_data = '';
+        $topic_data = array();

        $topic_file = $this->get_external_xml($instance['resource_indentifier']);

@@ -68,7 +68,7 @@ class cc_quiz extends entities {
        $last_question_id = 0;
        $last_answer_id = 0;

-        $instances = '';
+        $instances = array();

        $types = array(MOODLE_TYPE_QUIZ, MOODLE_TYPE_QUESTION_BANK);

@@ -87,7 +87,7 @@ class cc11_basiclti extends entities11 {

    public function get_basiclti_data($instance) {

-        $topic_data = '';
+        $topic_data = array();

        $basiclti_file = $this->get_external_xml($instance['resource_indentifier']);

@@ -111,7 +111,7 @@ class cc11_forum extends entities11 {

    public function get_topic_data ($instance) {

-        $topic_data = '';
+        $topic_data = array();

        $topic_file = $this->get_external_xml($instance['resource_indentifier']);

@@ -82,7 +82,7 @@ class cc11_lti extends entities11 {

    public function get_basiclti_data($instance) {

-        $topic_data = '';
+        $topic_data = array();

        $basiclti_file = $this->get_external_xml($instance['resource_indentifier']);

@@ -68,7 +68,7 @@ class cc11_quiz extends entities11 {
        $last_question_id = 0;
        $last_answer_id = 0;

-        $instances = '';
+        $instances = array();

        $types = array(MOODLE_TYPE_QUIZ, MOODLE_TYPE_QUESTION_BANK);

@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_activity_modules'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;               // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500;               // Requires this Moodle version.
+$plugin->version   = 2017111300;               // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800;               // Requires this Moodle version.
 $plugin->component = 'block_activity_results'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_admin_bookmarks'; // Full name of the plugin (used for diagnostics)
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500;        // Requires this Moodle version.
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800;        // Requires this Moodle version.
 $plugin->component = 'block_badges';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_blog_menu'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_blog_recent'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_blog_tags'; // Full name of the plugin (used for diagnostics)
@@ -51,7 +51,7 @@ class block_calendar_month extends block_base {
        $courseid = $this->page->course->id;
        $categoryid = ($this->page->context->contextlevel === CONTEXT_COURSECAT) ? $this->page->category->id : null;
        $calendar = \calendar_information::create(time(), $courseid, $categoryid);
-        list($data, $template) = calendar_get_view($calendar, 'mini');
+        list($data, $template) = calendar_get_view($calendar, 'mini', isloggedin());

        $renderer = $this->page->get_renderer('core_calendar');
        $this->content->text .= $renderer->render_from_template($template, $data);
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_calendar_month'; // Full name of the plugin (used for diagnostics)
@@ -69,4 +69,59 @@ class block_calendar_upcoming extends block_base {

        return $this->content;
    }
+
+    /**
+     * Get the upcoming event block content.
+     *
+     * @param array $events list of events
+     * @param \moodle_url|string $linkhref link to event referer
+     * @param boolean $showcourselink whether links to courses should be shown
+     * @return string|null $content html block content
+     * @deprecated since 3.4
+     */
+    public static function get_upcoming_content($events, $linkhref = null, $showcourselink = false) {
+        debugging(
+                'get_upcoming_content() is deprecated. ' .
+                'Please see block_calendar_upcoming::get_content() for the correct API usage.',
+                DEBUG_DEVELOPER
+            );
+
+        $content = '';
+        $lines = count($events);
+
+        if (!$lines) {
+            return $content;
+        }
+
+        for ($i = 0; $i < $lines; ++$i) {
+            if (!isset($events[$i]->time)) {
+                continue;
+            }
+            $events[$i] = calendar_add_event_metadata($events[$i]);
+            $content .= '<div class="event"><span class="icon c0">' . $events[$i]->icon . '</span>';
+            if (!empty($events[$i]->referer)) {
+                // That's an activity event, so let's provide the hyperlink.
+                $content .= $events[$i]->referer;
+            } else {
+                if (!empty($linkhref)) {
+                    $href = calendar_get_link_href(new \moodle_url(CALENDAR_URL . $linkhref), 0, 0, 0,
+                        $events[$i]->timestart);
+                    $href->set_anchor('event_' . $events[$i]->id);
+                    $content .= \html_writer::link($href, $events[$i]->name);
+                } else {
+                    $content .= $events[$i]->name;
+                }
+            }
+            $events[$i]->time = str_replace('&raquo;', '<br />&raquo;', $events[$i]->time);
+            if ($showcourselink && !empty($events[$i]->courselink)) {
+                $content .= \html_writer::div($events[$i]->courselink, 'course');
+            }
+            $content .= '<div class="date">' . $events[$i]->time . '</div></div>';
+            if ($i < $lines - 1) {
+                $content .= '<hr />';
+            }
+        }
+
+        return $content;
+    }
 }
@@ -0,0 +1,5 @@
+=== 3.4 ===
+
+* block_calendar_upcoming::get_upcoming_content has been deprecated. Please
+  update your code to use the new APIs. You can see an example of how these
+  may be used in block_calendar_upcoming::get_content().
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_calendar_upcoming'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_comments'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_community'; // Full name of the plugin (used for diagnostics)
@@ -25,7 +25,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version      = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2017050500; // Requires this Moodle version.
+$plugin->version      = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2017110800; // Requires this Moodle version.
 $plugin->component    = 'block_completionstatus';
-$plugin->dependencies = array('report_completion' => 2017050500);
+$plugin->dependencies = array('report_completion' => 2017110800);
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_course_list'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_course_summary'; // Full name of the plugin (used for diagnostics)
@@ -24,8 +24,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_feedback';  // Full name of the plugin (used for diagnostics)

-$plugin->dependencies = array('mod_feedback' => 2017050500);
+$plugin->dependencies = array('mod_feedback' => 2017110800);
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die;

-$plugin->version = 2017051500;
-$plugin->requires  = 2017050500;
+$plugin->version = 2017111300;
+$plugin->requires  = 2017110800;
 $plugin->component = 'block_globalsearch';
@@ -24,8 +24,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_glossary_random'; // Full name of the plugin (used for diagnostics)

-$plugin->dependencies = array('mod_glossary' => 2017050500);
+$plugin->dependencies = array('mod_glossary' => 2017110800);
@@ -37,7 +37,11 @@ class block_html extends block_base {
    }

    function specialization() {
-        $this->title = isset($this->config->title) ? format_string($this->config->title) : format_string(get_string('newhtmlblock', 'block_html'));
+        if (isset($this->config->title)) {
+            $this->title = $this->title = format_string($this->config->title, true, ['context' => $this->context]);
+        } else {
+            $this->title = get_string('newhtmlblock', 'block_html');
+        }
    }

    function instance_allow_multiple() {
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_html';      // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_login';     // Full name of the plugin (used for diagnostics)
@@ -24,8 +24,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;
-$plugin->requires  = 2017050500;
+$plugin->version   = 2017111300;
+$plugin->requires  = 2017110800;
 $plugin->component = 'block_lp';
 $plugin->dependencies = array(
    'tool_lp' => ANY_VERSION
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_mentees';   // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017050500;        // Requires this Moodle version
+$plugin->version   = 2017111300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017110800;        // Requires this Moodle version
 $plugin->component = 'block_mnet_hosts'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2017051502;         // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017050500;         // Requires this Moodle version.
+$plugin->version   = 2017111300;         // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800;         // Requires this Moodle version.
 $plugin->component = 'block_myoverview'; // Full name of the plugin (used for diagnostics).
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eloy Lafuente (stronk7)	665c3ac59c	Moodle release 3.4	2017-11-11 19:31:19 +01:00
Eloy Lafuente (stronk7)	07c0bb10fb	NOBUG: Change travis.yml to MOODLE_34_STABLE	2017-11-11 19:31:18 +01:00
Eloy Lafuente (stronk7)	cf57ee9285	Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install	2017-11-11 19:31:14 +01:00
Eloy Lafuente (stronk7)	d334aea208	Merge branch 'MDL-60779-master' of git://github.com/junpataleta/moodle	2017-11-11 13:03:54 +01:00
Jun Pataleta	0cf288757d	MDL-60779 calendar: Pass correct parameters for get_calendar_X_view()	2017-11-11 22:28:38 +13:00
AMOS bot	695cd06817	Automatically generated installer lang files	2017-11-11 00:05:36 +00:00
David Monllao	ab9936962e	Moodle release 3.4rc3	2017-11-10 15:15:37 +01:00
David Monllao	d39fcc420e	Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install	2017-11-10 15:15:35 +01:00
David Monllao	08641175b3	Merge branch 'MDL-60764' of git://github.com/stronk7/moodle	2017-11-10 10:20:25 +01:00
Eloy Lafuente (stronk7)	66aee746e3	MDL-60764 versions: remove some outdated releases in requires	2017-11-10 09:45:56 +01:00
Damyon Wiese	f738fc8efd	Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle	2017-11-10 13:57:04 +08:00
Andrew Nicols	27973b545c	MDL-60763 calendar: Use PHP concat, not JS	2017-11-10 13:56:39 +08:00
Damyon Wiese	3192438075	Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle	2017-11-10 13:47:05 +08:00
Andrew Nicols	41b7375c07	MDL-60763 core_calendar: Deprecate calendar_get_upcoming	2017-11-10 13:45:32 +08:00
Jun Pataleta	cb04dcf4ce	Merge branch 'MDL-60771-master' of git://github.com/lameze/moodle	2017-11-10 18:03:49 +13:00
Jun Pataleta	c3925187ed	Merge branch 'MDL-60758_master' of git://github.com/dmonllao/moodle	2017-11-10 17:21:15 +13:00
Damyon Wiese	4ceece6ea1	Merge branch 'MDL-60749-master' of git://github.com/sarjona/moodle	2017-11-10 12:05:46 +08:00
Jun Pataleta	cfbc820e1b	Merge branch 'MDL-60766-master' of git://github.com/ryanwyllie/moodle	2017-11-10 17:02:41 +13:00
Simey Lameze	fbbcf45ef2	MDL-60771 mod_scorm: typecast score to integer	2017-11-10 12:00:17 +08:00
Andrew Nicols	6e2d8c121b	Merge branch 'MDL-52838-master' of git://github.com/damyon/moodle	2017-11-10 11:38:13 +08:00
Damyon Wiese	6b2a9a6fb8	Merge branch 'MDL-60765-master' of git://github.com/andrewnicols/moodle	2017-11-10 10:55:09 +08:00
Andrew Nicols	fb5bbf1424	MDL-60765 theme: Make inplace-autocomplete rule more specific This change was intended to fix an issue with the autocomplete in RTL, but was applied to all inplace-editables.	2017-11-10 10:29:11 +08:00
Damyon Wiese	ce225e1c5e	MDL-52838 workshop: Each criterion > 0 levels Add validation to the edit assessment form so each criterion in a rubric requires at least one level.	2017-11-10 10:22:27 +08:00
Ryan Wyllie	08b7558483	MDL-60766 block_calendar_upcoming: stop summary modal not logged in Stopped the JS from running on the block when the user is not logged in because it attempts to load a summary modal when an event is clicked on which results in a failed call to a webservice.	2017-11-10 02:20:32 +00:00
Andrew Nicols	9dead25fd5	MDL-60763 core_calendar: Revert removal of calendar_get_upcoming This reverts part of commit `522b84be04`.	2017-11-10 10:11:42 +08:00
Ryan Wyllie	eac88b955f	MDL-60766 block_calendar_month: hide nav when not logged in	2017-11-10 02:07:50 +00:00
Eloy Lafuente (stronk7)	438c98cc98	MDL-60764 versions: main version bump	2017-11-10 02:56:14 +01:00
Eloy Lafuente (stronk7)	ba854606e6	MDL-60764 versions: bump all versions and requires near release version = 2017111300 release version requires= 2017110800 current rc2 version	2017-11-10 02:52:53 +01:00
Jake Dallimore	f5b63fc829	Merge branch 'MDL-60760_master' of git://github.com/dmonllao/moodle	2017-11-10 09:32:17 +08:00
Andrew Nicols	6996fbaa0e	MDL-60763 core_calendar: Revert removal of calendar_get_upcoming Revert "MDL-60092 core_calendar: remove unused calendar_get_upcoming method" This reverts commit `4259387ebb`.	2017-11-10 08:11:36 +08:00
David Monllao	20305a8a8f	MDL-60758 tool_analytics: Skip guess start if higher than guess end	2017-11-09 17:11:34 +01:00
David Monllao	5da020169e	MDL-60760 tool_analytics: No onlycli link for managers	2017-11-09 17:05:08 +01:00
Sara Arjona	2f673d8b6a	MDL-60749 scorm: Remove   from files when downloading	2017-11-09 10:15:03 +01:00
Sara Arjona	4bcb0a9a1d	MDL-60550 user: Add more restrictions in keyword searches Original patch provided by Tim Schroeder.	2017-11-09 16:29:29 +08:00
David Monllao	a4e0b7468c	Merge branch 'MDL-60718-master' of git://github.com/sarjona/moodle	2017-11-09 09:27:01 +01:00
David Monllao	7fdcdc04ff	Merge branch 'MDL-60615-master' of git://github.com/damyon/moodle	2017-11-09 08:48:48 +01:00
Damyon Wiese	bef5a8ca10	Merge branch 'MDL-60752-master' of git://github.com/andrewnicols/moodle	2017-11-09 15:08:11 +08:00
Damyon Wiese	246698e779	MDL-60615 imscc: string to array fix Sloppy typing in the imscc converter is causing errors on php7.1 Variable is initialised as a string and then used as an array.	2017-11-09 15:05:36 +08:00
Jake Dallimore	4f3262fede	Merge branch 'MDL-60753_master' of git://github.com/markn86/moodle	2017-11-09 14:47:23 +08:00
Andrew Nicols	f169f4fd21	MDL-60752 lti: Compare text in types_config properly	2017-11-09 14:25:51 +08:00
Mark Nelson	d48d1ba19a	MDL-60753 report_competency: fixed dialogue failing to show	2017-11-09 14:11:24 +08:00
Jun Pataleta	7a571b813a	Merge branch 'MDL-60628-master' of git://github.com/lameze/moodle	2017-11-09 17:08:46 +13:00
Simey Lameze	754016ab33	MDL-60628 calendar: amend web service unit test	2017-11-09 11:43:49 +08:00
Simey Lameze	10c17dcc10	MDL-60628 calendar: support category events on get_calendar_events ws	2017-11-09 11:29:07 +08:00
Andrew Nicols	5518a32de5	Merge branch 'MDL-60579-master-fix2' of https://github.com/damyon/moodle	2017-11-09 11:18:14 +08:00
Damyon Wiese	56f05f23c6	MDL-60579 user: Don't lose text filters When replacing a group filter with a different group filter - don't forget all the current text filters that have been applied.	2017-11-09 11:06:30 +08:00
Damyon Wiese	bb869f05e8	MDL-60579 user: Move defines into library Entry page user/index.php was defining constants that were used by the renderer. This means the renderer was tied to user/index.php.	2017-11-09 11:06:30 +08:00
Andrew Nicols	7cf4331a6f	MDL-60579 user: Correct PARAM type for filters Damyon pointed out during the integration of this fixset, that the PARAM type is incorrect.	2017-11-09 10:07:13 +08:00
Andrew Nicols	762f8dc1db	MDL-60579 user: Add missing case breaks	2017-11-09 09:07:34 +08:00
Andrew Nicols	a997dc9da5	MDL-60579 user: Correct search for strings	2017-11-09 09:07:21 +08:00
Andrew Nicols	446b21b512	MDL-60579 user: Check filter strings have correct part count	2017-11-09 09:07:02 +08:00
Andrew Nicols	3968d2ca7e	MDL-60579 user: Prevent behat from interacting til setup complete	2017-11-09 09:05:22 +08:00
AMOS bot	68c580c903	Automatically generated installer lang files	2017-11-09 00:05:00 +00:00
Sara Arjona	0c0d460e8b	MDL-60718 analytics: Avoid duplicates for users with 2 enrolments	2017-11-08 19:12:59 +01:00
David Monllao	ed0e2cea00	Merge branch 'MDL-60732-master' of git://github.com/damyon/moodle	2017-11-08 17:48:07 +01:00
David Monllao	7effd6dd79	Merge branch 'MDL-60720-master' of https://github.com/sammarshallou/moodle	2017-11-08 17:27:15 +01:00
David Monllao	29adfbc3c8	Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle	2017-11-08 15:56:25 +01:00
David Monllao	4e73acf3cf	Merge branch 'MDL-60579-master' of https://github.com/mihailges/moodle	2017-11-08 12:16:20 +01:00
David Monllao	fcafb22c22	MDL-60733 oauth: Remove outdated comment	2017-11-08 12:04:31 +01:00
David Monllao	6463a047a2	Merge branch 'MDL-60733-master' of git://github.com/damyon/moodle	2017-11-08 12:03:43 +01:00
David Monllao	ccf7578373	Moodle release 3.4rc2	2017-11-08 09:47:39 +01:00
David Monllao	68ba214c65	Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install	2017-11-08 09:47:38 +01:00
Damyon Wiese	a471bc4971	MDL-60732 core_user: Show group filters Always show the group filters, even if the course is in NO_GROUPS mode.	2017-11-08 16:45:42 +08:00
Damyon Wiese	b6319f70bd	Merge branch 'MDL-60590-master' of git://github.com/andrewnicols/moodle	2017-11-08 15:46:44 +08:00
Damyon Wiese	d3882ea4a3	MDL-60733 core: B/C for google_oauth The google_oauth class extends oauth2client which was modified to send "Accept" headers. The "Accept" headers break picasa and could break any other plugin that was using google_oauth.	2017-11-08 15:41:53 +08:00
Andrew Nicols	e759c9ed83	MDL-60590 enrol_manual: Fix for race condition in button calculation	2017-11-08 15:31:10 +08:00
Jun Pataleta	c9f995872f	Merge branch 'MDL-60700-master-fix' of git://github.com/andrewnicols/moodle	2017-11-08 15:17:25 +13:00
Andrew Nicols	2e36c42625	MDL-60700 calendar: Update behat test or new normal	2017-11-08 10:13:20 +08:00
Jun Pataleta	7a2300fd82	Merge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle	2017-11-08 14:43:15 +13:00
AMOS bot	f3342e1010	Automatically generated installer lang files	2017-11-08 00:05:03 +00:00
David Mudrák	ea90412944	MDL-60717 lang: Reflect the string change in behat scenario file	2017-11-07 21:49:18 +01:00
Helen Foster	8d64443452	MDL-60717 lang: Merge English strings from the en_fix language pack Significant string changes: - needbcmath,auth_ldap - 'grace logins' changed to 'expired password checking'	2017-11-07 21:30:14 +01:00
sam marshall	4b0facc984	MDL-60720 core_search: Indexing halts on failed get_document The recordsets used for search indexing sometimes return results which are invalid (e.g. cannot be found in database). When this happens, the result in the iterator for the recordset will be false. Due to a bug, the iterator used to stop when it encountered a false value, which prevented indexing from getting past the problematic record. In addition, the iterator that skips future data resulted in the current() function of its parent indicator being called twice per entry, which meant that search indexing called get_document() twice as many times.	2017-11-07 16:36:37 +00:00
David Monllao	d6d2cec4a0	Merge branch 'MDL-59758_notes-fix' of git://github.com/dmonllao/moodle	2017-11-07 14:01:35 +01:00
David Monllao	57c9b7fc37	MDL-59758 user: Notes publish state adapted to ws	2017-11-07 13:53:21 +01:00
David Monllao	cae37299f3	Merge branch 'MDL-59758-master' of git://github.com/damyon/moodle	2017-11-07 12:37:30 +01:00
Mihail Geshoski	c835126185	MDL-60579 enrolments: Applied filters lost on certain actions AMOS BEGIN CPY [invalidrequest,enrol_lti],[invalidrequest,enrol] AMOS END	2017-11-07 16:17:00 +08:00
Jake Dallimore	5243e93661	Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle	2017-11-07 16:03:43 +08:00
Jake Dallimore	b135c42a17	Merge branch 'MDL-60700-int-fix-1' of github.com:ryanwyllie/moodle	2017-11-07 15:44:12 +08:00
Ryan Wyllie	ec8f488f30	MDL-60700 clean: add course link to activity event summary modal	2017-11-07 07:36:49 +00:00
David Monllao	aa30dc8860	MDL-59256 analytics: Respect activities specific access conditions	2017-11-07 08:14:53 +01:00
David Monllao	76f98c3bd5	MDL-59256 analytics: Move get_activities method to CoI scope CoI = community of inquiry model	2017-11-07 08:14:49 +01:00
Jake Dallimore	7783fd0ec1	Merge branch 'MDL-57772-master' of git://github.com/damyon/moodle	2017-11-07 15:01:31 +08:00
Damyon Wiese	a6943ebb59	MDL-59758 core_user: Pluralise bulk actions Don't say 1 people.	2017-11-07 14:39:04 +08:00
Jake Dallimore	eaa43a132c	Merge branch 'MDL-60700-master' of git://github.com/ryanwyllie/moodle	2017-11-07 14:23:50 +08:00
Damyon Wiese	81aa5e196f	MDL-59758 core_user: Clean up user renderer These functions are not used anywhere by anything.	2017-11-07 14:18:54 +08:00
Damyon Wiese	b5b81de3d6	MDL-59758 core_user: Replace old bulk actions The participants page has some clunky multi page forms for bulk actions. Replaces it with an ajax alternative.	2017-11-07 14:18:49 +08:00
Ryan Wyllie	f0fc8a194a	MDL-60700 calendar: remove bottom margin for description in summary	2017-11-07 06:03:01 +00:00
Andrew Nicols	03561ea899	Merge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle	2017-11-07 13:49:47 +08:00
Ryan Wyllie	6688ae2ba2	MDL-60062 calendar: prevent drag and drop of override events	2017-11-07 05:47:18 +00:00
Jake Dallimore	b44bc9bf6c	Merge branch 'MDL-60686-master' of git://github.com/damyon/moodle	2017-11-07 13:39:33 +08:00
Damyon Wiese	65c52e05d1	MDL-58699 mod_quiz: Require javascript for popup If any of the access rules require the attempt to open in a new window, assume we require javascript to attempt the quiz. This makes it harder to bypass the javascript pseudo security restrictions.	2017-11-07 12:48:21 +08:00
Damyon Wiese	1ccc9f1953	Merge branch 'MDL-60590_master-fix' of git://github.com/markn86/moodle	2017-11-07 11:59:49 +08:00
Damyon Wiese	efe2681894	MDL-57772 chat: BEEP is back baby!	2017-11-07 11:25:02 +08:00
Mark Nelson	e3a6d44845	MDL-60590 core_enrol: fixed failing Behat scenarios	2017-11-07 11:24:34 +08:00
Damyon Wiese	8aa01fcf61	Merge branch 'MDL-60671-master' of https://github.com/sammarshallou/moodle	2017-11-07 11:05:43 +08:00
Jake Dallimore	8072eb1384	Merge branch 'MDL-60705-master' of https://github.com/sammarshallou/moodle	2017-11-07 10:50:53 +08:00
Damyon Wiese	b9ae53f86b	MDL-59758 js: auto_rows module easier to use Allow passing the direct text area, or a container. Trigger change events on the text area, not the container. Properly handle starting with rows > 1	2017-11-07 10:36:13 +08:00
Damyon Wiese	5616a31987	MDL-60686 core_users: Reorder filters by utility Order the list of filters on the participant page from most useful to least useful.	2017-11-07 10:12:45 +08:00
Ryan Wyllie	8926030555	MDL-60700 calendar: normalise event type in summmary modal render	2017-11-07 02:08:00 +00:00
Jun Pataleta	13b19e40cb	Merge branch 'wip-MDL-60391-master' of git://github.com/marinaglancy/moodle	2017-11-07 14:30:58 +13:00
Ryan Wyllie	478b1d194f	MDL-60062 calendar: remove validate_event_timestart callback	2017-11-07 01:25:33 +00:00
Ryan Wyllie	9aac9f7074	MDL-60062 quiz: add support for drag drop of calendar events	2017-11-07 01:25:32 +00:00
Jun Pataleta	3a0951f027	Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle	2017-11-07 13:37:52 +13:00
Andrew Nicols	7d416f9c2c	MDL-60361 calendar: Update behat test lang	2017-11-07 08:36:29 +08:00
Jun Pataleta	589b602be3	Merge branch 'MDL-60611-master-fix' of git://github.com/junpataleta/moodle	2017-11-07 11:31:45 +13:00
Jun Pataleta	8001199766	MDL-60611 calendar: Remove usage of deprecated setExpectedException()	2017-11-07 11:21:29 +13:00
Jun Pataleta	a56833d49d	Merge branch 'MDL-60611' of git://github.com/stronk7/moodle	2017-11-07 10:14:24 +13:00
David Monllao	be88f0993d	Merge branch 'MDL-60638-master' of git://github.com/lameze/moodle	2017-11-06 21:45:14 +01:00
sam marshall	11e60032be	MDL-60671 core_search: Cron output should use mtrace The mtrace function is preferable for plain text logging/progress output because it can be redirected if necessary. By convention it is normally used in cron and can be used in CLI tasks if required. This change makes the text_progress_trace class use mtrace instead of echo and then flush. (Default behaviour of mtrace is to do exactly that, but it can be redirected too.) Before this change, if anybody is relying on mtrace behaviour to redirect logs of cron output, this will fail for some parts of the search cron output (and some other places like auth plugins).	2017-11-06 11:55:29 +00:00
sam marshall	401710883b	MDL-60705 core_search: Unit tests get time wrong by factor 1 million	2017-11-06 11:50:43 +00:00
Damyon Wiese	40f05d2312	Merge branch 'MDL-60590_master' of git://github.com/markn86/moodle	2017-11-06 14:18:40 +08:00
Andrew Nicols	3602df58b2	Merge branch 'MDL-60667_master' of git://github.com/dmonllao/moodle	2017-11-06 13:27:11 +08:00
Andrew Nicols	f3743b3041	Merge branch 'MDL-60626-master' of git://github.com/damyon/moodle	2017-11-06 12:43:24 +08:00
Mark Nelson	e2d635bbaf	MDL-60590 core_user: added Behat test for cohort list presence	2017-11-06 12:39:31 +08:00
Mark Nelson	a764855641	MDL-60590 core_cohort: removed unused variables from search_cohorts()	2017-11-06 12:39:31 +08:00
Mark Nelson	9b0f29239b	MDL-60590 enrol_manual: button title depends on cohort list existence Also added a SELECTORS object to tidy the code by keeping the selectors in a central location.	2017-11-06 12:35:05 +08:00
Mark Nelson	8ce86ebba3	MDL-60590 enrol_manual: check cohorts exist before displaying select	2017-11-06 12:35:05 +08:00
Damyon Wiese	30890c2971	MDL-60626 calendar: Fix for overrides Override events do not have the courseid so we need to get it from the module instance.	2017-11-06 12:21:27 +08:00
Mark Nelson	1bd70073c5	MDL-60590 enrol_manual: only show cohorts with necessary capabilities	2017-11-06 11:22:45 +08:00
Damyon Wiese	9e0884d410	MDL-60626 calendar: Unit tests for capabilities Check various calendar external functions for capabilities.	2017-11-06 11:11:28 +08:00
Damyon Wiese	af25b8fc7f	MDL-60626 calendar: Check capabilities for api All external functions must check all capabilities before returning data. The calendar API itself does not check capabilities (I wish it did), so we must be careful exposing these functions to webservices.	2017-11-06 11:11:28 +08:00
Damyon Wiese	ef29782f31	Merge branch 'MDL-59858-master' of git://github.com/junpataleta/moodle	2017-11-06 10:45:34 +08:00
Damyon Wiese	1ada616c56	Merge branch 'MDL-60596_master' of git://github.com/dmonllao/moodle	2017-11-06 10:19:10 +08:00
Damyon Wiese	8443b88995	Merge branch 'MDL-60437-multilang-html-block-titles' of https://github.com/lucaboesch/moodle	2017-11-06 10:09:08 +08:00
Jake Dallimore	eb354bdefa	Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle	2017-11-06 09:29:46 +08:00
Jun Pataleta	4cd3927c4f	MDL-59858 amd: Focus on the element that actually triggers the modal	2017-11-06 13:18:03 +13:00
Jun Pataleta	6a973d261a	Merge branch 'MDL-60598_master' of git://github.com/dmonllao/moodle	2017-11-06 10:18:46 +13:00
Eloy Lafuente (stronk7)	796e48a58b	MDL-60611 phpunit: remove deprecated stuff and other minor fixes Thanks @scara for MDL-60611 phpunit: improved redis skipping reasons	2017-11-05 01:45:04 +01:00
AMOS bot	496b39974f	Automatically generated installer lang files	2017-11-05 00:05:09 +00:00
Luca Bösch	6586118e0f	MDL-60437 blocks: HTML block title multilang	2017-11-03 16:35:59 +01:00
David Monllao	4a145a8ae5	MDL-60598 analytics: Info message for predictions based on data	2017-11-03 12:45:40 +01:00
David Monllao	da8a0c97f0	MDL-60596 analytics: Check cm completion if available Previous code was restricted to course modules origin.	2017-11-03 12:44:21 +01:00
David Monllao	20b2565c38	MDL-60667 mlbackend_python: Bump to non-linear neural net version	2017-11-03 12:43:52 +01:00
David Monllao	36e84e96fc	MDL-59256 analytics: Move get_activities test scope	2017-11-03 12:42:20 +01:00
Andrew Nicols	b9fd516407	MDL-60361 calendar: Support all event types for calendar subs	2017-11-03 11:27:40 +08:00
Simey Lameze	20a5056df6	MDL-60638 calendar: fix event subscription variable names	2017-11-03 10:03:17 +08:00
Eloy Lafuente (stronk7)	6be1923d81	MDL-60611 phpunit: ignore risky (empty) unit tests At some point we should review them, removing or moving stuff.	2017-11-02 23:45:35 +01:00
Eloy Lafuente (stronk7)	801a372dad	MDL-60611 phpunit: switch to namespaced phunit classes	2017-11-02 23:45:34 +01:00
Eloy Lafuente (stronk7)	1322351b92	MDL-60611 phpunit: Bump phpunit to 6.4 and travis to use PHP72	2017-11-02 23:45:21 +01:00
Andrew Nicols	0df5c743ad	MDL-60361 calendar: Make eventtype functionality a trait	2017-11-02 07:57:44 +08:00
Marina Glancy	9016f772ce	MDL-60391 libraries: patch bennu for php 7.2	2017-10-13 16:42:34 +08:00