moodle.git
5 years agoMDL-41126 mod_data: optimised data entry generator
Devang Gaur [Wed, 10 Aug 2016 02:28:12 +0000 (07:58 +0530)]
MDL-41126 mod_data: optimised data entry generator

5 years agoMerge branch 'MDL-55464_m32v1' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 9 Aug 2016 13:20:31 +0000 (14:20 +0100)]
Merge branch 'MDL-55464_m32v1' of https://github.com/sbourget/moodle

5 years agoMerge branch 'MDL-53765-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 9 Aug 2016 12:56:49 +0000 (13:56 +0100)]
Merge branch 'MDL-53765-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'wip-MDL-55425-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 9 Aug 2016 09:58:40 +0000 (10:58 +0100)]
Merge branch 'wip-MDL-55425-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-55246_unoconv' of https://github.com/Syxton/moodle
Dan Poltawski [Tue, 9 Aug 2016 09:11:13 +0000 (10:11 +0100)]
Merge branch 'MDL-55246_unoconv' of https://github.com/Syxton/moodle

5 years agoMerge branch 'wip-MDL-52230-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 9 Aug 2016 08:49:38 +0000 (09:49 +0100)]
Merge branch 'wip-MDL-52230-master' of git://github.com/abgreeve/moodle

5 years agoMerge branch 'MDL-54606' of https://github.com/mr-russ/moodle
Dan Poltawski [Tue, 9 Aug 2016 08:32:46 +0000 (09:32 +0100)]
Merge branch 'MDL-54606' of https://github.com/mr-russ/moodle

5 years agoMerge branch 'MDL-55390_master-fix' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 9 Aug 2016 08:29:49 +0000 (09:29 +0100)]
Merge branch 'MDL-55390_master-fix' of git://github.com/dmonllao/moodle

5 years agoMDL-52230 mod_data: Take fieldname from field:name()
Andrew Hancox [Thu, 19 Nov 2015 13:49:06 +0000 (13:49 +0000)]
MDL-52230 mod_data: Take fieldname from field:name()

AMOS BEGIN
 CPY [namedate, mod_data],[fieldtypelable, datafield_date]
 CPY [namefile, mod_data],[fieldtypelable, datafield_file]
 CPY [namecheckbox, mod_data],[fieldtypelable, datafield_checkbox]
 CPY [namelatlong, mod_data],[fieldtypelable, datafield_latlong]
 CPY [namemenu, mod_data],[fieldtypelable, datafield_menu]
 CPY [namemultimenu, mod_data],[fieldtypelable, datafield_multimenu]
 CPY [namenumber, mod_data],[fieldtypelable, datafield_number]
 CPY [namepicture, mod_data],[fieldtypelable, datafield_picture]
 CPY [nameradiobutton, mod_data],[fieldtypelable, datafield_radiobutton]
 CPY [nametext, mod_data],[fieldtypelable, datafield_text]
 CPY [nametextarea, mod_data],[fieldtypelable, datafield_textarea]
 CPY [nameurl, mod_data],[fieldtypelable, datafield_url]
AMOS END

5 years agoMerge branch 'MDL-55225-master' of git://github.com/dpalou/moodle
Dan Poltawski [Tue, 9 Aug 2016 08:21:07 +0000 (09:21 +0100)]
Merge branch 'MDL-55225-master' of git://github.com/dpalou/moodle

5 years agoMDL-51078 report_log: use simpler/faster str_split over preg_split
Dan Poltawski [Tue, 9 Aug 2016 08:04:31 +0000 (09:04 +0100)]
MDL-51078 report_log: use simpler/faster str_split over preg_split

5 years agoMerge branch 'MDL-51078_m32v3' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 9 Aug 2016 07:57:09 +0000 (08:57 +0100)]
Merge branch 'MDL-51078_m32v3' of https://github.com/sbourget/moodle

5 years agoMDL-55390 search: is_search_area unit tests
David Monllao [Tue, 9 Aug 2016 07:51:09 +0000 (15:51 +0800)]
MDL-55390 search: is_search_area unit tests

Added extra checking for search manager get_search_area.

