Dan Poltawski
43fcd55e0c
Merge branch 'MDL-52354-master' of git://github.com/junpataleta/moodle
2015-12-21 16:45:15 +00:00
Dan Poltawski
2c10892c9e
Merge branch 'MDL-52427' of git://github.com/timhunt/moodle
2015-12-21 13:27:38 +00:00
Dan Poltawski
77d0aaa5e3
Merge branch 'MDL-52402' of git://github.com/mr-russ/moodle
2015-12-21 12:46:20 +00:00
Dan Poltawski
07f8dd4314
Merge branch 'MDL-52399-master' of git://github.com/jleyva/moodle
2015-12-21 12:45:30 +00:00
Dan Poltawski
36381280c5
Merge branch 'MDL-52455' of git://github.com/timhunt/moodle
2015-12-21 12:43:01 +00:00
Dan Poltawski
7fe67ef4ad
Merge branch 'MDL-52542' of git://github.com/timhunt/moodle
2015-12-21 11:05:40 +00:00
David Monllao
2f3ebc9bdb
Merge branch 'MDL-51257-master' of git://github.com/cameron1729/moodle
2015-12-21 17:32:34 +08:00
David Monllao
355570f9e7
Merge branch 'MDL-52429-master' of git://github.com/jleyva/moodle
2015-12-21 17:16:54 +08:00
David Monllao
20b3638322
Merge branch 'MDL-49758-master' of git://github.com/StudiUM/moodle
2015-12-21 17:05:48 +08:00
Dan Poltawski
5cbc9819fd
Merge branch 'MDL-52226_master-fix' of git://github.com/dmonllao/moodle
2015-12-21 08:31:55 +00:00
David Monllao
a49fd98349
MDL-52226 tests: Fix behat phpunit naming conflict
2015-12-21 16:27:23 +08:00
David Monllao
f08d1590c8
Merge branch 'MDL-52226-master' of git://github.com/sammarshallou/moodle
2015-12-21 14:41:21 +08:00
Andrew Nicols
3adcec2b70
Merge branch 'master_MDL-50972' of https://github.com/danmarsden/moodle
2015-12-21 14:01:17 +08:00
Andrew Nicols
1f1894c973
Merge branch 'MDL-52457-master' of git://github.com/jleyva/moodle
2015-12-21 11:58:59 +08:00
David Monllao
f447759a91
Merge branch 'MDL-47106' of git://github.com/timhunt/moodle
2015-12-21 11:32:56 +08:00
David Monllao
5303fb94ef
Merge branch 'master_MDL-45712' of git://github.com/danmarsden/moodle
2015-12-21 11:14:09 +08:00
David Monllao
58920c8e53
Merge branch 'MDL-52523' of git://github.com/timhunt/moodle
2015-12-21 10:47:49 +08:00
Dan Poltawski
ea3ebbf20e
weekly release 3.1dev
2015-12-18 12:26:50 +00:00
Dan Poltawski
3340ff86fe
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2015-12-18 12:26:46 +00:00
Dan Poltawski
1703917824
Merge branch 'MDL-52553_master' of git://github.com/dmonllao/moodle
2015-12-18 10:51:01 +00:00
David Monllao
342f1ab28d
MDL-52553 question: Adding missing required constants
2015-12-18 14:44:51 +08:00
Shamim Rezaie
2bb196ebe3
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.
2015-12-17 15:48:27 -06:00
Eloy Lafuente (stronk7)
56e6d6608a
Merge branch 'wip-mdl-52540' of https://github.com/rajeshtaneja/moodle
2015-12-17 10:18:34 +01:00
Tim Hunt
3ca956b629
MDL-52542 qtype_multianswer: field names must match string placeholders
2015-12-17 08:36:08 +00:00
Rajesh Taneja
c00667550b
MDL-52540 behat: mouse events are not handled well with phantomjs
2015-12-17 12:05:19 +08:00
Hagey, Nathanial
3ef6e46081
MDL-45712 mod_scorm: add results column to interactions report.
2015-12-16 13:30:50 +13:00
Tim Hunt
8eef9244be
MDL-52523 backup of subplugins: add missing global
2015-12-15 15:57:23 +00:00
Marina Glancy
8638b3f144
MDL-52286 core: mute erros in adodb destructor
2015-12-15 12:36:02 +08:00
AMOS bot
f75de9cd4b
Automatically generated installer lang files
2015-12-15 00:03:58 +08:00
Dan Poltawski
99436d38ff
Merge branch 'MDL-52451-master' of git://github.com/marinaglancy/moodle
2015-12-14 10:46:29 +00:00
Dan Poltawski
037397bf98
Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle
2015-12-14 10:23:28 +00:00
Marina Glancy
6d9641f5b0
MDL-52286 core: corrected version of adodb to 5.20.1
2015-12-14 18:10:24 +08:00
Marina Glancy
cc3048eb41
MDL-52286 core: several fixes to ADOdb
2015-12-14 18:06:22 +08:00
Dan Poltawski
bca69f937c
Merge branch 'MDL-52499-master' of git://github.com/marinaglancy/moodle
2015-12-14 09:44:16 +00:00
Dan Poltawski
e42b60351e
Merge branch 'MDL-52487_master' of git://github.com/dmonllao/moodle
2015-12-14 09:23:03 +00:00
David Monllao
abc4e1efed
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.
2015-12-14 15:28:37 +08:00
Marina Glancy
479950d431
MDL-52499 core: link to php7 documentation
2015-12-14 12:51:20 +08:00
Marina Glancy
e6ee56a0e4
MDL-52451 forms: replace deprecated function
2015-12-14 12:43:03 +08:00
Dan Marsden
2e6c821d35
MDL-50972 mod_scorm: set autocommit as boolean
...
var currently passed as string so not evaluated correctly
2015-12-14 14:26:24 +13:00
Matthew Pruett
d0b10d0da1
MDL-47106 quiz 'secure' window: Finish review link did not work
2015-12-13 22:08:36 +00:00
Amanda Doughty
692ef1010b
MDL-52455 quiz: doesn't include all user fields required by messaging
2015-12-13 20:43:26 +00:00
Tim Hunt
d392b13a63
MDL-52427 questions: all parts of a Q should be clearfix
...
Otherwise large floated images may overflow.
2015-12-13 20:27:54 +00:00
Jean-Philippe Gaudreau
beb992afb4
MDL-49758 mod_quiz: Fix require on completionlib.php
...
Credits: Gordon Bateson
2015-12-11 13:00:04 -05:00
Dan Poltawski
b12b03de85
Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle
2015-12-11 08:57:57 +00:00
David Monllao
588da1653d
Merge branch 'MDL-52472-master' of git://github.com/danpoltawski/moodle
2015-12-11 16:02:46 +08:00
David Monllao
3e702b5855
Merge branch 'MDL-52361-master' of git://github.com/marinaglancy/moodle
2015-12-11 14:49:15 +08:00
David Monllao
9e313e798f
MDL-51784 general: Adding missing php4 style constructors
...
Adding them to warn people calling the php4 constructor.
2015-12-11 14:02:42 +08:00
Marina Glancy
c4d0b752a2
MDL-51784 various: use __construct() for PHP7 compatibility
2015-12-11 12:48:24 +08:00
David Monllao
05178f0745
Merge branch 'MDL-52471-master' of git://github.com/danpoltawski/moodle
2015-12-11 11:52:02 +08:00
David Monllao
206d736006
Merge branch 'wip-MDL-52475-master' of git://github.com/marinaglancy/moodle
2015-12-11 11:23:41 +08:00