moodle.git
6 years agoMDL-53982 competency: Javascript error due to string injection
Frederic Massart [Mon, 2 May 2016 08:52:21 +0000 (16:52 +0800)]
MDL-53982 competency: Javascript error due to string injection

6 years agoMerge branch 'wip-MDL-53601-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 2 May 2016 08:17:48 +0000 (16:17 +0800)]
Merge branch 'wip-MDL-53601-master' of git://github.com/abgreeve/moodle

6 years agoMDL-53601 mod_assign: Behat test for group feedback.
Adrian Greeve [Thu, 7 Apr 2016 05:29:35 +0000 (13:29 +0800)]
MDL-53601 mod_assign: Behat test for group feedback.

6 years agoMDL-53601 mod_assign: Feedback files are sent to all group members.
Adrian Greeve [Mon, 2 May 2016 07:45:32 +0000 (15:45 +0800)]
MDL-53601 mod_assign: Feedback files are sent to all group members.

6 years agoMerge branch 'MDL-53901-master' of git://github.com/damyon/moodle
David Monllao [Mon, 2 May 2016 07:53:57 +0000 (15:53 +0800)]
Merge branch 'MDL-53901-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-53635-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 2 May 2016 07:38:11 +0000 (15:38 +0800)]
Merge branch 'MDL-53635-master' of git://github.com/jleyva/moodle

6 years agoMDL-53635 message_airnotifier: Remove tags from notifications
Juan Leyva [Mon, 25 Apr 2016 09:32:39 +0000 (11:32 +0200)]
MDL-53635 message_airnotifier: Remove tags from notifications

6 years agoMerge branch 'MDL-54006-master' of git://github.com/lameze/moodle
David Monllao [Mon, 2 May 2016 06:20:11 +0000 (14:20 +0800)]
Merge branch 'MDL-54006-master' of git://github.com/lameze/moodle

6 years agoMerge branch 'MDL-53920_master' of git://github.com/markn86/moodle
Andrew Nicols [Mon, 2 May 2016 05:43:59 +0000 (13:43 +0800)]
Merge branch 'MDL-53920_master' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-53836-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Mon, 2 May 2016 05:18:55 +0000 (13:18 +0800)]
Merge branch 'MDL-53836-master' of git://github.com/ryanwyllie/moodle

6 years agoMerge branch 'MDL-53982-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Mon, 2 May 2016 05:04:20 +0000 (13:04 +0800)]
Merge branch 'MDL-53982-master' of git://github.com/FMCorz/moodle

6 years agoMDL-53982 competency: Javascript error due to string injection
Frederic Massart [Mon, 2 May 2016 04:57:03 +0000 (12:57 +0800)]
MDL-53982 competency: Javascript error due to string injection

6 years agoMDL-53920 cohort: notify competencies on cohort deletion
Mark Nelson [Fri, 29 Apr 2016 10:22:11 +0000 (18:22 +0800)]
MDL-53920 cohort: notify competencies on cohort deletion

6 years agoMDL-54006 tool_uploaduser: check validation result before display warning
Simey Lameze [Mon, 2 May 2016 03:45:59 +0000 (11:45 +0800)]
MDL-54006 tool_uploaduser: check validation result before display warning

6 years agoMDL-53836 mod_assign: Don't escape theme's larrow/rarrow
Skylar Kelty [Fri, 15 Apr 2016 15:53:39 +0000 (16:53 +0100)]
MDL-53836 mod_assign: Don't escape theme's larrow/rarrow

6 years agoMDL-53901 login: Redirect to https if loginhttps is enabled
Damyon Wiese [Mon, 2 May 2016 02:52:02 +0000 (10:52 +0800)]
MDL-53901 login: Redirect to https if loginhttps is enabled

This just prevents a double redirect.

6 years agoMerge branch 'MDL-53996-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 2 May 2016 02:51:59 +0000 (10:51 +0800)]
Merge branch 'MDL-53996-master' of git://github.com/junpataleta/moodle

6 years agoMerge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle
David Monllao [Mon, 2 May 2016 02:46:50 +0000 (10:46 +0800)]
Merge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle

