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
67,082 Commits 36 Branches 519 Tags
Commit Graph

18057 Commits

Author SHA1 Message Date
Petr Škoda
b7f7c3bcf2 MDL-44639 fix some phpdocs issues in tasks classes 
There is also one extra () to improve code readability.
 2014-03-20 17:32:56 +08:00
Sam Hemelryk
89381287ce Merge branch 'MDL-44608-master-fix1' of http://github.com/damyon/moodle 2014-03-19 21:22:23 +01:00
Marina Glancy
4826ed1177 Merge branch 'MDL-44141-master' of git://github.com/sammarshallou/moodle 2014-03-19 09:49:00 +08:00
Damyon Wiese
9be8583ac5 MDL-44608 task scheduler: Make unit test case insensitive 2014-03-19 09:24:50 +08:00
Eloy Lafuente (stronk7)
2c36f83422 MDL-41760 move upgrade steps to match 04 version. 
In previous (merge) commit, version was moved, on conflict
to 04 (coz 01) was already in use. This commit moves the 3
upgrade steps to 02, 03 and 04, matching that final version.
 2014-03-19 02:15:17 +01:00
Eloy Lafuente (stronk7)
1c774322ba Merge branch 'MDL-41760-master-v8' of https://github.com/jamiepratt/moodle 
Conflicts:
	version.php
 2014-03-19 02:14:00 +01:00
sam marshall
ddf368a213 MDL-44141 Completion: System updates data during restore 
The completion system has code which is supposed to prevent it
updating completion status while grades are being restored. This
code was a nasty hack and had not worked for some time. As a result
completion dates were restored incorrectly.

This commit implements a 'proper' way to find out if a restore is
currently running, replacing the previous hack.
 2014-03-18 13:31:34 +00:00
James Pratt
038014c415 MDL-41760 quiz_statistics : response analysis for first/last/all tries 2014-03-18 18:47:19 +07:00
Jerome Mouneyrac
9e103d6e15 MDL-42025 assignfeedback_editpdf: add behat tests 2014-03-18 17:14:31 +08:00
Marina Glancy
3aa71904a1 Merge branch 'w12_MDL-44191_m27_mysql56' of git://github.com/skodak/moodle 2014-03-18 16:03:47 +08:00
Sam Hemelryk
319633a0c6 Merge branch 'MDL-44502' of https://github.com/bostelm/moodle 2014-03-18 14:40:56 +13:00
Sam Hemelryk
b02d88d98c Merge branch 'mdl44499-master' of https://github.com/tlock/moodle 2014-03-18 14:26:56 +13:00
Sam Hemelryk
224f8dfda1 Merge branch 'w12_MDL-44527_m27_cacert' of https://github.com/skodak/moodle 2014-03-18 12:52:19 +13:00
Sam Hemelryk
43301757eb Merge branch 'w12_MDL-44515_m27_phpexcel' of https://github.com/skodak/moodle 2014-03-18 11:48:47 +13:00
Sam Hemelryk
0406fb9a4b Merge branch 'w12_MDL-44516_m27_purifier' of https://github.com/skodak/moodle 2014-03-18 11:48:21 +13:00
Sam Hemelryk
1c6dff6f1c Merge branch 'w12_MDL-44521_m27_tcpdf' of https://github.com/skodak/moodle 2014-03-18 11:48:11 +13:00
Sam Hemelryk
7286f5923d Merge branch 'w12_MDL-44522_m27_markdown' of https://github.com/skodak/moodle 2014-03-18 10:17:04 +13:00
Sam Hemelryk
c16fc19461 Merge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle 2014-03-18 09:30:39 +13:00
Marina Glancy
ea406e6b94 Merge branch 'w12_MDL-44624_m27_dmltest' of git://github.com/skodak/moodle 2014-03-17 18:12:16 +08:00
Marina Glancy
9051b7f4ea Merge branch 'MDL-44610-m' of git://github.com/micaherne/moodle 2014-03-17 18:08:57 +08:00
Marina Glancy
3087d9d34e Merge branch 'MDL-44650' of git://github.com/danielneis/moodle 2014-03-17 17:53:00 +08:00
Marina Glancy
6f96d1a9a7 Merge branch 'w12_MDL-41115_m27_emaillogin' of git://github.com/skodak/moodle 2014-03-17 17:44:45 +08:00
Marina Glancy
93eab4fd77 Merge branch 'w12_MDL-43604_m27_mariadb10' of git://github.com/skodak/moodle 2014-03-17 16:03:08 +08:00
Marina Glancy
4715639b22 Merge branch 'w12_MDL-44603_m27_extgrade2' of git://github.com/skodak/moodle 2014-03-17 14:38:01 +08:00
Marina Glancy
992d71cd8f Merge branch 'w12_MDL-44500_m27_eventcourse' of git://github.com/skodak/moodle 2014-03-17 14:32:28 +08:00
Marina Glancy
784d9c2be0 Merge branch 'w12_MDL-44635_m27_ajaxlogs' of git://github.com/skodak/moodle 2014-03-17 14:30:03 +08:00
Marina Glancy
3b85de7b99 Merge branch 'w12_MDL-44339_m27_testdebug' of git://github.com/skodak/moodle 2014-03-17 13:48:27 +08:00
Petr Škoda
d3ab89fbb5 MDL-44635 discard error logging during ajax tests 2014-03-17 11:30:46 +08:00
Sam Hemelryk
9ea57c8bc3 Merge branch 'MDL-44608-master' of git://github.com/damyon/moodle 2014-03-17 12:37:02 +13:00
Petr Škoda
9c140a681e MDL-44300 force PHP 5.6.x to return raw file names for our own guessing 2014-03-17 12:34:02 +13:00
Sam Hemelryk
a8db93c5ac Merge branch 'w11_MDL-44299_m27_sessiongc' of https://github.com/skodak/moodle 2014-03-17 12:10:48 +13:00
Petr Škoda
0fa50262e0 MDL-44603 fix core_grading_external class and test location 2014-03-15 11:08:21 +08:00
Petr Škoda
ed57d984a8 MDL-44603 add support for external service autoloading 2014-03-15 10:53:39 +08:00
Daniel Neis Araujo
db64fd6b1c MDL-44650 Remove invalid meta tags "pragma" and "expires" 2014-03-14 18:31:29 -03:00
Henning Bostelmann
c746c60803 MDL-44502 filelib: Add mimetype for Maple worksheets 2014-03-14 11:39:07 +00:00
Petr Škoda
ce1f5ed57a MDL-44624 fix false failures in DML tests 2014-03-14 14:14:10 +08:00
Petr Škoda
5940a2bbff MDL-44599 undeprecate SITEID 
There is no way we could implement multitenant now,
it means there is no reason to deprecate SITEID.
 2014-03-14 13:43:04 +08:00