5 years agoMerge branch 'MDL-54862-master' of git://github.com/dpalou/moodle
Dan Poltawski [Tue, 9 Aug 2016 07:06:35 +0000 (08:06 +0100)]
Merge branch 'MDL-54862-master' of git://github.com/dpalou/moodle

5 years agoMDL-55329 behat: Correct typo
Andrew Nicols [Tue, 9 Aug 2016 06:41:22 +0000 (14:41 +0800)]
MDL-55329 behat: Correct typo

5 years agoMerge branch 'wip-mdl-55329' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Tue, 9 Aug 2016 06:26:09 +0000 (14:26 +0800)]
Merge branch 'wip-mdl-55329' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-55329 behat: PyStrings should end with : (colon)
Rajesh Taneja [Tue, 26 Jul 2016 03:16:44 +0000 (11:16 +0800)]
MDL-55329 behat: PyStrings should end with : (colon)

5 years agoMerge branch 'MDL-55480-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Tue, 9 Aug 2016 05:50:55 +0000 (13:50 +0800)]
Merge branch 'MDL-55480-master' of git://github.com/FMCorz/moodle

5 years agoMDL-55390 core_search: Correct variable name
Andrew Nicols [Tue, 9 Aug 2016 05:44:10 +0000 (13:44 +0800)]
MDL-55390 core_search: Correct variable name

5 years agoMerge branch 'MDL-55390' of https://github.com/dg711/moodle
Andrew Nicols [Tue, 9 Aug 2016 05:42:32 +0000 (13:42 +0800)]
Merge branch 'MDL-55390' of https://github.com/dg711/moodle

5 years agoMerge branch 'MDL-53572-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 9 Aug 2016 04:52:13 +0000 (12:52 +0800)]
Merge branch 'MDL-53572-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-41126 mod_data: Add type hinting
Andrew Nicols [Tue, 9 Aug 2016 04:23:32 +0000 (12:23 +0800)]
MDL-41126 mod_data: Add type hinting

5 years agoMDL-41126 mod_data: Styling fixes
Andrew Nicols [Tue, 9 Aug 2016 04:19:18 +0000 (12:19 +0800)]
MDL-41126 mod_data: Styling fixes

5 years agoMerge branch 'wip-mdl-41126' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Tue, 9 Aug 2016 04:47:35 +0000 (12:47 +0800)]
Merge branch 'wip-mdl-41126' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'MDL-55465-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 9 Aug 2016 04:31:46 +0000 (12:31 +0800)]
Merge branch 'MDL-55465-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-53016-master' of https://github.com/xow/moodle
Andrew Nicols [Tue, 9 Aug 2016 03:41:09 +0000 (11:41 +0800)]
Merge branch 'MDL-53016-master' of https://github.com/xow/moodle

5 years agoMDL-53765 core: Deprecate update_module_button functions
Jun Pataleta [Wed, 27 Jul 2016 06:13:25 +0000 (14:13 +0800)]
MDL-53765 core: Deprecate update_module_button functions

First stage deprecation for the functions update_module_button and
core_renderer::update_module_button().

5 years agoMDL_41126 phpunit: Timestamp should be less than 2038
Rajesh Taneja [Tue, 9 Aug 2016 02:42:28 +0000 (10:42 +0800)]
MDL_41126 phpunit: Timestamp should be less than 2038

http://php.net/manual/en/datetime.gettimestamp.php#114590
In 32-bit system the unix timestamp will overflow if the date goes beyond year 2038
and this method will return false.

5 years agoMDL-55274 mod_chat: Add unit tests for special commands
Andrew Nicols [Tue, 9 Aug 2016 02:41:47 +0000 (10:41 +0800)]
MDL-55274 mod_chat: Add unit tests for special commands

5 years agoMDL-53765 mod_resource/mod_wiki: Removed update_module_button()
Rex Lorenzo [Fri, 8 Apr 2016 22:20:26 +0000 (15:20 -0700)]
MDL-53765 mod_resource/mod_wiki: Removed update_module_button()

5 years agoMerge branch 'MDL-55274-master' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 9 Aug 2016 01:05:09 +0000 (09:05 +0800)]
Merge branch 'MDL-55274-master' of git://github.com/lameze/moodle

