moodle.git
4 years agoMDL-54708 message: notification popover respects message preferences
Ryan Wyllie [Fri, 29 Jul 2016 02:10:32 +0000 (02:10 +0000)]
MDL-54708 message: notification popover respects message preferences

4 years agoMDL-54698 message: make processor settings dialogue
Ryan Wyllie [Mon, 25 Jul 2016 03:17:00 +0000 (03:17 +0000)]
MDL-54698 message: make processor settings dialogue

4 years agoMDL-54698 message: change preferences to checkboxes
Ryan Wyllie [Fri, 22 Jul 2016 03:02:42 +0000 (03:02 +0000)]
MDL-54698 message: change preferences to checkboxes

4 years agoMDL-54701 message: rename module imports in js
Ryan Wyllie [Thu, 21 Jul 2016 04:46:49 +0000 (04:46 +0000)]
MDL-54701 message: rename module imports in js

4 years agoMDL-54701 message: renamed mdl-popover to popover-region
Ryan Wyllie [Thu, 21 Jul 2016 03:24:47 +0000 (03:24 +0000)]
MDL-54701 message: renamed mdl-popover to popover-region

4 years agoMDL-54687 core_message: prefixed 'message_area' to JS and template files
Mark Nelson [Thu, 21 Jul 2016 06:19:09 +0000 (14:19 +0800)]
MDL-54687 core_message: prefixed 'message_area' to JS and template files

4 years agoMDL-54687 core_message: decreased size of messaging area
Mark Nelson [Tue, 19 Jul 2016 10:25:03 +0000 (18:25 +0800)]
MDL-54687 core_message: decreased size of messaging area

4 years agoMDL-54687 core_message: removed loading template
Mark Nelson [Tue, 19 Jul 2016 07:36:14 +0000 (15:36 +0800)]
MDL-54687 core_message: removed loading template

4 years agoMDL-54698 message: add context to preferences templates
Ryan Wyllie [Tue, 19 Jul 2016 06:47:24 +0000 (06:47 +0000)]
MDL-54698 message: add context to preferences templates

4 years agoMDL-54698 message: split message preference page into renderables
Ryan Wyllie [Tue, 19 Jul 2016 05:22:48 +0000 (05:22 +0000)]
MDL-54698 message: split message preference page into renderables

4 years agoMDL-54698 message: split message preferences page js
Ryan Wyllie [Tue, 19 Jul 2016 02:01:08 +0000 (02:01 +0000)]
MDL-54698 message: split message preferences page js

4 years agoMDL-54701 message: added isread to data_for_messagearea_conversations
Ryan Wyllie [Mon, 18 Jul 2016 06:58:55 +0000 (06:58 +0000)]
MDL-54701 message: added isread to data_for_messagearea_conversations

4 years agoMDL-54701 message: add user profile links to popovers
Ryan Wyllie [Mon, 18 Jul 2016 06:01:40 +0000 (06:01 +0000)]
MDL-54701 message: add user profile links to popovers

Make the user name link to the user's profile page for the message and
notification popovers.

4 years agoMDL-54701 message: allow relativeUrl to take params
Ryan Wyllie [Mon, 18 Jul 2016 05:55:31 +0000 (05:55 +0000)]
MDL-54701 message: allow relativeUrl to take params

4 years agoMDL-54708 message: fix js module naming
Ryan Wyllie [Mon, 18 Jul 2016 01:54:07 +0000 (01:54 +0000)]
MDL-54708 message: fix js module naming

4 years agoMDL-54701 message: add message notification popover
Ryan Wyllie [Fri, 8 Jul 2016 07:45:04 +0000 (07:45 +0000)]
MDL-54701 message: add message notification popover

4 years agoMDL-54708 message: change popover processor to nav bar notification
Ryan Wyllie [Thu, 7 Jul 2016 05:12:41 +0000 (05:12 +0000)]
MDL-54708 message: change popover processor to nav bar notification

4 years agoMDL-54708 message: add ability to block popup notifications
Ryan Wyllie [Fri, 1 Jul 2016 01:20:18 +0000 (01:20 +0000)]
MDL-54708 message: add ability to block popup notifications

