moodle.git
5 years agoMDL-53402 mod_data: field values of 0 are now displayed.
Adrian Greeve [Tue, 3 May 2016 06:22:16 +0000 (14:22 +0800)]
MDL-53402 mod_data: field values of 0 are now displayed.

5 years agoMDL-53402 mod_data: Added custom validation code for data fields.
Adrian Greeve [Tue, 3 May 2016 04:48:00 +0000 (12:48 +0800)]
MDL-53402 mod_data: Added custom validation code for data fields.

Added custom validation to radiobutton, menu, and checkbox.

5 years agoMDL-53402 mod_data: Behat test for entering zero in required fields.
Adrian Greeve [Fri, 1 Apr 2016 05:50:53 +0000 (13:50 +0800)]
MDL-53402 mod_data: Behat test for entering zero in required fields.

5 years agoMDL-53402 mod_data: Required fields can contain 0.
Adrian Greeve [Thu, 31 Mar 2016 07:26:21 +0000 (15:26 +0800)]
MDL-53402 mod_data: Required fields can contain 0.

The number and text field would not accept 0 as a
valid response.

5 years agoon-demand release 3.1dev+
Dan Poltawski [Fri, 29 Apr 2016 11:27:28 +0000 (12:27 +0100)]
on-demand release 3.1dev+

5 years agoNOBUG: Fixed file access permissions
Dan Poltawski [Fri, 29 Apr 2016 11:27:27 +0000 (12:27 +0100)]
NOBUG: Fixed file access permissions

5 years agoMerge branch 'MDL-53937-master' of git://github.com/FMCorz/moodle
David Monllao [Fri, 29 Apr 2016 08:34:20 +0000 (16:34 +0800)]
Merge branch 'MDL-53937-master' of git://github.com/FMCorz/moodle

5 years agoMDL-53937 core_competency: False negative with duedate on plan reopen
Frederic Massart [Fri, 29 Apr 2016 05:50:06 +0000 (13:50 +0800)]
MDL-53937 core_competency: False negative with duedate on plan reopen

5 years agoMDL-52154 lti: fix string errors
Dan Poltawski [Fri, 29 Apr 2016 08:30:31 +0000 (09:30 +0100)]
MDL-52154 lti: fix string errors

Thanks to Helen

5 years agoMerge branch 'MDL-53943-master' of git://github.com/junpataleta/moodle
David Monllao [Fri, 29 Apr 2016 04:29:18 +0000 (12:29 +0800)]
Merge branch 'MDL-53943-master' of git://github.com/junpataleta/moodle

Conflicts:
admin/tool/cohortroles/settings.php

5 years agoMerge branch 'MDL-53879-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 28 Apr 2016 13:29:39 +0000 (14:29 +0100)]
Merge branch 'MDL-53879-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-53716-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 28 Apr 2016 11:37:41 +0000 (12:37 +0100)]
Merge branch 'MDL-53716-master' of git://github.com/FMCorz/moodle

5 years agoMDL-53494 tool_lp: Set correct competency and user ID attributes
Jun Pataleta [Thu, 28 Apr 2016 04:09:09 +0000 (12:09 +0800)]
MDL-53494 tool_lp: Set correct competency and user ID attributes

Sets the correct competency and user ID data attributes for the list of
user competencies in the plan.

5 years agoMerge branch 'wip-MDL-53638-fix' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 28 Apr 2016 11:08:42 +0000 (13:08 +0200)]
Merge branch 'wip-MDL-53638-fix' of https://github.com/marinaglancy/moodle

5 years agoMDL-49414 externallib: Cleaning tabs
David Monllao [Thu, 28 Apr 2016 09:29:31 +0000 (17:29 +0800)]
MDL-49414 externallib: Cleaning tabs

5 years agoMDL-53638 mod_feedback: fix to responsetime in non-anon answer
Marina Glancy [Thu, 28 Apr 2016 08:42:22 +0000 (16:42 +0800)]
MDL-53638 mod_feedback: fix to responsetime in non-anon answer

