mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-31 14:02:46 +02:00
Code Issues Projects Releases Wiki Activity
79,028 Commits 36 Branches 527 Tags
Commit Graph

79028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
e68dabc756 Merge branch 'MDL-53598-master' of git://github.com/marinaglancy/moodle 2016-06-01 08:02:32 +08:00
Mark Johnson
be8b89500c MDL-54180 Behat: Handle exceptions from driver when saving screenshot 2016-05-31 12:32:57 +01:00
Marina Glancy
9c3710854b MDL-53598 block_glossary_random: do not fail if glossary was deleted 
This commit refactors how associated glossary is searched for and removes
unnecessary DB queries. Also prevents from situations when the global glossary or course have
been deleted
 2016-05-31 15:30:41 +08:00
David Monllao
19e078dd2a Merge branch 'MDL-54065-master' of git://github.com/marinaglancy/moodle 2016-05-31 15:27:29 +08:00
Andrew Nicols
b29d2b2aa8 Merge branch 'MDL-54655_m32v1' of https://github.com/sbourget/moodle 2016-05-31 13:29:48 +08:00
David Monllao
5751f7a36c Merge branch 'MDL-54667-master' of git://github.com/junpataleta/moodle 2016-05-31 12:46:59 +08:00
David Monllao
694d8c4a9e Merge branch 'MDL-54763_master' of git://github.com/markn86/moodle 2016-05-31 12:31:36 +08:00
David Monllao
ba4cd26414 Merge branch 'MDL-53851-master' of https://github.com/blckct/moodle 2016-05-31 11:46:09 +08:00
David Monllao
0cdef23bdb Merge branch 'MDL-53938' of git://github.com/timhunt/moodle 2016-05-31 11:42:17 +08:00
David Monllao
d1577993b6 Merge branch 'MDL-54605' of git://github.com/timhunt/moodle 2016-05-31 11:32:11 +08:00
Andrew Nicols
73b0dcb106 Merge branch 'MDL-54579_m31v1' of https://github.com/sbourget/moodle 2016-05-31 11:18:27 +08:00
Barbara Ramiro
000d660fda MDL-51683 design: New icon for competencies 2016-05-31 10:48:18 +08:00
Jakob
cffd0fa138 MDL-53306 auth: Add hook for auth plugins to access user object. 
Add a hook for auth plugins to be able to modify or check a user, before
raising any authentication errors.

The auth plugin needs to add a public function like this:

/**
 * Pre user_login hook.
 * This method is called from authenticate_user_login() right after the user
 * object is generated. This gives the auth plugins an option to make adjustments
 * before the verification process starts.
 *
 * @param object $user user object, later used for $USER
*/
public function pre_user_login_hook(&$user) {
    // Override if needed.
}
 2016-05-30 11:57:03 -07:00