5 years agoMerge branch 'MDL-48856' of https://github.com/mr-russ/moodle
Dan Poltawski [Mon, 8 Aug 2016 13:45:06 +0000 (14:45 +0100)]
Merge branch 'MDL-48856' of https://github.com/mr-russ/moodle

5 years agoMerge branch 'MDL-55061' of https://github.com/zanekarl17/moodle
Dan Poltawski [Mon, 8 Aug 2016 13:33:08 +0000 (14:33 +0100)]
Merge branch 'MDL-55061' of https://github.com/zanekarl17/moodle

5 years agoMerge branch 'MDL-55398_m32v1' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 8 Aug 2016 09:40:42 +0000 (10:40 +0100)]
Merge branch 'MDL-55398_m32v1' of https://github.com/sbourget/moodle

5 years agoMerge branch 'wip-MDL-55418-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 8 Aug 2016 09:33:46 +0000 (10:33 +0100)]
Merge branch 'wip-MDL-55418-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-55453-master' of https://github.com/mrmark/moodle
Dan Poltawski [Mon, 8 Aug 2016 08:53:22 +0000 (09:53 +0100)]
Merge branch 'MDL-55453-master' of https://github.com/mrmark/moodle

5 years agoMerge branch 'MDL-55292' of https://github.com/mr-russ/moodle
Andrew Nicols [Mon, 8 Aug 2016 07:25:45 +0000 (15:25 +0800)]
Merge branch 'MDL-55292' of https://github.com/mr-russ/moodle

5 years agoMerge branch 'MDL-3782_multichoice_multiple' of git://github.com/davosmith/moodle
Andrew Nicols [Mon, 8 Aug 2016 06:04:53 +0000 (14:04 +0800)]
Merge branch 'MDL-3782_multichoice_multiple' of git://github.com/davosmith/moodle

5 years agoMerge branch 'MDL-41126' of git://github.com/dg711/moodle
Andrew Nicols [Mon, 8 Aug 2016 05:24:25 +0000 (13:24 +0800)]
Merge branch 'MDL-41126' of git://github.com/dg711/moodle

5 years agoMDL-55274 mod_chat: regain beep and / command in mod_chat.
Nick Phillips [Wed, 20 Jul 2016 04:08:54 +0000 (16:08 +1200)]
MDL-55274 mod_chat: regain beep and / command in mod_chat.

format_text cannot be called on the whole input text, but must be
called on user-supplied text that will be output into chats. This
means it cannot simply be called in one place, but must instead be
called on the relevant parts of text once commands have been matched.

5 years agoMDL-55480 competency: Added missing closing tag
fhuebler [Fri, 5 Aug 2016 10:56:07 +0000 (12:56 +0200)]
MDL-55480 competency: Added missing closing tag

5 years agoMerge branch 'MDL-55454' of git://github.com/timhunt/moodle
Andrew Nicols [Mon, 8 Aug 2016 02:00:30 +0000 (10:00 +0800)]
Merge branch 'MDL-55454' of git://github.com/timhunt/moodle

5 years agoMDL-55465 grunt: ensure gruntfile is lint free
Dan Poltawski [Fri, 5 Aug 2016 16:33:49 +0000 (17:33 +0100)]
MDL-55465 grunt: ensure gruntfile is lint free

Not related to this patch, but fixed it while I was here..

5 years agoMDL-55465 grunt: Add .stylelintignore
Dan Poltawski [Fri, 5 Aug 2016 16:26:42 +0000 (17:26 +0100)]
MDL-55465 grunt: Add .stylelintignore

Allow it to be generated by grunt ignorefiles
Make grunt use it rather than ignoring things manually

5 years agoMDL-55246 assign: convert files with spaces
Matt Davidson [Mon, 1 Aug 2016 14:46:08 +0000 (10:46 -0400)]
MDL-55246 assign: convert files with spaces

If a file is sent to unoconv with a filename that contains spaces,
unoconv will fail to produce the intended results.