5 years agoMDL-49414 user: Fixing unmanaged conflict
David Monllao [Thu, 28 Apr 2016 09:16:16 +0000 (17:16 +0800)]
MDL-49414 user: Fixing unmanaged conflict

5 years agoMerge branch 'MDL-37753-feedback-name' of https://github.com/brendanheywood/moodle
Andrew Nicols [Thu, 28 Apr 2016 07:26:00 +0000 (15:26 +0800)]
Merge branch 'MDL-37753-feedback-name' of https://github.com/brendanheywood/moodle

5 years agoMerge branch 'MDL-49414-master' of git://github.com/cameron1729/moodle
David Monllao [Thu, 28 Apr 2016 08:58:17 +0000 (16:58 +0800)]
Merge branch 'MDL-49414-master' of git://github.com/cameron1729/moodle

5 years agoMDL-37753 mod_feedback: Use activity name for export filename
Brendan Heywood [Thu, 28 Apr 2016 03:05:26 +0000 (13:05 +1000)]
MDL-37753 mod_feedback: Use activity name for export filename

5 years agoMerge branch 'MDL-53973-tablelib-worksheet-name' of https://github.com/brendanheywood...
Andrew Nicols [Thu, 28 Apr 2016 07:17:29 +0000 (15:17 +0800)]
Merge branch 'MDL-53973-tablelib-worksheet-name' of https://github.com/brendanheywood/moodle

5 years agoMDL-37753 dataformat: Only set worksheet name where implemented
Brendan Heywood [Thu, 28 Apr 2016 04:34:33 +0000 (14:34 +1000)]
MDL-37753 dataformat: Only set worksheet name where implemented

5 years agoMDL-53973 tablelib: Fixed bug with worksheetname being ignored
Brendan Heywood [Thu, 28 Apr 2016 03:01:27 +0000 (13:01 +1000)]
MDL-53973 tablelib: Fixed bug with worksheetname being ignored

5 years agoMDL-53858 quiz accessibility: Correct aria-labelledby attribute
Andrew Nicols [Thu, 28 Apr 2016 06:39:33 +0000 (14:39 +0800)]
MDL-53858 quiz accessibility: Correct aria-labelledby attribute

5 years agoMerge branch 'MDL-53858' of git://github.com/timhunt/moodle
Andrew Nicols [Thu, 28 Apr 2016 06:13:27 +0000 (14:13 +0800)]
Merge branch 'MDL-53858' of git://github.com/timhunt/moodle

5 years agoMerge branch 'MDL-52035_master' of git://github.com/markn86/moodle
David Monllao [Thu, 28 Apr 2016 05:37:00 +0000 (13:37 +0800)]
Merge branch 'MDL-52035_master' of git://github.com/markn86/moodle

5 years agoMDL-52035 enrol_lti: added fix for oracle
Mark Nelson [Thu, 28 Apr 2016 05:20:58 +0000 (13:20 +0800)]
MDL-52035 enrol_lti: added fix for oracle

Also added another unit test for \enrol_lti\helper::count_lti_tools();

5 years agoMerge branch 'MDL-53791-master-fix' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 28 Apr 2016 05:16:47 +0000 (13:16 +0800)]
Merge branch 'MDL-53791-master-fix' of git://github.com/andrewnicols/moodle

5 years agoMDL-53791 mod_wiki: Bump version for new WS
Andrew Nicols [Thu, 28 Apr 2016 04:28:45 +0000 (12:28 +0800)]
MDL-53791 mod_wiki: Bump version for new WS

5 years agoMDL-53638 mod_feedback: rebuild css
Eloy Lafuente (stronk7) [Wed, 27 Apr 2016 21:31:29 +0000 (23:31 +0200)]
MDL-53638 mod_feedback: rebuild css

5 years agoMerge branch 'MDL-53921-master' of git://github.com/ryanwyllie/moodle
David Monllao [Thu, 28 Apr 2016 03:53:31 +0000 (11:53 +0800)]
Merge branch 'MDL-53921-master' of git://github.com/ryanwyllie/moodle