4 years agoMDL-54698 message: make preferences page ajax save
Ryan Wyllie [Thu, 23 Jun 2016 02:53:58 +0000 (02:53 +0000)]
MDL-54698 message: make preferences page ajax save

4 years agoMDL-54708 message: add notification popover to nav bar
Ryan Wyllie [Thu, 16 Jun 2016 07:47:53 +0000 (07:47 +0000)]
MDL-54708 message: add notification popover to nav bar

4 years agoMDL-54708 message: add backend APIs for notifications popover
Ryan Wyllie [Thu, 16 Jun 2016 07:41:02 +0000 (07:41 +0000)]
MDL-54708 message: add backend APIs for notifications popover

4 years agoMDL-54700 message: added toggle contact button to user profile
Ryan Wyllie [Tue, 21 Jun 2016 03:32:06 +0000 (03:32 +0000)]
MDL-54700 message: added toggle contact button to user profile

4 years agoMDL-54687 core_message: added ability to delete conversations
Mark Nelson [Mon, 11 Jul 2016 10:48:51 +0000 (18:48 +0800)]
MDL-54687 core_message: added ability to delete conversations

4 years agoMDL-54687 core_message: added menu bar
Mark Nelson [Thu, 14 Jul 2016 11:06:47 +0000 (19:06 +0800)]
MDL-54687 core_message: added menu bar

4 years agoMDL-54687 core_message: refactored JS
Mark Nelson [Thu, 7 Jul 2016 06:40:41 +0000 (14:40 +0800)]
MDL-54687 core_message: refactored JS

- Created smaller AMD modules to handle specific tasks.
- Used JS events to notify AMD modules when an action has happened.
- Used data-* selectors, rather than CSS selectors (and removed
  any unused CSS selectors).
- Minor changes to behaviour when sending and deleting messages.
- Added JSDocs.
- General improvements to JS.

4 years agoMDL-54687 core: added appendNodeContents() to the AMD templates module
Mark Nelson [Fri, 29 Jul 2016 09:10:52 +0000 (17:10 +0800)]
MDL-54687 core: added appendNodeContents() to the AMD templates module

4 years agoMDL-54687 core_message: added ability to delete messages
Mark Nelson [Fri, 24 Jun 2016 06:24:00 +0000 (14:24 +0800)]
MDL-54687 core_message: added ability to delete messages

4 years agoMDL-54687 core_message: added ability to view a contact's profile
Mark Nelson [Thu, 23 Jun 2016 10:12:11 +0000 (18:12 +0800)]
MDL-54687 core_message: added ability to view a contact's profile

Also added functionality to the profile page -

- View user's profile.
- Send the user a message.
- Block the user.
- Remove the user as a contact.

4 years agoMDL-54687 core_message: added userid parameter for altering contacts
Mark Nelson [Fri, 1 Jul 2016 03:50:59 +0000 (11:50 +0800)]
MDL-54687 core_message: added userid parameter for altering contacts

4 years agoMDL-54687 core_message: added ability to send messages
Mark Nelson [Tue, 21 Jun 2016 07:36:24 +0000 (15:36 +0800)]
MDL-54687 core_message: added ability to send messages

4 years agoMDL-54687 core_message: added ability to view messages
Mark Nelson [Mon, 4 Jul 2016 05:26:07 +0000 (13:26 +0800)]
MDL-54687 core_message: added ability to view messages

4 years agoMDL-54687 core_message: added ability to toggle between tabs
Mark Nelson [Mon, 4 Jul 2016 12:26:09 +0000 (20:26 +0800)]
MDL-54687 core_message: added ability to toggle between tabs

4 years agoMDL-54687 core_message: created page for new messaging interface
Mark Nelson [Tue, 31 May 2016 11:34:29 +0000 (19:34 +0800)]
MDL-54687 core_message: created page for new messaging interface

This commit introduces the templates, renderer and initial API
that will be used for further development.

4 years agoMDL-54687 theme: removed message related CSS
Mark Nelson [Tue, 31 May 2016 10:05:01 +0000 (18:05 +0800)]
MDL-54687 theme: removed message related CSS