Petr Škoda
1fc70846f0 MDL-44527 import latest certificate bundle 2014-03-14 13:41:35 +08:00
Petr Škoda
cfc9130ec5 MDL-44522 import markdown 1.4.0 2014-03-14 13:40:11 +08:00
Petr Škoda
fc9cedb321 MDL-44521 import TCPDF 6.0.062 2014-03-14 13:38:37 +08:00
Petr Škoda
6becafba0e MDL-44516 import htmlpurifier 4.6.0 2014-03-14 12:11:49 +08:00
Petr Škoda
7ec0e0629c MDL-44515 import latest PHPExcel 1.8.0 2014-03-14 12:10:52 +08:00
Petr Škoda
9ede00db18 MDL-44500 detect context-courseid inconsistencies in new events 2014-03-14 12:08:12 +08:00
Petr Škoda
589eca14f2 MDL-44604 fix task cleanup in plugin uninstallation 2014-03-14 12:04:04 +08:00
Damyon Wiese
bbd9226cb8 MDL-44608 Scheduled Tasks: Use $CFG->timezone if it is set to schedule tasks 2014-03-14 11:47:03 +08:00
Petr Škoda
c386f35bca MDL-44339 treat unexpected debugging() calls in phpunit tests as errors 2014-03-14 11:43:46 +08:00
Petr Škoda
5d4c82560b MDL-44191 hack around MySQL 5.6 inability to lower auto_increment 2014-03-14 11:31:43 +08:00
Petr Škoda
1dd74afe9e MDL-43604 add support for future hacky MariaDB versions 
This patch also shows the real server version without
normalisation on the environment page, this should
hopefully help people to identify MariaDB...
 2014-03-14 11:28:05 +08:00
Petr Škoda
50f5c84359 MDL-41115 add option to allow login via email 2014-03-14 11:25:09 +08:00
Eloy Lafuente (stronk7)
630bb85d9e MDL-43266 testing: avoid assoc arrays for json 
Last commit switched from raw arrays to associative
arrays. That leads to json_encode() to generate an
object instead of an array, ultimately leading to
problems with the rest of code expecting an array.

By using array_values() we are moving back to the
non-associative array.

Also, fix some file permissions.
 2014-03-13 22:11:03 +01:00