5 years agoMDL-51603 flexitable: Document the deletion of get_download_menu()
Eloy Lafuente (stronk7) [Wed, 27 Apr 2016 21:10:56 +0000 (23:10 +0200)]
MDL-51603 flexitable: Document the deletion of get_download_menu()

5 years agoMerge branch 'wip-MDL-53638-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 27 Apr 2016 12:24:59 +0000 (14:24 +0200)]
Merge branch 'wip-MDL-53638-master' of https://github.com/marinaglancy/moodle

5 years agoMDL-53758 search: Fix unittest error
Eric Merrill [Wed, 27 Apr 2016 13:37:40 +0000 (09:37 -0400)]
MDL-53758 search: Fix unittest error

5 years agoMerge branch 'MDL-52154-master-wip2' of https://github.com/xow/moodle
Dan Poltawski [Wed, 27 Apr 2016 12:45:19 +0000 (13:45 +0100)]
Merge branch 'MDL-52154-master-wip2' of https://github.com/xow/moodle

5 years agoMerge branch 'MDL-53915-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Wed, 27 Apr 2016 09:55:06 +0000 (10:55 +0100)]
Merge branch 'MDL-53915-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-53919_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 27 Apr 2016 09:07:03 +0000 (10:07 +0100)]
Merge branch 'MDL-53919_master' of git://github.com/markn86/moodle

5 years agoMDL-53716 competency: Do not restore competencies when disabled
Frederic Massart [Thu, 28 Apr 2016 04:02:12 +0000 (12:02 +0800)]
MDL-53716 competency: Do not restore competencies when disabled

5 years agoMDL-53716 competency: Backup and restore course competency user data
Frederic Massart [Mon, 11 Apr 2016 06:59:37 +0000 (14:59 +0800)]
MDL-53716 competency: Backup and restore course competency user data

5 years agoMDL-53943 tool_cohortroles: Require 'moodle/cohort:view' capability
Jun Pataleta [Thu, 28 Apr 2016 08:41:38 +0000 (16:41 +0800)]
MDL-53943 tool_cohortroles: Require 'moodle/cohort:view' capability

tool_cohortroles not just needs the 'moodle/role:manage' capability,
but the 'moodle/cohort:view' capability as well since the cohorts
selector field will not work without it.

5 years agoMDL-53879 competency: Remove limit on framework depth
Frederic Massart [Tue, 26 Apr 2016 08:00:31 +0000 (16:00 +0800)]
MDL-53879 competency: Remove limit on framework depth

5 years agoMDL-53921 gradingform: Destroy frequently used comment dialog on hide
Ryan Wyllie [Wed, 27 Apr 2016 01:48:48 +0000 (01:48 +0000)]
MDL-53921 gradingform: Destroy frequently used comment dialog on hide

5 years agoMDL-53494 tool_lp: Fix dialogue display when plan is completed
Jun Pataleta [Wed, 27 Apr 2016 05:11:44 +0000 (13:11 +0800)]
MDL-53494 tool_lp: Fix dialogue display when plan is completed

5 years agoMDL-53638 mod_feedback: corrections during rebase:
Marina Glancy [Fri, 22 Apr 2016 02:49:00 +0000 (10:49 +0800)]
MDL-53638 mod_feedback: corrections during rebase:

1. make query in upgrade cross-DB
2. rebase on top of MDL-51603

5 years agoMDL-53638 mod_feedback: JS confirmation of deleting item
Marina Glancy [Fri, 15 Apr 2016 13:32:09 +0000 (21:32 +0800)]
MDL-53638 mod_feedback: JS confirmation of deleting item

5 years agoMDL-53638 mod_feedback: JS confirmation on delete entry and template
Marina Glancy [Fri, 15 Apr 2016 13:01:15 +0000 (21:01 +0800)]
MDL-53638 mod_feedback: JS confirmation on delete entry and template

5 years agoMDL-53638 mod_feedback: download responses
Marina Glancy [Sat, 9 Apr 2016 10:40:31 +0000 (18:40 +0800)]
MDL-53638 mod_feedback: download responses

