Merge branch 'MDL-69776-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2020 04:33:07 +0000 (12:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2020 04:33:07 +0000 (12:33 +0800)
1  2 
lib/db/services.php
version.php

diff --combined lib/db/services.php
@@@ -287,13 -287,6 +287,13 @@@ $functions = array
          'type'          => 'read',
          'ajax'          => true,
      ],
 +    'core_calendar_get_calendar_export_token' => [
 +        'classname'     => 'core_calendar\external\export\token',
 +        'methodname'    => 'execute',
 +        'description'   => 'Return the auth token required for exporting a calendar.',
 +        'type'          => 'read',
 +        'services'      => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
 +    ],
      'core_cohort_add_cohort_members' => array(
          'classname' => 'core_cohort_external',
          'methodname' => 'add_cohort_members',
          'type'        => 'write',
          'classpath'   => 'files/externallib.php',
      ),
+     'core_files_delete_draft_files' => array(
+         'classname' => 'core_files\external\delete\draft',
+         'methodname' => 'execute',
+         'description' => 'Delete the indicated files (or directories) from a user draft file area.',
+         'type'        => 'write',
+         'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
+     ),
      'core_form_get_filetypes_browser_data' => array(
          'classname' => 'core_form\external',
          'methodname' => 'get_filetypes_browser_data',
diff --combined version.php
@@@ -29,9 -29,9 +29,9 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2021052500.21;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2021052500.17;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2021052500.22;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
 -$release  = '4.0dev (Build: 20200924)'; // Human-friendly version name
 +$release  = '4.0dev (Build: 20201009)'; // Human-friendly version name
  $branch   = '400';                      // This version's branch.
  $maturity = MATURITY_ALPHA;             // This version's maturity level.