5 years agoMDL-53016 classloader: Load PSR-0 and PSR-4 separately, add unit tests
John Okely [Mon, 1 Aug 2016 06:50:31 +0000 (14:50 +0800)]
MDL-53016 classloader: Load PSR-0 and PSR-4 separately, add unit tests

5 years agoMDL-53016 classloader: Load PSR-0 and PSR-4 namespaces dynamically
Dan Poltawski [Wed, 10 Feb 2016 12:19:58 +0000 (12:19 +0000)]
MDL-53016 classloader: Load PSR-0 and PSR-4 namespaces dynamically

5 years agoMDL-55425 user: allow to update another user editor pref
Marina Glancy [Fri, 5 Aug 2016 01:36:00 +0000 (09:36 +0800)]
MDL-55425 user: allow to update another user editor pref

5 years agoMDL-55464 mod_label: Add view permissions
Stephen Bourget [Fri, 5 Aug 2016 01:27:02 +0000 (21:27 -0400)]
MDL-55464 mod_label: Add view permissions

5 years agoMDL-41126 mod_data: added field and entry generator
Devang Gaur [Thu, 4 Aug 2016 22:38:28 +0000 (04:08 +0530)]
MDL-41126 mod_data: added field and entry generator

5 years agoMDL-55390 core_search: check if a search area is real
Devang Gaur [Thu, 4 Aug 2016 19:42:21 +0000 (01:12 +0530)]
MDL-55390 core_search: check if a search area is real

5 years agoMDL-55061 Grade_Export: Grade Export Logging
Zane Karl [Wed, 29 Jun 2016 20:20:38 +0000 (13:20 -0700)]
MDL-55061 Grade_Export: Grade Export Logging

5 years agoMDL-54606 session: Add redis handler with locking.
Russell Smith [Sun, 19 Jun 2016 06:24:11 +0000 (16:24 +1000)]
MDL-54606 session: Add redis handler with locking.

5 years agoMDL-55292 performance: Allow Tideways profiler extension.
Russell Smith [Wed, 20 Jul 2016 23:57:18 +0000 (09:57 +1000)]
MDL-55292 performance: Allow Tideways profiler extension.

PHP7 doesn't have any default XHProf support and all other
investigated forks don't have stable PHP7.  Tideways is under
active development and is easy to install.  The data format
is compatible with XHProf so it is a drop-in replacement in that way.