4 years agoMDL-54687 core_message: removed 'message_print_*' functions
Mark Nelson [Thu, 14 Jul 2016 04:19:31 +0000 (12:19 +0800)]
MDL-54687 core_message: removed 'message_print_*' functions

4 years agoweekly release 3.2dev
Eloy Lafuente (stronk7) [Thu, 6 Oct 2016 20:31:27 +0000 (22:31 +0200)]
weekly release 3.2dev

4 years agoMerge branch 'MDL-56306-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 6 Oct 2016 20:25:46 +0000 (22:25 +0200)]
Merge branch 'MDL-56306-master' of git://github.com/danpoltawski/moodle

4 years agoMDL-56303 quiz: lack of quiz filtering
Dan Poltawski [Thu, 6 Oct 2016 15:51:00 +0000 (16:51 +0100)]
MDL-56303 quiz: lack of quiz filtering

Also, correctly feed completiongradeitemnumber with grade item numbers
and not with grade item ids.

4 years agoMDL-56306 tests: make upgrade_util_test compatible with travis
Dan Poltawski [Thu, 6 Oct 2016 16:50:58 +0000 (17:50 +0100)]
MDL-56306 tests: make upgrade_util_test compatible with travis

4 years agoweekly release 3.2dev
Eloy Lafuente (stronk7) [Thu, 6 Oct 2016 09:51:28 +0000 (11:51 +0200)]
weekly release 3.2dev

4 years agoNOBUG: Fixed file access permissions
Eloy Lafuente (stronk7) [Thu, 6 Oct 2016 09:51:28 +0000 (11:51 +0200)]
NOBUG: Fixed file access permissions

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 6 Oct 2016 09:51:24 +0000 (11:51 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMDL-22078 lib: bump redirect_if_major_update_required()
Dan Poltawski [Thu, 6 Oct 2016 08:23:15 +0000 (09:23 +0100)]
MDL-22078 lib: bump redirect_if_major_update_required()

Changes to the course table enforce an update

4 years agoMerge branch 'wip-mdl-55986-fix-2' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 6 Oct 2016 07:07:16 +0000 (15:07 +0800)]
Merge branch 'wip-mdl-55986-fix-2' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-55986 behat: use double quotes not single
Rajesh Taneja [Thu, 6 Oct 2016 07:03:56 +0000 (15:03 +0800)]
MDL-55986 behat: use double quotes not single

On windows we need option value to be in
double quotes, else it fails

4 years agoMerge branch 'MDL-22078_master-fix' of git://github.com/dmonllao/moodle
Andrew Nicols [Thu, 6 Oct 2016 02:38:24 +0000 (10:38 +0800)]
Merge branch 'MDL-22078_master-fix' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'wip-mdl-55739' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 6 Oct 2016 02:08:14 +0000 (10:08 +0800)]
Merge branch 'wip-mdl-55739' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-22078 course reset: No enddate time shift if no enddate
David Monllao [Thu, 6 Oct 2016 02:07:22 +0000 (10:07 +0800)]
MDL-22078 course reset: No enddate time shift if no enddate

4 years agoMDL-55739 core_course: Check if gradepass is set and not empty
Rajesh Taneja [Thu, 6 Oct 2016 01:50:21 +0000 (09:50 +0800)]
MDL-55739 core_course: Check if gradepass is set and not empty

Default value of gradepass is 0.00000 and empty check
passes. But on oracle gradepass value is 0, so just
check if the field is set and that should be enough

4 years agoMDL-56092 auth_email: Correct assumed ordering in unit test
Andrew Nicols [Thu, 6 Oct 2016 01:07:08 +0000 (09:07 +0800)]
MDL-56092 auth_email: Correct assumed ordering in unit test

4 years agoMerge branch 'wip-mdl-55713' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 5 Oct 2016 23:58:58 +0000 (01:58 +0200)]
Merge branch 'wip-mdl-55713' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-55713 behat: Include named and partial behat selector files
Rajesh Taneja [Wed, 5 Oct 2016 23:30:37 +0000 (07:30 +0800)]
MDL-55713 behat: Include named and partial behat selector files

