Dan Poltawski [Wed, 30 Dec 2015 09:19:17 +0000 (09:19 +0000)]
Merge branch 'MDL-50357_master' of git://github.com/markn86/moodle
Mark Nelson [Mon, 21 Dec 2015 09:05:50 +0000 (17:05 +0800)]
MDL-50357 core_group: tidy up the function groups_delete_group_members
Juan Leyva [Tue, 17 Nov 2015 12:23:26 +0000 (13:23 +0100)]
MDL-50428 mod_scorm: Fix tests for mod_scorm_launch_sco
Michael Aherne [Tue, 8 Dec 2015 12:23:40 +0000 (12:23 +0000)]
MDL-52439 assign: correct get_user_submission() phpdoc
Dan Poltawski [Tue, 29 Dec 2015 10:04:42 +0000 (10:04 +0000)]
Merge branch 'MDL-52275_master' of git://github.com/markn86/moodle
David Monllao [Tue, 29 Dec 2015 07:35:15 +0000 (15:35 +0800)]
Merge branch 'MDL-51889_master' of git://github.com/markn86/moodle
David Monllao [Tue, 29 Dec 2015 06:05:42 +0000 (14:05 +0800)]
Merge branch 'MDL-52530' of git://github.com/eugeneventer/moodle-fixes
David Monllao [Tue, 29 Dec 2015 06:03:10 +0000 (14:03 +0800)]
Merge branch 'wip-mdl-52347' of git://github.com/rajeshtaneja/moodle
David Monllao [Tue, 29 Dec 2015 05:47:06 +0000 (13:47 +0800)]
Merge branch 'MDL-52591-master' of git://github.com/danpoltawski/moodle
Mark Nelson [Mon, 2 Nov 2015 23:20:32 +0000 (18:20 -0500)]
MDL-51889 enrol_guest: always check password before re-enabling
David Monllao [Tue, 29 Dec 2015 02:46:52 +0000 (10:46 +0800)]
Merge branch 'MDL-50428-master' of git://github.com/jleyva/moodle
Conflicts:
mod/scorm/version.php
version.php
David Monllao [Tue, 29 Dec 2015 02:03:59 +0000 (10:03 +0800)]
MDL-52597 mod_forum: Remove duplicated query
David Monllao [Tue, 29 Dec 2015 02:01:07 +0000 (10:01 +0800)]
Merge branch 'MDL-52597-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Mon, 30 Nov 2015 02:16:47 +0000 (10:16 +0800)]
MDL-52347 behat: fix random failures on fast computer
Rajesh Taneja [Thu, 24 Dec 2015 05:43:01 +0000 (13:43 +0800)]
MDL-52606 behat: Added time delay to avoid random fails
If attempts are created at same timestamp, then results are
not same, and lesson module finds that attmpt was in progress.
To avoid this problem, attempts should be created at different
timestamp.
Dan Poltawski [Wed, 23 Dec 2015 11:35:50 +0000 (11:35 +0000)]
weekly release 3.1dev
Dan Poltawski [Wed, 23 Dec 2015 11:35:46 +0000 (11:35 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Wed, 23 Dec 2015 11:29:01 +0000 (11:29 +0000)]
Merge branch 'MDL-52595-master' of git://github.com/andrewnicols/moodle
Mark Nelson [Wed, 23 Dec 2015 06:17:25 +0000 (14:17 +0800)]
MDL-52275 core: fixed grade-to-pass being overwritten
Thanks goes to W.J. Roes for the patch.
Andrew Nicols [Wed, 23 Dec 2015 06:24:35 +0000 (14:24 +0800)]
MDL-52597 mod_forum: Remove sleep from tests
Andrew Nicols [Wed, 23 Dec 2015 02:26:20 +0000 (10:26 +0800)]
MDL-52595 tests: Disable xdebug for travis runs
Andrew Nicols [Wed, 23 Dec 2015 02:04:51 +0000 (10:04 +0800)]
Merge branch 'MDL-52355-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Wed, 23 Dec 2015 01:45:42 +0000 (09:45 +0800)]
MDL-52355 mod_data: Added Gregorian hour and minute values
Shamim Rezaie [Tue, 1 Dec 2015 07:53:51 +0000 (18:53 +1100)]
MDL-52355 mod_data: Make date field respect the calendar type in use
Updated the date subplugin to consider that the input date element
values might be for any calendar type and not just the Gregorian
calendar.
Shamim Rezaie [Tue, 1 Dec 2015 04:37:07 +0000 (15:37 +1100)]
MDL-52354 select_time: Make select_time respect the set calendar type
The select_time method updated to display form elements in accordance
to the calendar type plugin that is in use.
Andrew Nicols [Wed, 23 Dec 2015 01:08:48 +0000 (09:08 +0800)]
Merge branch 'MDL-52060-master-arn' of https://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 22 Dec 2015 03:42:35 +0000 (11:42 +0800)]
MDL-52060 phpunit: Add tests for test_set_table_modified_by_sql
Eugene Venter [Wed, 16 Dec 2015 04:16:27 +0000 (17:16 +1300)]
MDL-52530 unittest: more robust capability assignments for guest
for core_files_file_storage_testcase and core_repositorylib_testcase
Dan Poltawski [Tue, 22 Dec 2015 18:34:25 +0000 (18:34 +0000)]
MDL-52591 grunt: make shifter task respect --no-color
Eloy Lafuente (stronk7) [Tue, 22 Dec 2015 16:13:51 +0000 (17:13 +0100)]
Merge branch 'MDL-49743-master' of git://github.com/danpoltawski/moodle
AMOS bot [Tue, 22 Dec 2015 16:03:59 +0000 (00:03 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 22 Dec 2015 13:17:54 +0000 (13:17 +0000)]
Merge branch 'master_MDL-51916' of https://github.com/danmarsden/moodle
Dan Poltawski [Tue, 22 Dec 2015 13:15:02 +0000 (13:15 +0000)]
Merge branch 'MDL-52365_new' of git://github.com/mkassaei/moodle
M Kassaei [Tue, 1 Dec 2015 15:44:59 +0000 (15:44 +0000)]
MDL-52365 qtype ddwtos & ddimageortext: 20 drag items IE11/Edge
Eloy Lafuente (stronk7) [Tue, 22 Dec 2015 12:07:01 +0000 (13:07 +0100)]
Merge branch 'MDL-51719-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 22 Dec 2015 11:58:28 +0000 (11:58 +0000)]
Merge branch 'wip-MDL-51239-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 22 Dec 2015 11:17:11 +0000 (11:17 +0000)]
Merge branch 'MDL-52556-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 22 Dec 2015 09:47:13 +0000 (09:47 +0000)]
MDL-52017 enrol_self: fix incorrect empty statement
Ironically this was detected by causing a syntax error on php54
David Monllao [Tue, 22 Dec 2015 08:36:29 +0000 (16:36 +0800)]
Merge branch 'MDL-52017_master' of git://github.com/markn86/moodle
David Monllao [Tue, 22 Dec 2015 08:28:18 +0000 (16:28 +0800)]
Merge branch 'MDL-51886-master' of git://github.com/dpalou/moodle
Conflicts:
version.php
David Monllao [Tue, 22 Dec 2015 08:23:33 +0000 (16:23 +0800)]
Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle
Conflicts:
version.php
Rajesh Taneja [Thu, 26 Nov 2015 07:31:56 +0000 (15:31 +0800)]
MDL-52060 phpunit: Keep track of modified database for reset
Keep list of modified tables, so they can be reset
without any guess work
Andrew Nicols [Tue, 22 Dec 2015 07:13:38 +0000 (15:13 +0800)]
Merge branch 'MDL-52250-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 22 Dec 2015 05:51:14 +0000 (13:51 +0800)]
Merge branch 'MDL-52289-master' of git://github.com/jleyva/moodle
Mark Nielsen [Fri, 20 Nov 2015 21:55:27 +0000 (13:55 -0800)]
MDL-52060 phpunit: Improve get_message_processors reset
Mark Nielsen [Fri, 20 Nov 2015 21:53:22 +0000 (13:53 -0800)]
MDL-52060 phpunit: Prevent querying database metadata
Rajesh Taneja [Wed, 11 Nov 2015 07:57:10 +0000 (15:57 +0800)]
MDL-52060 phpunit: Check file only if needed
Rajesh Taneja [Wed, 11 Nov 2015 03:26:10 +0000 (11:26 +0800)]
MDL-52060 phpunit: Keep track of initial reset sequence
Andrew Nicols [Tue, 22 Dec 2015 05:11:27 +0000 (13:11 +0800)]
Merge branch 'MDL-23128-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 22 Dec 2015 04:33:57 +0000 (12:33 +0800)]
Merge branch 'MDL-52363' of git://github.com/mkassaei/moodle
David Monllao [Tue, 22 Dec 2015 03:24:45 +0000 (11:24 +0800)]
Merge branch 'wip-mdl-52376' of git://github.com/rajeshtaneja/moodle
David Monllao [Tue, 22 Dec 2015 03:16:36 +0000 (11:16 +0800)]
Merge branch 'MDL-52558-master' of git://github.com/sammarshallou/moodle
Rajesh Taneja [Tue, 22 Dec 2015 02:33:07 +0000 (10:33 +0800)]
MDL-52427 behat: Fixed question selectors
As class is changed, we need to convert selector
to check if class is contained, rather then checking
selecting with specific class.
Andrew Nicols [Tue, 22 Dec 2015 00:45:30 +0000 (08:45 +0800)]
Merge branch 'MDL-52334' of git://github.com/aolley/moodle
Dan Poltawski [Mon, 21 Dec 2015 16:47:18 +0000 (16:47 +0000)]
Merge branch 'MDL-52380-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 21 Dec 2015 16:45:15 +0000 (16:45 +0000)]
Merge branch 'MDL-52354-master' of git://github.com/junpataleta/moodle
Juan Leyva [Fri, 18 Dec 2015 09:31:43 +0000 (10:31 +0100)]
MDL-52556 mod_scorm: Return SCO extra data in get_scorm_scoes
Dan Poltawski [Mon, 21 Dec 2015 13:27:38 +0000 (13:27 +0000)]
Merge branch 'MDL-52427' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 21 Dec 2015 12:46:20 +0000 (12:46 +0000)]
Merge branch 'MDL-52402' of git://github.com/mr-russ/moodle
Dan Poltawski [Mon, 21 Dec 2015 12:45:30 +0000 (12:45 +0000)]
Merge branch 'MDL-52399-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 21 Dec 2015 12:43:01 +0000 (12:43 +0000)]
Merge branch 'MDL-52455' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 21 Dec 2015 11:05:40 +0000 (11:05 +0000)]
Merge branch 'MDL-52542' of git://github.com/timhunt/moodle
David Monllao [Mon, 21 Dec 2015 09:32:34 +0000 (17:32 +0800)]
Merge branch 'MDL-51257-master' of git://github.com/cameron1729/moodle
David Monllao [Mon, 21 Dec 2015 09:16:54 +0000 (17:16 +0800)]
Merge branch 'MDL-52429-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 21 Dec 2015 09:05:48 +0000 (17:05 +0800)]
Merge branch 'MDL-49758-master' of git://github.com/StudiUM/moodle
Dan Poltawski [Mon, 21 Dec 2015 08:31:55 +0000 (08:31 +0000)]
Merge branch 'MDL-52226_master-fix' of git://github.com/dmonllao/moodle
David Monllao [Mon, 21 Dec 2015 08:27:23 +0000 (16:27 +0800)]
MDL-52226 tests: Fix behat phpunit naming conflict
Dani Palou [Fri, 23 Oct 2015 09:25:47 +0000 (11:25 +0200)]
MDL-51886 wiki: Add unit tests for view_wiki and view_page
Dani Palou [Fri, 23 Oct 2015 08:30:57 +0000 (10:30 +0200)]
MDL-51886 wiki: New WS mod_wiki_view_wiki and mod_wiki_view_page
David Monllao [Mon, 21 Dec 2015 06:41:21 +0000 (14:41 +0800)]
Merge branch 'MDL-52226-master' of git://github.com/sammarshallou/moodle
Andrew Nicols [Mon, 21 Dec 2015 06:01:17 +0000 (14:01 +0800)]
Merge branch 'master_MDL-50972' of https://github.com/danmarsden/moodle
Andrew Nicols [Mon, 21 Dec 2015 03:58:59 +0000 (11:58 +0800)]
Merge branch 'MDL-52457-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 21 Dec 2015 03:32:56 +0000 (11:32 +0800)]
Merge branch 'MDL-47106' of git://github.com/timhunt/moodle
David Monllao [Mon, 21 Dec 2015 03:14:09 +0000 (11:14 +0800)]
Merge branch 'master_MDL-45712' of git://github.com/danmarsden/moodle
David Monllao [Mon, 21 Dec 2015 02:47:49 +0000 (10:47 +0800)]
Merge branch 'MDL-52523' of git://github.com/timhunt/moodle
AMOS bot [Sat, 19 Dec 2015 16:05:04 +0000 (00:05 +0800)]
Automatically generated installer lang files
Dan Poltawski [Fri, 18 Dec 2015 12:26:50 +0000 (12:26 +0000)]
weekly release 3.1dev
Dan Poltawski [Fri, 18 Dec 2015 12:26:46 +0000 (12:26 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
sam marshall [Fri, 18 Dec 2015 09:44:52 +0000 (09:44 +0000)]
MDL-52558 Data generator: enrol_user should allow shortname
Dan Poltawski [Fri, 18 Dec 2015 10:51:01 +0000 (10:51 +0000)]
Merge branch 'MDL-52553_master' of git://github.com/dmonllao/moodle
David Monllao [Fri, 18 Dec 2015 05:37:06 +0000 (13:37 +0800)]
MDL-52553 question: Adding missing required constants
Shamim Rezaie [Thu, 3 Dec 2015 06:58:21 +0000 (17:58 +1100)]
MDL-52380 mod_forum: Non-Gregorian dates in forum advance search
Convert the fromdate and todate date parts to Gregorian before passing them to make_timestamp
Shamim Rezaie [Tue, 1 Dec 2015 04:37:07 +0000 (15:37 +1100)]
MDL-52354 select_time: Make select_time respect the set calendar type
The select_time method updated to display form elements in accordance
to the calendar type plugin that is in use.
Shamim Rezaie [Tue, 1 Dec 2015 04:37:07 +0000 (15:37 +1100)]
MDL-52354 select_time: Make select_time respect the set calendar type
The select_time method updated to display form elements in accordance
to the calendar type plugin that is in use.
Eloy Lafuente (stronk7) [Thu, 17 Dec 2015 09:18:34 +0000 (10:18 +0100)]
Merge branch 'wip-mdl-52540' of https://github.com/rajeshtaneja/moodle
Tim Hunt [Thu, 17 Dec 2015 08:36:08 +0000 (08:36 +0000)]
MDL-52542 qtype_multianswer: field names must match string placeholders
Rajesh Taneja [Thu, 17 Dec 2015 04:05:19 +0000 (12:05 +0800)]
MDL-52540 behat: mouse events are not handled well with phantomjs
Hagey, Nathanial [Wed, 21 Oct 2015 20:04:38 +0000 (16:04 -0400)]
MDL-45712 mod_scorm: add results column to interactions report.
Tim Hunt [Tue, 15 Dec 2015 15:57:23 +0000 (15:57 +0000)]
MDL-52523 backup of subplugins: add missing global
M Kassaei [Tue, 1 Dec 2015 11:01:30 +0000 (11:01 +0000)]
MDL-52363 qtype ddimageortext: Incorrectly sized drag item
Marina Glancy [Tue, 15 Dec 2015 04:36:02 +0000 (12:36 +0800)]
MDL-52286 core: mute erros in adodb destructor
AMOS bot [Mon, 14 Dec 2015 16:03:58 +0000 (00:03 +0800)]
Automatically generated installer lang files
Dan Poltawski [Mon, 14 Dec 2015 10:46:29 +0000 (10:46 +0000)]
Merge branch 'MDL-52451-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 14 Dec 2015 10:23:28 +0000 (10:23 +0000)]
Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle
Marina Glancy [Mon, 14 Dec 2015 10:06:43 +0000 (18:06 +0800)]
MDL-52286 core: corrected version of adodb to 5.20.1
Marina Glancy [Mon, 14 Dec 2015 03:01:53 +0000 (11:01 +0800)]
MDL-52286 core: several fixes to ADOdb
Dan Poltawski [Mon, 14 Dec 2015 09:44:16 +0000 (09:44 +0000)]
Merge branch 'MDL-52499-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 14 Dec 2015 09:23:03 +0000 (09:23 +0000)]
Merge branch 'MDL-52487_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 14 Dec 2015 06:53:07 +0000 (14:53 +0800)]
MDL-52487 rss: PHP 7 compatible error supression
PHP5 used to update error_reporting to 0 on functions called with the
suppress errors operator (@). In PHP7 it is not updated.
Credit to Rajesh Taneja.
Marina Glancy [Mon, 14 Dec 2015 04:51:20 +0000 (12:51 +0800)]
MDL-52499 core: link to php7 documentation