5 years agoweekly release 3.2dev
Andrew Nicols [Thu, 4 Aug 2016 01:58:40 +0000 (09:58 +0800)]
weekly release 3.2dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 4 Aug 2016 01:58:34 +0000 (09:58 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMDL-54656 behat: Skip test if db family is not mysql or postgres
Rajesh Taneja [Thu, 4 Aug 2016 00:21:28 +0000 (08:21 +0800)]
MDL-54656 behat: Skip test if db family is not mysql or postgres

5 years agoMDL-55454 quiz: loses shufflequestion setting restoring old backups
Tim Hunt [Wed, 3 Aug 2016 17:42:51 +0000 (18:42 +0100)]
MDL-55454 quiz: loses shufflequestion setting restoring old backups

5 years agoMDL-55453 core_lib: Fix usage of js_send_uncached
Mark Nielsen [Wed, 3 Aug 2016 17:18:41 +0000 (10:18 -0700)]
MDL-55453 core_lib: Fix usage of js_send_uncached

5 years agoMDL-3782 qtype_multianswer: support 'multiple-answer' subquestions
Davo Smith [Tue, 28 Jun 2016 11:38:23 +0000 (12:38 +0100)]
MDL-3782 qtype_multianswer: support 'multiple-answer' subquestions

5 years agoMerge branch 'MDL-55367-master-fix' of https://github.com/lameze/moodle
Andrew Nicols [Wed, 3 Aug 2016 06:41:47 +0000 (14:41 +0800)]
Merge branch 'MDL-55367-master-fix' of https://github.com/lameze/moodle

5 years agoMerge branch 'MDL-54941-master-fixes' of https://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 3 Aug 2016 06:35:08 +0000 (14:35 +0800)]
Merge branch 'MDL-54941-master-fixes' of https://github.com/andrewnicols/moodle

5 years agoMDL-54941 glossary: Correct variable naming for entry files
Andrew Nicols [Wed, 3 Aug 2016 06:33:52 +0000 (14:33 +0800)]
MDL-54941 glossary: Correct variable naming for entry files

5 years agoMDL-55367 report_log: declare log array indexes to avoid errors
Simey Lameze [Wed, 3 Aug 2016 06:23:44 +0000 (14:23 +0800)]
MDL-55367 report_log: declare log array indexes to avoid errors

5 years agoMerge branch 'MDL-55355-master-fix' of https://github.com/lameze/moodle
Andrew Nicols [Wed, 3 Aug 2016 02:45:15 +0000 (10:45 +0800)]
Merge branch 'MDL-55355-master-fix' of https://github.com/lameze/moodle

5 years agoMDL-55355 mod_feedback: Change show chart data step to avoid errors
Simey Lameze [Wed, 3 Aug 2016 02:22:58 +0000 (10:22 +0800)]
MDL-55355 mod_feedback: Change show chart data step to avoid errors

5 years agoMDL-55355 core: Fix incorrect chart link selector
Simey Lameze [Wed, 3 Aug 2016 01:42:27 +0000 (09:42 +0800)]
MDL-55355 core: Fix incorrect chart link selector

5 years agoMerge branch 'MDL-24343-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 3 Aug 2016 01:22:16 +0000 (03:22 +0200)]
Merge branch 'MDL-24343-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-24343 core: Deprecate unzip_file
Andrew Nicols [Mon, 11 Jul 2016 06:05:47 +0000 (14:05 +0800)]
MDL-24343 core: Deprecate unzip_file

5 years agoMerge branch 'MDL-55276-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 23:01:51 +0000 (01:01 +0200)]
Merge branch 'MDL-55276-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-54656_m32v3' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 22:50:19 +0000 (00:50 +0200)]
Merge branch 'MDL-54656_m32v3' of https://github.com/sbourget/moodle

5 years agoMerge branch 'MDL-55166-master-blocksettings' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 22:33:58 +0000 (00:33 +0200)]
Merge branch 'MDL-55166-master-blocksettings' of git://github.com/mudrd8mz/moodle

5 years agoMerge branch 'MDL-54941-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 22:29:45 +0000 (00:29 +0200)]
Merge branch 'MDL-54941-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-55322-master' of https://github.com/snake/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 22:12:10 +0000 (00:12 +0200)]
Merge branch 'MDL-55322-master' of https://github.com/snake/moodle

5 years agoMerge branch 'MDL-54745_master' of https://github.com/snake/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 21:13:25 +0000 (23:13 +0200)]
Merge branch 'MDL-54745_master' of https://github.com/snake/moodle

5 years agoMerge branch 'MDL-44369_m32v3' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 19:25:24 +0000 (21:25 +0200)]
Merge branch 'MDL-44369_m32v3' of https://github.com/sbourget/moodle

5 years agoMDL-54847 tests: fix unused var
Dan Poltawski [Tue, 2 Aug 2016 19:11:27 +0000 (20:11 +0100)]
MDL-54847 tests: fix unused var

5 years agoMerge branch 'MDL-54847-master-fix' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 2 Aug 2016 19:09:45 +0000 (20:09 +0100)]
Merge branch 'MDL-54847-master-fix' of git://github.com/cameron1729/moodle

5 years agoMDL-54847 weblib: Test media attributes individually
Cameron Ball [Tue, 2 Aug 2016 18:52:12 +0000 (02:52 +0800)]
MDL-54847 weblib: Test media attributes individually

5 years agoMerge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 17:54:00 +0000 (19:54 +0200)]
Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-55167 npm: add stylelint-checkstyle-formatter
Dan Poltawski [Tue, 2 Aug 2016 17:52:41 +0000 (18:52 +0100)]
MDL-55167 npm: add stylelint-checkstyle-formatter

Useful for automations (like the Moodle prechecker)

5 years agoMerge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 16:54:49 +0000 (18:54 +0200)]
Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-55314-master' of https://github.com/mrmark/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 15:16:07 +0000 (17:16 +0200)]
Merge branch 'MDL-55314-master' of https://github.com/mrmark/moodle