4 years agoMDL-53777 tool_mobile: Fix incorrect and untranslated string
Juan Leyva [Wed, 5 Oct 2016 09:44:44 +0000 (10:44 +0100)]
MDL-53777 tool_mobile: Fix incorrect and untranslated string

4 years agoMerge branch 'MDL-54802-master-fix-2' of git://github.com/cameron1729/moodle
Dan Poltawski [Wed, 5 Oct 2016 13:34:11 +0000 (14:34 +0100)]
Merge branch 'MDL-54802-master-fix-2' of git://github.com/cameron1729/moodle

4 years agoMDL-54802 mod_quiz: Improve validation when editing a quiz uusing require passing...
Cameron Ball [Wed, 5 Oct 2016 11:16:33 +0000 (19:16 +0800)]
MDL-54802 mod_quiz: Improve validation when editing a quiz uusing require passing grade

When editing a quiz that is using the require passing grade completion method,
the grade to pass cannot be zero. Since the completion method is locked we
cannot recommend that the completion method is changed (as we do when the quiz
is being created). Instead we have to inform the user that the grade to pass
must not be zero.

4 years agoMerge branch 'MDL-22078_master' of https://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 5 Oct 2016 10:22:07 +0000 (12:22 +0200)]
Merge branch 'MDL-22078_master' of https://github.com/dmonllao/moodle

4 years agoMerge branch 'MDL-54802-master-fix' of git://github.com/cameron1729/moodle
Dan Poltawski [Wed, 5 Oct 2016 09:33:14 +0000 (10:33 +0100)]
Merge branch 'MDL-54802-master-fix' of git://github.com/cameron1729/moodle

4 years agoMerge branch 'MDL-56194-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 5 Oct 2016 09:25:30 +0000 (10:25 +0100)]
Merge branch 'MDL-56194-master' of git://github.com/FMCorz/moodle

4 years agoMDL-54802 mod_quiz: Move grade to pass error to require passing grade element
Cameron Ball [Wed, 5 Oct 2016 09:14:00 +0000 (17:14 +0800)]
MDL-54802 mod_quiz: Move grade to pass error to require passing grade element

When using a passing grade of zero, with the required passing grade
option, an error was displayed on the "grade to pass" element.
This was confusing as the error message is referring to the
"Require passing grade" element. This patch moves the message to
the "Require passing grade" element.

Additionaly this patch fixes a small typo in a comment.

4 years agoMerge branch 'wip-mdl-56210-fix' of https://github.com/rajeshtaneja/moodle
David Monllao [Wed, 5 Oct 2016 07:51:43 +0000 (15:51 +0800)]
Merge branch 'wip-mdl-56210-fix' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-56210 behat: Test for disabled button later
Rajesh Taneja [Wed, 5 Oct 2016 05:18:36 +0000 (13:18 +0800)]
MDL-56210 behat: Test for disabled button later

With phantomjs, dom is not updated by the time
next step is executed, so suffle it to ensure
this scenario pass

4 years agoMerge branch 'MDL-55713-master-fix' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 5 Oct 2016 07:26:36 +0000 (15:26 +0800)]
Merge branch 'MDL-55713-master-fix' of git://github.com/andrewnicols/moodle

4 years agoMDL-55713 behat: Bad rebase conflict resolution fix
Andrew Nicols [Wed, 5 Oct 2016 07:14:13 +0000 (15:14 +0800)]
MDL-55713 behat: Bad rebase conflict resolution fix

4 years agoMerge branch 'MDL-55129-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 5 Oct 2016 07:08:11 +0000 (08:08 +0100)]
Merge branch 'MDL-55129-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-55767-master-fix1' of http://github.com/damyon/moodle
Andrew Nicols [Wed, 5 Oct 2016 06:24:09 +0000 (14:24 +0800)]
Merge branch 'MDL-55767-master-fix1' of github.com/damyon/moodle

4 years agoMDL-55767 tool_lpimportcsv: Find existing scales on the site
Damyon Wiese [Wed, 5 Oct 2016 06:12:55 +0000 (14:12 +0800)]
MDL-55767 tool_lpimportcsv: Find existing scales on the site

