Merge branch 'MDL-61245-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2018 09:14:57 +0000 (11:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2018 09:14:57 +0000 (11:14 +0200)
1  2 
lib/db/services.php
version.php

diff --combined lib/db/services.php
@@@ -83,6 -83,15 +83,15 @@@ $functions = array
          'ajax'          => true,
          'loginrequired' => false,
      ),
+     'core_blog_view_entries' => array(
+         'classname'   => 'core_blog\external',
+         'methodname'  => 'view_entries',
+         'description' => 'Trigger the blog_entries_viewed event.',
+         'type'        => 'read',
+         'services'    => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
+         'ajax'          => true,
+         'loginrequired' => false,
+     ),
      'core_calendar_get_calendar_monthly_view' => array(
          'classname' => 'core_calendar_external',
          'methodname' => 'get_calendar_monthly_view',
          'description' => 'Updates existing groupings',
          'type' => 'write',
      ),
 +    'core_message_block_user' => array(
 +        'classname' => 'core_message_external',
 +        'methodname' => 'block_user',
 +        'classpath' => 'message/externallib.php',
 +        'description' => 'Blocks a user',
 +        'type' => 'write',
 +        'ajax' => true,
 +        'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
 +    ),
      'core_message_block_contacts' => array(
          'classname' => 'core_message_external',
          'methodname' => 'block_contacts',
          'classpath' => 'message/externallib.php',
 -        'description' => 'Block contacts',
 +        'description' => '** DEPRECATED ** Please do not call this function any more.
 +                          Block contacts',
          'type' => 'write',
          'ajax' => true,
          'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
          'classname' => 'core_message_external',
          'methodname' => 'create_contacts',
          'classpath' => 'message/externallib.php',
 -        'description' => 'Add contacts to the contact list',
 +        'description' => '** DEPRECATED ** Please do not call this function any more.
 +                          Add contacts to the contact list',
          'type' => 'write',
          'ajax' => true,
          'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
 +    ),
 +    'core_message_get_contact_requests' => array(
 +        'classname' => 'core_message_external',
 +        'methodname' => 'get_contact_requests',
 +        'classpath' => 'message/externallib.php',
 +        'description' => 'Returns contact requests for a user',
 +        'type' => 'read',
 +        'ajax' => true,
 +        'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
 +    ),
 +    'core_message_create_contact_request' => array(
 +        'classname' => 'core_message_external',
 +        'methodname' => 'create_contact_request',
 +        'classpath' => 'message/externallib.php',
 +        'description' => 'Creates a contact request',
 +        'type' => 'write',
          'ajax' => true,
 +        'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
 +    ),
 +    'core_message_confirm_contact_request' => array(
 +        'classname' => 'core_message_external',
 +        'methodname' => 'confirm_contact_request',
 +        'classpath' => 'message/externallib.php',
 +        'description' => 'Confirms a contact request',
 +        'type' => 'write',
 +        'ajax' => true,
 +        'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
 +    ),
 +    'core_message_decline_contact_request' => array(
 +        'classname' => 'core_message_external',
 +        'methodname' => 'decline_contact_request',
 +        'classpath' => 'message/externallib.php',
 +        'description' => 'Declines a contact request',
 +        'type' => 'write',
 +        'ajax' => true,
 +        'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
      ),
      'core_message_delete_contacts' => array(
          'classname' => 'core_message_external',
          'type' => 'write',
          'ajax' => true,
          'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
 -        'ajax' => true,
      ),
      'core_message_delete_conversation' => array(
          'classname' => 'core_message_external',
          'ajax' => true,
          'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
      ),
 +    'core_message_unblock_user' => array(
 +        'classname' => 'core_message_external',
 +        'methodname' => 'unblock_user',
 +        'classpath' => 'message/externallib.php',
 +        'description' => 'Unblocks a user',
 +        'type' => 'write',
 +        'ajax' => true,
 +        'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
 +    ),
      'core_message_unblock_contacts' => array(
          'classname' => 'core_message_external',
          'methodname' => 'unblock_contacts',
          'classpath' => 'message/externallib.php',
 -        'description' => 'Unblock contacts',
 +        'description' => '** DEPRECATED ** Please do not call this function any more.
 +                         Unblock contacts',
          'type' => 'write',
          'ajax' => true,
          'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
diff --combined version.php
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2018100500.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2018092700.03;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2018100900.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
  
 -$release  = '3.6dev (Build: 20180927)'; // Human-friendly version name
 +$release  = '3.6dev (Build: 20181005)'; // Human-friendly version name
  
  $branch   = '36';                       // This version's branch.
  $maturity = MATURITY_ALPHA;             // This version's maturity level.