6 years agoMerge branch 'MDL-53877-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 2 May 2016 02:22:25 +0000 (10:22 +0800)]
Merge branch 'MDL-53877-master' of git://github.com/junpataleta/moodle

6 years agoMerge branch 'MDL-53967-master' of https://github.com/sk-unikent/moodle
David Monllao [Mon, 2 May 2016 02:15:26 +0000 (10:15 +0800)]
Merge branch 'MDL-53967-master' of https://github.com/sk-unikent/moodle

6 years agoMerge branch 'MDL-53994' of git://github.com/stronk7/moodle
David Monllao [Mon, 2 May 2016 02:04:36 +0000 (10:04 +0800)]
Merge branch 'MDL-53994' of git://github.com/stronk7/moodle

6 years agoMDL-53877 competency: Help and better validation text for evidence URL
Serge Gauthier [Fri, 29 Apr 2016 15:32:07 +0000 (11:32 -0400)]
MDL-53877 competency: Help and better validation text for evidence URL

6 years agoMerge branch 'MDL-53917-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 2 May 2016 02:00:29 +0000 (10:00 +0800)]
Merge branch 'MDL-53917-master' of git://github.com/junpataleta/moodle

6 years agoMerge branch 'MDL-53918-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 2 May 2016 01:54:52 +0000 (09:54 +0800)]
Merge branch 'MDL-53918-master' of git://github.com/junpataleta/moodle

6 years agoMDL-53996 block_lp: Check user login before fetching block contents
Jun Pataleta [Mon, 2 May 2016 01:34:17 +0000 (09:34 +0800)]
MDL-53996 block_lp: Check user login before fetching block contents

6 years agoMerge branch 'MDL-53955-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Sat, 30 Apr 2016 07:39:16 +0000 (09:39 +0200)]
Merge branch 'MDL-53955-master' of git://github.com/junpataleta/moodle

6 years agoMDL-53994 block_feedback: Add missing include
Eloy Lafuente (stronk7) [Sat, 30 Apr 2016 05:28:18 +0000 (07:28 +0200)]
MDL-53994 block_feedback: Add missing include

Also, a little scenario has been added to have the behavior
covered and prevent this to happen again.

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

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

6 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

6 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

6 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

6 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

6 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

6 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

6 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.

6 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

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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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();

6 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

6 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

6 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

6 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

6 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()

6 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

6 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

6 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

6 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

6 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

6 years agoMDL-53967 caching: Ensure getAllKeys returns a valid array
Skylar Kelty [Fri, 29 Apr 2016 11:14:34 +0000 (12:14 +0100)]
MDL-53967 caching: Ensure getAllKeys returns a valid array

6 years agoMDL-53918 tool_cohortroles: Assign role on non-empty user and cohort IDs
Jun Pataleta [Fri, 22 Apr 2016 05:03:53 +0000 (13:03 +0800)]
MDL-53918 tool_cohortroles: Assign role on non-empty user and cohort IDs

6 years agoMDL-53917 tool_lp: Show course competency notice appropriately
Jun Pataleta [Fri, 22 Apr 2016 06:27:22 +0000 (14:27 +0800)]
MDL-53917 tool_lp: Show course competency notice appropriately

Show course competency notice only if the user has a
moodle/competency:competencygrade capability.

6 years agoMDL-53980 lang: Fix the reworded strings in Behat tests
David Mudrák [Thu, 28 Apr 2016 16:39:59 +0000 (18:39 +0200)]
MDL-53980 lang: Fix the reworded strings in Behat tests

6 years agoMDL-53980 lang: Merge English strings from the en_fix language pack
Helen Foster [Thu, 28 Apr 2016 16:32:03 +0000 (18:32 +0200)]
MDL-53980 lang: Merge English strings from the en_fix language pack

6 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

6 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

6 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.

6 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

6 years agoMDL-53955 tool_lp: Remove the use of chained steps in tool_lp
Jun Pataleta [Thu, 28 Apr 2016 06:56:55 +0000 (14:56 +0800)]
MDL-53955 tool_lp: Remove the use of chained steps in tool_lp

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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