The code was trying to match the imported scale to an existing scale for the site. It was
not loading the items before comparing them, so the matching always failed.

4 years agoMDL-55713 behat: Correct all references to selectortype
Andrew Nicols [Wed, 5 Oct 2016 06:10:24 +0000 (14:10 +0800)]
MDL-55713 behat: Correct all references to selectortype

4 years agoMDL-22078 course: Complete proposed patch
David Monllao [Thu, 1 Sep 2016 05:29:19 +0000 (13:29 +0800)]
MDL-22078 course: Complete proposed patch

- New site setting to define the default course duration (used to set
  the default end date for some course formats)
- End date setting out of restore
- Fix tool_uploadcourse
- Other fixes here and there

4 years agoMDL-55713
Andrew Nicols [Wed, 5 Oct 2016 03:46:49 +0000 (11:46 +0800)]
MDL-55713

4 years agoMDL-55713 behat: Correct copy/paste error
Andrew Nicols [Wed, 5 Oct 2016 03:04:56 +0000 (11:04 +0800)]
MDL-55713 behat: Correct copy/paste error

4 years agoMerge branch 'wip-mdl-56092' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 5 Oct 2016 02:08:15 +0000 (10:08 +0800)]
Merge branch 'wip-mdl-56092' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-56092 phpunit: Add auth/tests to phpunit.xml.dist
Rajesh Taneja [Wed, 5 Oct 2016 02:00:21 +0000 (10:00 +0800)]
MDL-56092 phpunit: Add auth/tests to phpunit.xml.dist

4 years agoMerge branch 'wip-mdl-55986-fix' of git://github.com/rajeshtaneja/moodle
David Monllao [Wed, 5 Oct 2016 01:46:36 +0000 (09:46 +0800)]
Merge branch 'wip-mdl-55986-fix' of git://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'MDL-45969-master' of git://github.com/damyon/moodle
David Monllao [Wed, 5 Oct 2016 01:42:17 +0000 (09:42 +0800)]
Merge branch 'MDL-45969-master' of git://github.com/damyon/moodle

4 years agoMDL-55986 behat: all options are not valid for single run
Rajesh Taneja [Wed, 5 Oct 2016 01:39:26 +0000 (09:39 +0800)]
MDL-55986 behat: all options are not valid for single run

Sanitize options which are valid for single run only

4 years agoMerge branch 'MDL-56092-master' of git://github.com/jleyva/moodle
Andrew Nicols [Wed, 5 Oct 2016 00:30:35 +0000 (08:30 +0800)]
Merge branch 'MDL-56092-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-56016-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Wed, 5 Oct 2016 00:10:02 +0000 (08:10 +0800)]
Merge branch 'MDL-56016-master' of git://github.com/FMCorz/moodle

4 years agoMerge branch 'MDL-56231-32-flexible_table-construct-phpdoc' of https://github.com...
Eloy Lafuente (stronk7) [Tue, 4 Oct 2016 23:48:49 +0000 (01:48 +0200)]
Merge branch 'MDL-56231-32-flexible_table-construct-phpdoc' of https://github.com/roperto/moodle

4 years agoMDL-55713 behat: fix mistakenly broken php
Eloy Lafuente (stronk7) [Tue, 4 Oct 2016 23:21:32 +0000 (01:21 +0200)]
MDL-55713 behat: fix mistakenly broken php

4 years agoMerge branch 'MDL-56126-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2016 23:05:27 +0000 (01:05 +0200)]
Merge branch 'MDL-56126-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-55713-master-3' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2016 22:34:01 +0000 (00:34 +0200)]
Merge branch 'MDL-55713-master-3' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'wip-mdl-55986' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2016 22:29:29 +0000 (00:29 +0200)]
Merge branch 'wip-mdl-55986' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-55129 mod_assign: Allow plugins to handle configs for external
Juan Leyva [Wed, 21 Sep 2016 11:59:32 +0000 (12:59 +0100)]
MDL-55129 mod_assign: Allow plugins to handle configs for external

