79254 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
294c242532 Merge branch 'MDL-41922-master-c' of git://github.com/FMCorz/moodle 2016-06-06 11:23:09 +02:00
Dan Poltawski
f549e4b7e8 MDL-54649 quiz/question: remove uncessary !important uses
They do not seem at all necessary in testing, so probably just legacy
from lack of css understanding when added.
2016-06-05 20:29:13 +01:00
Mike Churchward
b96c9a1abe MDL-54805 portfolio_download: Adding a 'require' of necessary library file 2016-06-04 21:53:34 +08:00
AMOS bot
00eff42833 Automatically generated installer lang files 2016-06-04 00:04:17 +08:00
Dan Poltawski
996a1dab8f MDL-54649 quiz/question: fix css lint errors
Mostly the rules were not having any effect so have been removed.

The text-wrap rule was removed rather than corrected because overflow
was clipped with ellipsis anyway.

An exception for !important has been added to mod/quiz/styles.css
because the use in the secure style is by design. But the exception
isn't ideal because it applied to the whole file and csslint doesn't
seem to be very intelligent at appling line rules at a more granular
level at this point in time.
2016-06-03 14:18:57 +01:00
Juan Leyva
72ac2aacfa MDL-54820 webservice: Fix regression in core_course_search_courses
Regression caused by MDL-51324
2016-06-03 12:56:11 +02:00
Jun Pataleta
bb2281d53c MDL-54765 mod_assign: Use selectedIndex for setting page selection
Set the 'selectedIndex' attribute of the page selection element instead of
the 'value' attribute since YUI is having trouble with this in IE.
2016-06-03 14:55:43 +08:00
Frederic Massart
ac032e0e09
MDL-41922 mod_quiz: Don't report quiz due when an attempt was finished 2016-06-03 14:52:34 +08:00
Joey Andres
fdac806aef MDL-53399 core: "activity chooser off/on" in user preference
- Created a "Course preferences" for user preference. This
  is where "activity chooser off/on" option is moved.
- Changed the lib/navigationlib.php to have a new user preference
  section, which is "Course preferences".
- Removed the "activity chooser" toggle codes in javascript.
2016-06-03 00:46:16 -06:00
Andrew Nicols
4ee8ef5d41 weekly on-sync release 3.2dev 2016-06-03 12:09:19 +08:00
Andrew Nicols
841f623dad Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-06-03 12:09:16 +08:00
Simey Lameze
f49a3e1791 MDL-54739 blocks: fix activity chooser link alignment
Thanks Ryan Wyllie for the help.
2016-06-03 10:55:52 +08:00
Clement Smith
126a4bc47b MDL-50824 message/externallib.php: Fix get_string call
This fixes the get_string call by adding the intended recipient's
fullname as the third argument when a user tries to message the
recipient, the recipient is blocking non-contacts from messaging
them, and the user is not in the recipient's contact list.
2016-06-02 07:11:16 -05:00
Adam Olley
e9f7c4a4b2 MDL-54797 course: Add indexed field to condition of delete query
Deleting records from the course_completion_criteria table goes much
faster when we include the indexed course field in the delete query.
2016-06-02 15:43:30 +09:30
Marina Glancy
5e717d10b4 MDL-54557 course: treat section summary as contents 2016-06-02 12:56:34 +08:00
Andrew Nicols
05263307d7 MDL-54722 javascript: Add YUI depend wrapper to global event 2016-06-02 10:07:56 +08:00
AMOS bot
7087d1cfde Automatically generated installer lang files 2016-06-02 00:04:13 +08:00
Frederic Massart
a5ea5149b8 MDL-48248 enrol_manual: Handle durations more precise than int days 2016-06-01 15:57:12 +08:00
Frederic Massart
240a9de4ab
MDL-48756 editor_atto: Bulk atto autosave queries 2016-06-01 12:49:15 +08:00
Andrew Nicols
69dcebb04d Merge branch 'MDL-54722-master' of git://github.com/cameron1729/moodle 2016-06-01 12:24:14 +08:00
Stephen Bourget
5b40141f6d MDL-54563 Block: Only Allow completion blocks on course pages 2016-06-01 10:42:01 +08:00
Cameron Ball
fd5466af99 MDL-54722 navigation: Properly overflow expanded nav trees 2016-06-01 10:15:22 +08:00
Jake Dallimore
c724c98829 MDL-54702 mod_lti: Support standard cartridge icons in LTI import 2016-06-01 09:49:10 +08:00
Marina Glancy
88038050b1 MDL-54769 backup: add missing error language string 2016-06-01 09:44:42 +08:00
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