mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
76,405 Commits 36 Branches 519 Tags
Commit Graph

76405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Adrian Greeve
f0899a2560 MDL-51239 blog: Coding style fixes. 2015-12-08 13:28:17 +08:00
Marina Glancy
10eb44f7e6 MDL-52438 core: allow Moodle 3.0 to be used with PHP7 2015-12-08 12:54:32 +08:00
Marina Glancy
19ad1ce44c MDL-52361 core: patch Horde library for PHP7 compatibility 2015-12-08 12:47:15 +08:00
Marina Glancy
ace059fd4c MDL-52336 core: patch PHPExcel for PHP7 compatibility 2015-12-08 12:13:48 +08:00
Marina Glancy
73bb7c0990 MDL-52286 core: update ADODB library to 5.21 2015-12-08 11:52:40 +08:00
David Monllao
3f2c229b53 Merge branch 'MDL-50550-master' of git://github.com/dpalou/moodle 
Conflicts:
	lib/db/services.php
	version.php
 2015-12-08 11:32:39 +08:00
Dan Poltawski
bbd3156049 Merge branch 'wip-MDL-52193-master' of https://github.com/marinaglancy/moodle 2015-12-07 15:36:55 +00:00
Dan Poltawski
de6e67940f Merge branch 'MDL-52209-master' of git://github.com/junpataleta/moodle 2015-12-07 15:04:40 +00:00
Juan Leyva
a6c11677a8 MDL-52429 mod_scorm: Fix SCORM completion checking in nested SCOs 2015-12-07 11:28:22 +01:00
Mark Nelson
c319e44954 MDL-52312 assignfeedback_editpdf: changes to files after FPDI update 
1) Change the fpdi_bridge class so that it extends the pdf class,
rather than the TCPDF class.
2) Updated the editpdf/fpdi/readme_moodle.txt file to document the changes.
3) Updated the editpdf/thirdpartylibs.xml to reflect the update to the
FPDI library.
 2015-12-07 17:39:30 +08:00
Dan Poltawski
6c0bf99b5b Merge branch 'MDL-50258_master' of git://github.com/dmonllao/moodle 2015-12-07 09:04:35 +00:00
David Monllao
0575c5ad8c Merge branch 'MDL-52204-master' of git://github.com/danpoltawski/moodle 2015-12-07 16:30:38 +08:00
Dan Poltawski
f20abd8759 Merge branch 'MDL-52304_master' of https://github.com/dmonllao/moodle 2015-12-07 08:20:10 +00:00
Dan Poltawski
8f4662a807 MDL-52271 install: don't allow installer to be indexed 
Following guidance from:
https://support.google.com/webmasters/answer/93710?hl=en
 2015-12-07 15:42:11 +08:00
David Monllao
7e092a97d7 Merge branch 'MDL-52370-master' of git://github.com/danpoltawski/moodle 2015-12-07 15:01:42 +08:00
David Monllao
2ceaa5752f Merge branch 'MDL-50540-master' of git://github.com/FMCorz/moodle 2015-12-07 14:41:20 +08:00