Until now in the get_assignments WS all the settings for assignment
plugins (submission and feedback) are returned, this was bad because:

- It was returning settings for plugins that may not be enabled
- It was returning settings that would be a security risk (a third
party plugin including a password or credentials for connecting a
remote site)
- Some values was returned "raw" without further processing, for
example, maxsubmissionsizebytes returned 0 when using the plugin
default value instead a valid size
- Assignment plugins implemented an API for communication with the
external API, see for example: get_external_parameters, it didn’t make
sense had an API for the received parameters and not the returned data.

4 years agoMDL-55404 upgrade: dramatically simplify test code
Dan Poltawski [Tue, 4 Oct 2016 17:28:34 +0000 (18:28 +0100)]
MDL-55404 upgrade: dramatically simplify test code

Fixing http://xunitpatterns.com/Obscure%20Test.html

4 years agoMerge branch 'MDL-55404-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 4 Oct 2016 17:23:36 +0000 (18:23 +0100)]
Merge branch 'MDL-55404-master' of git://github.com/cameron1729/moodle

4 years agoMDL-56011 lib: move Mustache loading to core_component autoloader
Dan Poltawski [Tue, 4 Oct 2016 17:09:41 +0000 (18:09 +0100)]
MDL-56011 lib: move Mustache loading to core_component autoloader

4 years agoMerge branch 'MDL-56011-master' of https://github.com/snake/moodle
Dan Poltawski [Tue, 4 Oct 2016 17:16:04 +0000 (18:16 +0100)]
Merge branch 'MDL-56011-master' of https://github.com/snake/moodle

4 years agoMDL-55739 course: more whitespace
Dan Poltawski [Tue, 4 Oct 2016 17:12:41 +0000 (18:12 +0100)]
MDL-55739 course: more whitespace

4 years agoMDL-55739 course: fix trailing whitespace
Dan Poltawski [Tue, 4 Oct 2016 17:07:08 +0000 (18:07 +0100)]
MDL-55739 course: fix trailing whitespace

4 years agoMerge branch 'MDL-55739-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 4 Oct 2016 16:58:27 +0000 (17:58 +0100)]
Merge branch 'MDL-55739-master' of git://github.com/jleyva/moodle

4 years agoAutomatically generated installer lang files
AMOS bot [Tue, 4 Oct 2016 16:05:47 +0000 (00:05 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-55100-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 4 Oct 2016 16:00:53 +0000 (17:00 +0100)]
Merge branch 'MDL-55100-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-54866-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 4 Oct 2016 14:50:44 +0000 (15:50 +0100)]
Merge branch 'MDL-54866-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-55861-master' of https://github.com/dj4452/moodle
Dan Poltawski [Tue, 4 Oct 2016 14:43:51 +0000 (15:43 +0100)]
Merge branch 'MDL-55861-master' of https://github.com/dj4452/moodle

4 years agoMerge branch 'MDL-56069' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2016 14:34:50 +0000 (16:34 +0200)]
Merge branch 'MDL-56069' of git://github.com/timhunt/moodle

4 years agoMerge branch 'empty-checks' of https://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2016 14:16:36 +0000 (16:16 +0200)]
Merge branch 'empty-checks' of https://github.com/danpoltawski/moodle

4 years agoMDL-55059 output: fix empty checks
Dan Poltawski [Tue, 4 Oct 2016 14:07:57 +0000 (15:07 +0100)]
MDL-55059 output: fix empty checks

4 years agoMerge branch 'MDL-56168-master-fixup' of https://github.com/FMCorz/moodle
Andrew Nicols [Tue, 4 Oct 2016 12:54:27 +0000 (20:54 +0800)]
Merge branch 'MDL-56168-master-fixup' of https://github.com/FMCorz/moodle

4 years agoMerge branch 'wip-mdl-55769' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 4 Oct 2016 12:13:26 +0000 (13:13 +0100)]
Merge branch 'wip-mdl-55769' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'MDL-45890_m32v3' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 4 Oct 2016 12:11:37 +0000 (13:11 +0100)]
Merge branch 'MDL-45890_m32v3' of https://github.com/sbourget/moodle