Jakub Kania
81475d2602 MDL-54667 core_lib: Fix the param name in edit profile link 2016-05-30 16:34:02 +08:00
Cameron Ball
af6a424054 MDL-37138 weblib: Document blanktarget in upgrade.txt 2016-05-30 16:12:17 +08:00
David Monllao
abd5f819d0 Merge branch 'MDL-54002_m32v3' of https://github.com/sbourget/moodle 2016-05-30 16:08:53 +08:00
David Monllao
4f24176f17 Merge branch 'MDL-54010-master' of git://github.com/cameron1729/moodle 2016-05-30 16:04:04 +08:00
David Monllao
7e93c2e6f6 Merge branch 'MDL-54577-master' of git://github.com/cameron1729/moodle 2016-05-30 15:45:47 +08:00
David Monllao
9812222d21 Merge branch 'MDL-29905-master' of git://github.com/FMCorz/moodle 2016-05-30 15:40:43 +08:00
David Monllao
13d04ab6c1 Merge branch 'MDL-54116-master' of git://github.com/cameron1729/moodle 2016-05-30 15:36:01 +08:00
David Monllao
42d0093d6e Merge branch 'MDL-49943-master' of git://github.com/marinaglancy/moodle 2016-05-30 15:29:22 +08:00
Andrew Nicols
a29e419b2c Merge branch 'MDL-54756' of git://github.com/timhunt/moodle 2016-05-30 15:19:04 +08:00
David Monllao
1e562ebc48 Merge branch 'MDL-37138-master-2' of git://github.com/cameron1729/moodle 2016-05-30 15:02:17 +08:00
Andrew Nicols
1f9c338bc1 Merge branch 'MDL-54567-master-build' of git://github.com/FMCorz/moodle 2016-05-30 14:39:23 +08:00
Marina Glancy
42dfbb5416 MDL-49943 mod_choice: display multiple answers in complete report 2016-05-30 14:17:17 +08:00
Jun Pataleta
46b888dbd6 MDL-53425 blocklib: Raise execution time for dashboard reset process 2016-05-30 14:12:28 +08:00
Andrew Nicols
7c8f4f6b70 Merge branch 'MDL-35987-master' of git://github.com/FMCorz/moodle 2016-05-30 13:38:52 +08:00
David Monllao
485de12199 Merge branch 'MDL-53425-master-delete-by-chunks' of git://github.com/junpataleta/moodle 2016-05-30 13:35:24 +08:00
Mark Nelson
e0d60498d8 MDL-54763 tool_lp: fixed typo in HTML tag 2016-05-30 13:31:31 +08:00
Andrew Nicols
e67da0d792 MDL-54567 backup: Fixtures for legacy grade value rewrite 2016-05-30 13:22:04 +08:00
Frederic Massart
2a64b641e6 MDL-54567 backup: Process the calculations_freeze item upon restore 2016-05-30 13:22:03 +08:00
Cameron Ball
cd29373c35 MDL-37138 chat: Use blanktarget option for chat text 2016-05-30 13:18:02 +08:00
Cameron Ball
64e8311939 MDL-37138 message: Use blanktarget option for message text 2016-05-30 13:18:01 +08:00
Cameron Ball
bf9974870b MDL-37138 weblib: Add blanktarget option to format_text 2016-05-30 13:17:59 +08:00
David Monllao
edf842a462 Merge branch 'MDL-48248-master' of git://github.com/FMCorz/moodle 2016-05-30 13:02:34 +08:00
Frederic Massart
31031e98c7 MDL-29905 question: Auto remove stale questions upon category deletion 2016-05-30 12:26:09 +08:00
Eric Merrill
54640aba8a MDL-29905 question: Try to delete unused hidden/random questions 
Before going to display the warning about moving in use questions,
try to delete unused Random qtype questions, as well as 'hidden'
questions (these are questions that were deleted from the category),
but were in use at the time.
 2016-05-30 12:25:21 +08:00
Jun Pataleta
4eba620ae3 MDL-53425 blocklib: Perform deletion of block instances by chunk 2016-05-30 11:22:47 +08:00
David Monllao
571f30b376 Merge branch 'MDL-54721-master' of git://github.com/FMCorz/moodle 2016-05-30 11:15:20 +08:00
David Monllao
3300393d05 Merge branch 'MDL-43887-master' of git://github.com/cameron1729/moodle 2016-05-30 11:08:46 +08:00
David Monllao
5baf32c038 Merge branch 'MDL-51806_master' of https://github.com/snake/moodle 2016-05-30 10:51:33 +08:00
Jake Dallimore
f747f5a0d5 MDL-51806 mod_workshop: Add locale support for grade values. 2016-05-30 10:25:26 +08:00
David Monllao
0196f0101c Merge branch 'wip-MDL-45427-master' of git://github.com/abgreeve/moodle 2016-05-30 10:19:24 +08:00
Marina Glancy
bc6a7431a2 MDL-54065 gradebook: correctly display module icon 2016-05-30 10:07:40 +08:00
Stephen Bourget
18875f811a MDL-54655 Behat: Tests for the online_users block 2016-05-27 18:21:25 -04:00
Tim Hunt
31c07476db MDL-54756 moodle_url: remove dangerous trim from make_file_url 
This was a regression caused by MDL-50268. It broke qtype_stack.
 2016-05-27 19:55:25 +01:00
Tim Hunt
f027922e4f MDL-54605 quiz regrading: incorrect DB query 
There were two issues. With groups, the $params array was wrong
due to PHP + vs array_merge sillyness.

Also, the first column in the SQL was not necessarily unique,
so we need to use a recordset rather than get_records.
 2016-05-27 08:11:32 +01:00
Adrian Greeve
0cf8082a8f MDL-49852 mod_assign: Unit tests for activity completion. 2016-05-27 14:10:55 +08:00
Cameron Ball
e6e69969c1 MDL-43887 formslib: Allow not set date field 
Previously if the date field was not enabled it would
be treated as having value 0. A bug would allow this 0
to pass through and save the date as 1 January 1970
 2016-05-27 01:52:57 +08:00
AMOS bot
867181ab19 Automatically generated installer lang files 2016-05-27 00:04:40 +08:00