Commit graph

76974 commits

Author SHA1 Message Date
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
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
Juan Leyva
1e5241a12b MDL-52073 enrol_guest: New Web Service enrol_guest_get_instance_info 2015-12-10 12:32:30 +01: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
Juan Leyva
98fff78d00 MDL-50428 mod_scorm: New WS mod_scorm_launch_sco 2015-12-10 11:18:10 +01:00
Juan Leyva
e9b1e1ccfe MDL-50428 mod_scorm: Move SCO load code to new API 2015-12-10 11:17:38 +01:00
Ryan Wyllie
4f2ff25ed1 MDL-52258 calendar: show event duration on block
Highlight the days on the calendar for the entire duration
of the event, not just the start day. The days are highlighted
with the same colour as the starting day and will also show
the event popup on hover.
2015-12-10 11:17:25 +01: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
David Monllao
1b42ef0e99 Merge branch 'MDL-52438-master' of git://github.com/marinaglancy/moodle 2015-12-10 15:31:29 +08:00
David Monllao
948882eb5d Merge branch 'MDL-52312_master' of git://github.com/markn86/moodle 2015-12-10 13:56:08 +08:00
Marina Glancy
4a89e83b80 MDL-52285 auth: use __construct() for constructors 2015-12-10 13:40:42 +08:00
Marina Glancy
32fada5cb2 MDL-52081 forms: indicate usage of grandparent constructor 2015-12-10 13:38:04 +08:00
Marina Glancy
1a0df5535e MDL-52081 forms: Use __construct() for constructors 2015-12-10 13:38:01 +08:00
Marina Glancy
1766e6a17f MDL-52284 core: PHP7 engine errors have type Throwable 2015-12-10 10:49:37 +08:00
Tony Levi
d74b7e424f MDL-52284 core: compatibility with Exception/Throwable changes in PHP7 2015-12-10 10:49:36 +08:00
Juan Leyva
4f3d1b0ec6 MDL-52457 mod_scorm: Fix return types definitions in SCORM WS
Incorrect return types definitions in external function
mod_scorm_external::get_scorm_by_courses (hidetoc, displayattemptstatus
and skipview)
2015-12-09 14:02:37 +01:00
sam marshall
6d4858d5b3 MDL-52226 Forms: max_input_vars problems with advanced checkbox 2015-12-09 12:15:45 +00:00
Dan Poltawski
0dfcc2541a weekly release 3.1dev 2015-12-09 12:09:28 +00:00
Dan Poltawski
103bd4c96c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-12-09 12:09:26 +00:00
Dan Poltawski
633e2643ec MDL-52209 webservice: upgrade.txt tweak 2015-12-09 09:45:13 +00:00
Jun Pataleta
638f751a07 MDL-52209 webservice_xmlrpc: Remove Zend from webservice_xmlrpc
Additional fixes.
2015-12-09 09:42:24 +00:00
David Monllao
8573e526ff MDL-51698 user: Adapting behat test
Using the generic .breadcrumb-nav like in edit_tag.feature as the elements
on it are quite generic and there is no much chance of future conflicts.
2015-12-09 13:22:38 +08:00
Eloy Lafuente (stronk7)
7955476cab Merge branch 'MDL-51483_master' of https://github.com/jinhofer/moodle 2015-12-09 01:09:08 +01:00
Eloy Lafuente (stronk7)
b5c73e6f42 MDL-51698 upgrade: bump version to newer than rewritten one
Some integration.git based sites can have 2015120801 version,
now rewritten. This commit ensures everybody goes forward to
2015120803.
2015-12-09 00:51:40 +01:00
Brendan Heywood
d7238be174 MDL-51698 navigationlib: Add crumb trail meta data 2015-12-09 00:50:16 +01:00
Adam Olley
6c9b6685de MDL-52334 enrol_database: Add missing filter to user_enrolment lookup
Without the user filter, the left join to the user enrolment table
results in a much larger set of data being returned than before
MDL-28420. Which makes login time for users in many busy courses much
worse than before (3x worse on average, observed upto 40x).
2015-12-09 09:25:09 +10:30
Dan Poltawski
c3c5e30930 Merge branch 'MDL-51097_m31v1' of https://github.com/sbourget/moodle 2015-12-08 10:34:44 +00:00
Dan Poltawski
c8d8a09369 Merge branch 'MDL-51411' of https://github.com/andrewhancox/moodle 2015-12-08 09:05:45 +00:00
Dan Poltawski
c7bba4e5af Merge branch 'MDL-52165-master' of git://github.com/jleyva/moodle 2015-12-08 08:51:34 +00:00