moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 03:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76690 commits 37 branches 544 tags 1.3 GiB
Commit graph

21102 commits

Author SHA1 Message Date
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 Poltawski
b12b03de85 Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle 2015-12-11 08:57:57 +00: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
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
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
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
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
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
a4fb992435 Merge branch 'MDL-52335-master' of git://github.com/marinaglancy/moodle 2015-12-10 15:47:14 +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
sam marshall
6d4858d5b3 MDL-52226 Forms: max_input_vars problems with advanced checkbox 2015-12-09 12:15:45 +00:00
Eloy Lafuente (stronk7)
7955476cab Merge branch 'MDL-51483_master' of https://github.com/jinhofer/moodle 2015-12-09 01:09:08 +01:00
Brendan Heywood
d7238be174 MDL-51698 navigationlib: Add crumb trail meta data 2015-12-09 00:50:16 +01:00
Dan Poltawski
c7bba4e5af Merge branch 'MDL-52165-master' of git://github.com/jleyva/moodle 2015-12-08 08:51:34 +00: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
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
Frederic Massart
bf5bbe0127 MDL-50540 mod_glossary: Final clean up of new external function 2015-12-07 13:42:37 +08:00
Costantino Cito
23da998fad MDL-50540 glossary: New WS mod_glossary_get_glossaries_by_courses 2015-12-07 12:48:27 +08:00
Juan Leyva
04cd8ae3c0 MDL-52165 mod_forum: New Web Service mod_forum_can_add_discussion 2015-12-04 15:30:16 +01:00
Dani Palou
23cbaefb24 MDL-50550 wiki: New WS mod_wiki_get_wikis_by_courses 2015-12-04 13:52:41 +01:00
Dan Poltawski
f992dcf6e8 MDL-52204 js: fix 'used before defined' errors 
Newer versions of jshint detect this coding error, we fix it
by simply reordering the definition of methods.
 2015-12-04 11:43:10 +00:00
Michael Aherne
27635149d5 MDL-52304 media: Allow full screen in Flash player 2015-12-04 10:06:14 +08:00
David Monllao
a75f1dbc4f MDL-50258 themes: Fix CSS source maps 2015-12-04 09:02:16 +08:00
Eloy Lafuente (stronk7)
ef53650e8a NOBUG: Fixup commit to fix stuff wrongly changed on merge commits 
On rewriting MDL-47491, we ended in a situation where these
modifications had been incorporated via merge commits. And kept
undetected by rebase -ip.

In general, please, use merge commits only for solving conflicts,
never as a replacement for fixup commits. To fix non-conflicting
things, add new, proper, fixup commits.
 2015-12-03 18:52:25 +01:00
Dan Poltawski
53907dbee5 Merge branch 'MDL-51700-master' of git://github.com/FMCorz/moodle 2015-12-03 18:52:21 +01:00
David Monllao
200ab5266a Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle 
Conflicts:
	lib/upgrade.txt
 2015-12-03 18:51:42 +01:00
jinhofer
4ebdd15487 MDL-51483 lib/moodlelib.php: Added conditional checks to shorten_text 2015-12-03 10:00:08 -06:00