5 years agoMDL-49414 webservices: Remove deprecated functions
Cameron Ball [Mon, 21 Mar 2016 08:51:04 +0000 (16:51 +0800)]
MDL-49414 webservices: Remove deprecated functions

5 years agoMerge branch 'MDL-53791-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Wed, 27 Apr 2016 07:51:43 +0000 (08:51 +0100)]
Merge branch 'MDL-53791-master' of git://github.com/crazyserver/moodle

5 years agoMDL-52035 enrol_lti: Fixed default mail display setting
Jun Pataleta [Wed, 27 Apr 2016 02:26:43 +0000 (10:26 +0800)]
MDL-52035 enrol_lti: Fixed default mail display setting

5 years agoMDL-53638 mod_feedback: template for summary
Marina Glancy [Sat, 9 Apr 2016 13:39:08 +0000 (21:39 +0800)]
MDL-53638 mod_feedback: template for summary

5 years agoMDL-53638 mod_feedback: analysis page enhancements
Marina Glancy [Sat, 9 Apr 2016 11:22:40 +0000 (19:22 +0800)]
MDL-53638 mod_feedback: analysis page enhancements

5 years agoMDL-53638 mod_feedback: change items classes
Marina Glancy [Sat, 9 Apr 2016 13:56:06 +0000 (21:56 +0800)]
MDL-53638 mod_feedback: change items classes

remove duplication by creating methods in the parent class
delete unused methods
add new method complete_form_element() that hooks into the moodleform

5 years agoMDL-53638 mod_feedback: convert to moodleforms
Marina Glancy [Fri, 11 Mar 2016 12:45:41 +0000 (20:45 +0800)]
MDL-53638 mod_feedback: convert to moodleforms

5 years agoMDL-53638 mod_feedback: structural changes
Marina Glancy [Sat, 9 Apr 2016 11:34:30 +0000 (19:34 +0800)]
MDL-53638 mod_feedback: structural changes

- add column 'courseid' to the feedback_completed and feedback_completedtmp tables
- drop table feedback_tracking because the same information is present in
  feedback_completed

5 years agoMDL-53638 forms: allow all elements to have css class
Marina Glancy [Sat, 9 Apr 2016 11:28:12 +0000 (19:28 +0800)]
MDL-53638 forms: allow all elements to have css class

5 years agoMDL-53738 feedback: enable mod and block by default
Marina Glancy [Thu, 7 Apr 2016 08:47:19 +0000 (16:47 +0800)]
MDL-53738 feedback: enable mod and block by default

5 years agoMDL-52154 mod_lti: Add tests and lang strings and finalise API
John Okely [Thu, 4 Feb 2016 05:48:16 +0000 (05:48 +0000)]
MDL-52154 mod_lti: Add tests and lang strings and finalise API

5 years agoMDL-53915 tool_cohortroles: Change setting URL to a proper moodle_url
Jun Pataleta [Fri, 22 Apr 2016 03:13:02 +0000 (11:13 +0800)]
MDL-53915 tool_cohortroles: Change setting URL to a proper moodle_url

5 years agoMDL-53919 core: fixed competency FKs
Mark Nelson [Wed, 27 Apr 2016 04:31:44 +0000 (12:31 +0800)]
MDL-53919 core: fixed competency FKs

5 years agoMerge branch 'MDL-53758-master' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 26 Apr 2016 18:34:20 +0000 (20:34 +0200)]
Merge branch 'MDL-53758-master' of git://github.com/merrill-oakland/moodle

5 years agoMDL-53698 admin_lp: trailing whitespace
Dan Poltawski [Tue, 26 Apr 2016 15:42:34 +0000 (16:42 +0100)]
MDL-53698 admin_lp: trailing whitespace

5 years agoMerge branch 'MDL-53698_master' of https://github.com/StudiUM/moodle
Dan Poltawski [Tue, 26 Apr 2016 15:42:00 +0000 (16:42 +0100)]
Merge branch 'MDL-53698_master' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-53780' of https://github.com/bostelm/moodle
Dan Poltawski [Tue, 26 Apr 2016 14:37:36 +0000 (15:37 +0100)]
Merge branch 'MDL-53780' of https://github.com/bostelm/moodle