5 years agoMerge branch 'MDL-55315-master' of https://github.com/mrmark/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 15:07:16 +0000 (17:07 +0200)]
Merge branch 'MDL-55315-master' of https://github.com/mrmark/moodle

5 years agoMerge branch 'MDL-55316-master' of https://github.com/mrmark/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 15:01:46 +0000 (17:01 +0200)]
Merge branch 'MDL-55316-master' of https://github.com/mrmark/moodle

5 years agoMDL-53572 mathjax: always load mathjax using https
Dan Poltawski [Fri, 8 Jul 2016 09:18:22 +0000 (10:18 +0100)]
MDL-53572 mathjax: always load mathjax using https

It's considered an anti-pattern now to use protocol relative urls and
reduces a setting.

(Also fixed an incorrectly placed 3.1.0 upgrade marker)

5 years agoMerge branch 'MDL-55348-master' of git://github.com/dpalou/moodle
Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 14:48:26 +0000 (16:48 +0200)]
Merge branch 'MDL-55348-master' of git://github.com/dpalou/moodle

5 years agoMerge branch 'wip-MDL-33741-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 2 Aug 2016 11:20:11 +0000 (12:20 +0100)]
Merge branch 'wip-MDL-33741-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-45734_m32v4' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 2 Aug 2016 11:17:03 +0000 (12:17 +0100)]
Merge branch 'MDL-45734_m32v4' of https://github.com/sbourget/moodle

5 years agoMerge branch 'MDL-55357_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 2 Aug 2016 09:54:28 +0000 (10:54 +0100)]
Merge branch 'MDL-55357_master' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-54847-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 2 Aug 2016 09:54:21 +0000 (10:54 +0100)]
Merge branch 'MDL-54847-master' of git://github.com/cameron1729/moodle

5 years agoMDL-55418 behat: correct exception class name
Marina Glancy [Tue, 2 Aug 2016 09:44:55 +0000 (17:44 +0800)]
MDL-55418 behat: correct exception class name

5 years agoMDL-54847 MDL-54847 weblib: Support basic HTML media tags
Cameron Ball [Thu, 21 Jul 2016 08:04:29 +0000 (16:04 +0800)]
MDL-54847 MDL-54847 weblib: Support basic HTML media tags

5 years agoMerge branch 'MDL-55355-master' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 2 Aug 2016 02:29:30 +0000 (10:29 +0800)]
Merge branch 'MDL-55355-master' of git://github.com/lameze/moodle

5 years agoMerge branch 'MDL-55352-master-fix' of https://github.com/lameze/moodle
Andrew Nicols [Tue, 2 Aug 2016 02:10:38 +0000 (10:10 +0800)]
Merge branch 'MDL-55352-master-fix' of https://github.com/lameze/moodle

5 years agoMDL-55352 mod_feedback: Change series labels on multi choice rated
Simey Lameze [Tue, 2 Aug 2016 01:23:18 +0000 (09:23 +0800)]
MDL-55352 mod_feedback: Change series labels on multi choice rated

5 years agoMDL-51078 report_log: Allow filtering by all changes
Stephen Bourget [Tue, 26 Jul 2016 19:39:48 +0000 (15:39 -0400)]
MDL-51078 report_log: Allow filtering by all changes

5 years agoMerge branch 'MDL-54879-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Tue, 2 Aug 2016 01:10:19 +0000 (09:10 +0800)]
Merge branch 'MDL-54879-master' of git://github.com/junpataleta/moodle

5 years agoMDL-55398 mod_feedback: prevent direct script access to lib files.
Stephen Bourget [Tue, 2 Aug 2016 00:53:46 +0000 (20:53 -0400)]
MDL-55398 mod_feedback: prevent direct script access to lib files.

5 years agoMerge branch 'MDL-55140_m32v2' of https://github.com/sbourget/moodle
Andrew Nicols [Tue, 2 Aug 2016 00:48:36 +0000 (08:48 +0800)]
Merge branch 'MDL-55140_m32v2' of https://github.com/sbourget/moodle