moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76323 commits 37 branches 540 tags 1.3 GiB
Commit graph

76323 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
56e6d6608a Merge branch 'wip-mdl-52540' of https://github.com/rajeshtaneja/moodle 2015-12-17 10:18:34 +01: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
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
Tony Levi
144fb5e0a0 MDL-52475 core: workaround PHP7 bug #70110 with preg_match 2015-12-11 08:27:26 +08:00
Eloy Lafuente (stronk7)
e04e4cddd2 MDL-52081 general: whitespace fix 2015-12-10 22:39:25 +01:00
Dan Poltawski
f2f29ea2c7 MDL-52472 travis: remove mongo/memcached testing 
At the moment the extensions aren't available in php7 env:
https://github.com/travis-ci/travis-ci/issues/5256

And really its probably not worth the effort/buildtime to
enable them IMO so simpler to just disable.
 2015-12-10 17:35:51 +00:00
Dan Poltawski
ef5df7b721 MDL-52471 tests: simplify setup code 
Test code was not using the generator for simple enrollments, couldn't
help to fix when noticed.
 2015-12-10 15:47:11 +00:00
Dan Poltawski
194a02e409 MDL-52471 completion: fix deprecated use of 'object' 
And add a unit test covering completion_can_view_data() without
full course object passed.
 2015-12-10 15:47:11 +00:00
Dan Poltawski
8440c780bd MDL-52471 quiz: remove broken code question_print_comment_fields() 2015-12-10 15:47:11 +00:00
Eloy Lafuente (stronk7)
0a57ba06cb Merge branch 'MDL-52284-master' of git://github.com/marinaglancy/moodle 2015-12-10 16:16:20 +01:00
Dan Poltawski
9708ff95fd MDL-52471 setuplib: depreciate class object properly 
Previously was marked depricated but not throwwing debugging
 2015-12-10 14:26:30 +00:00
Dan Poltawski
87b7314a87 MDL-52472 travis: enable php7 
Relegate 5.6 runs (following the principle of highest and lowest version
only, to conserve travis resources and get faster test completions)
 2015-12-10 12:41:53 +00:00
Dan Poltawski
aa45186ad2 Merge branch 'MDL-52333_master' of git://github.com/dmonllao/moodle 2015-12-10 11:03:50 +00:00
Dan Poltawski
1bd60ff6a5 MDL-52285 auth: Add constructors for backwards compat 
These are very unlikely to be used but just to be safe..
 2015-12-10 10:34:29 +00:00
Dan Poltawski
a9efb3b7d0 Merge branch 'wip-MDL-52285-master' of git://github.com/marinaglancy/moodle 2015-12-10 10:13:40 +00:00
David Monllao
0f86739482 Merge branch 'MDL-52336-master' of git://github.com/marinaglancy/moodle 2015-12-10 17:38:15 +08:00
David Monllao
ea2707f9dc Merge branch 'wip-MDL-52081-master' of git://github.com/marinaglancy/moodle 2015-12-10 17:15:10 +08:00
David Monllao
e574148c50 MDL-52333: qtype_calculated: Adding division by zero test 2015-12-10 16:38:57 +08:00
Tony Levi
c6f9107029 MDL-52333 qtype: PHP7-compatibility in calculate_raw() 
Code also modified by Tim Hunt
 2015-12-10 16:38:57 +08:00
David Monllao
a4fb992435 Merge branch 'MDL-52335-master' of git://github.com/marinaglancy/moodle 2015-12-10 15:47:14 +08:00