5 years agoMerge branch 'MDL-53629_master2' of https://github.com/StudiUM/moodle
Dan Poltawski [Tue, 26 Apr 2016 12:32:31 +0000 (13:32 +0100)]
Merge branch 'MDL-53629_master2' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-53494_master' of https://github.com/StudiUM/moodle
Dan Poltawski [Tue, 26 Apr 2016 10:31:55 +0000 (11:31 +0100)]
Merge branch 'MDL-53494_master' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-53855' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 26 Apr 2016 10:17:45 +0000 (11:17 +0100)]
Merge branch 'MDL-53855' of git://github.com/timhunt/moodle

5 years agoMerge branch 'MDL-53942-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 26 Apr 2016 09:52:27 +0000 (10:52 +0100)]
Merge branch 'MDL-53942-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-53859_master' of https://github.com/StudiUM/moodle
Dan Poltawski [Tue, 26 Apr 2016 09:31:00 +0000 (10:31 +0100)]
Merge branch 'MDL-53859_master' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-53924-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 26 Apr 2016 09:28:37 +0000 (10:28 +0100)]
Merge branch 'MDL-53924-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-52035_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 26 Apr 2016 09:07:38 +0000 (10:07 +0100)]
Merge branch 'MDL-52035_master' of git://github.com/markn86/moodle

5 years agoon-demand release 3.1dev+
Dan Poltawski [Tue, 26 Apr 2016 08:29:04 +0000 (09:29 +0100)]
on-demand release 3.1dev+

5 years agoMDL-52035 enrol_lti: added PHPUnit and Behat tests
Mark Nelson [Fri, 8 Apr 2016 03:38:49 +0000 (11:38 +0800)]
MDL-52035 enrol_lti: added PHPUnit and Behat tests

5 years agoMDL-52035 enrol_lti: added backup/restore functionality
Mark Nelson [Wed, 6 Apr 2016 10:57:03 +0000 (18:57 +0800)]
MDL-52035 enrol_lti: added backup/restore functionality

5 years agoMDL-52035 enrol_lti: added sync_<grades/members> tasks
Mark Nelson [Fri, 1 Apr 2016 08:00:05 +0000 (16:00 +0800)]
MDL-52035 enrol_lti: added sync_<grades/members> tasks

5 years agoMDL-52035 enrol_lti: added enrol plugin
Mark Nelson [Fri, 8 Apr 2016 09:55:32 +0000 (17:55 +0800)]
MDL-52035 enrol_lti: added enrol plugin

5 years agoMDL-52035 auth_lti: added auth plugin
Mark Nelson [Thu, 31 Mar 2016 04:55:46 +0000 (12:55 +0800)]
MDL-52035 auth_lti: added auth plugin

5 years agoMDL-52035 core_enrol: allow redirection to another page
Mark Nelson [Tue, 12 Apr 2016 06:57:43 +0000 (14:57 +0800)]
MDL-52035 core_enrol: allow redirection to another page

5 years agoMDL-52154 mod_lti: Improve admin interface
Ryan Wyllie [Wed, 18 Nov 2015 07:10:15 +0000 (07:10 +0000)]
MDL-52154 mod_lti: Improve admin interface

Created a new admin page for managing LTI tool types within
Moodle. The new page streamlines adding a new tool and allows
the admin to add a tool using either a cartridge or a registration
URL.

5 years agoMDL-52154 mod_lti: Add cartridge support to LTI
John Okely [Wed, 18 Nov 2015 02:47:11 +0000 (10:47 +0800)]
MDL-52154 mod_lti: Add cartridge support to LTI

5 years agoMDL-53791 mod_wiki: New Web Service edit_page
Pau Ferrer Ocaña [Thu, 14 Apr 2016 08:15:50 +0000 (10:15 +0200)]
MDL-53791 mod_wiki: New Web Service edit_page

5 years agoMDL-53791 mod_wiki: New Web Service new_page
Pau Ferrer Ocaña [Thu, 14 Apr 2016 08:14:39 +0000 (10:14 +0200)]
MDL-53791 mod_wiki: New Web Service new_page

5 years agoMDL-53791 mod_wiki: New Web Service get_page_for_editing
Pau Ferrer Ocaña [Thu, 14 Apr 2016 08:12:20 +0000 (10:12 +0200)]
MDL-53791 mod_wiki: New Web Service get_page_for_editing

5 years agoMDL-53942 form_autocomplete: Properly set noSelectionString
Jun Pataleta [Tue, 26 Apr 2016 05:41:29 +0000 (13:41 +0800)]
MDL-53942 form_autocomplete: Properly set noSelectionString

5 years agoMDL-53924 competency: Relax strictness of default capabilities
Frederic Massart [Fri, 22 Apr 2016 09:03:50 +0000 (17:03 +0800)]
MDL-53924 competency: Relax strictness of default capabilities

5 years agoMDL-52035 core_block: avoid PHP error when there is no region
Mark Nelson [Thu, 31 Mar 2016 07:07:22 +0000 (15:07 +0800)]
MDL-52035 core_block: avoid PHP error when there is no region

This occurs when sharing a quiz via the LTI provider when it
adds a 'fake block' for quiz navigation. There may be other
occurrences.

5 years agoMDL-52035 core: added ability to override pagelayout
Mark Nelson [Thu, 31 Mar 2016 07:06:37 +0000 (15:06 +0800)]
MDL-52035 core: added ability to override pagelayout

This is required by the LTI plugin when we share an
activity. We do not want the user to be shown the
navigation blocks etc. The activity should be the
only thing displayed.

5 years agoMerge branch 'MDL-53667-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 26 Apr 2016 03:38:00 +0000 (11:38 +0800)]
Merge branch 'MDL-53667-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-53632-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 26 Apr 2016 03:29:51 +0000 (11:29 +0800)]
Merge branch 'MDL-53632-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-52550-master' of git://github.com/cameron1729/moodle
David Monllao [Tue, 26 Apr 2016 03:11:40 +0000 (11:11 +0800)]
Merge branch 'MDL-52550-master' of git://github.com/cameron1729/moodle

5 years agoMerge branch 'MDL-53733_master' of https://github.com/StudiUM/moodle
David Monllao [Tue, 26 Apr 2016 02:55:03 +0000 (10:55 +0800)]
Merge branch 'MDL-53733_master' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-53878_master' of https://github.com/StudiUM/moodle
David Monllao [Tue, 26 Apr 2016 02:49:32 +0000 (10:49 +0800)]
Merge branch 'MDL-53878_master' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-53678_master' of https://github.com/StudiUM/moodle
David Monllao [Tue, 26 Apr 2016 02:45:40 +0000 (10:45 +0800)]
Merge branch 'MDL-53678_master' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-53813-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 26 Apr 2016 02:13:24 +0000 (10:13 +0800)]
Merge branch 'MDL-53813-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-53865-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 26 Apr 2016 01:38:33 +0000 (09:38 +0800)]
Merge branch 'MDL-53865-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-53717_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 25 Apr 2016 21:20:31 +0000 (22:20 +0100)]
Merge branch 'MDL-53717_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-53811_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 25 Apr 2016 21:01:38 +0000 (22:01 +0100)]
Merge branch 'MDL-53811_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-53853-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 25 Apr 2016 21:00:18 +0000 (22:00 +0100)]
Merge branch 'MDL-53853-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-53864_master-alt' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 25 Apr 2016 14:53:12 +0000 (15:53 +0100)]
Merge branch 'MDL-53864_master-alt' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-49754-master' of https://github.com/xow/moodle
Dan Poltawski [Mon, 25 Apr 2016 13:13:51 +0000 (14:13 +0100)]
Merge branch 'MDL-49754-master' of https://github.com/xow/moodle