78961 Commits

Author SHA1 Message Date
Dan Poltawski
834f1b66d4 MDL-54890 course: remove erranous duplicated switch label
Detected by eslint rule 'no-duplicate-case'
2016-06-10 10:06:28 +01:00
Dan Poltawski
8b766dd1d8 MDL-54890 assignfeedback_editpdf: Fix missing semicolon
Detected by eslint rule 'semi'
2016-06-10 10:06:25 +01:00
Dan Poltawski
a0a63678a9 weekly on-sync release 3.2dev 2016-06-09 11:25:51 +01:00
Dan Poltawski
b86bba12d7 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-06-09 11:25:49 +01:00
Andrew Nicols
2c4e6d6252 MDL-54853 weblib: Specify version and fixed encoding 2016-06-09 09:53:48 +08:00
Andrew Nicols
360e819fd3 Merge branch 'MDL-54853-master' of git://github.com/cameron1729/moodle 2016-06-09 09:41:53 +08:00
Cameron Ball
2549f46f7c MDL-54853 weblib: Properly specify encoding for blanktarget 2016-06-08 18:29:19 +08:00
Andrew Nicols
147df77923 Merge branch 'MDL-53947-master' of git://github.com/junpataleta/moodle 2016-06-08 08:15:23 +08:00
Dan Poltawski
631edc10ae MDL-46721 assign: clarify ternerary statement 2016-06-07 12:15:19 +01:00
Dan Poltawski
db417025d7 Merge branch 'MDL-46721-master' of git://github.com/cameron1729/moodle 2016-06-07 12:12:28 +01:00
Dan Poltawski
7bcab9d1fd Merge branch 'MDL-48756-master' of git://github.com/FMCorz/moodle 2016-06-07 11:49:39 +01:00
Dan Poltawski
654e77e74d MDL-54729 mod_forum: clarify static variable usage
After some time discussing with integrators, we decided that this
slightly yukky solution probably fits safely, so just making its usage
better explained and speciifc.
2016-06-07 10:46:53 +01:00
Adrian Greeve
09fec72819 MDL-54729 mod_forum: Deep link highlighting works in IE. 2016-06-07 10:30:18 +01:00
Dan Poltawski
df4af29945 Merge branch 'MDL-54765-master' of git://github.com/junpataleta/moodle 2016-06-07 09:41:27 +01:00
David Monllao
8a4f4f576e Merge branch 'MDL-54180_master' of https://github.com/marxjohnson/moodle 2016-06-07 16:15:43 +08:00
Skylar Kelty
1f5a347b46 MDL-53947 memcached: Fix memcached session warning on PHP7 2016-06-07 10:25:07 +08:00
Eloy Lafuente (stronk7)
31220d5a26 Merge branch 'MDL-54739-master' of git://github.com/lameze/moodle 2016-06-07 00:04:59 +02:00
Eloy Lafuente (stronk7)
512f9def5c Merge branch 'MDL-54769-master' of git://github.com/marinaglancy/moodle 2016-06-06 23:56:25 +02:00
Eloy Lafuente (stronk7)
ccbb50d2e2 Merge branch 'MDL-54805-master' of git://github.com/junpataleta/moodle 2016-06-06 18:06:36 +02:00
Dan Poltawski
4bfeaf2d5f Merge branch 'wip-MDL-50824-master' of https://github.com/cdsmith-umn/moodle 2016-06-06 15:07:01 +01:00
Dan Poltawski
015b4d22a2 Merge branch 'MDL-54820-master' of git://github.com/jleyva/moodle 2016-06-06 14:09:59 +01:00
Dan Poltawski
5bd52435b4 Merge branch 'MDL-54702_master' of https://github.com/snake/moodle 2016-06-06 13:41:48 +01:00
Dan Poltawski
e750544a06 Merge branch 'MDL-53392_master' of https://github.com/snake/moodle 2016-06-06 13:21:09 +01:00
Dan Poltawski
53ee327c69 Merge branch 'MDL-54557-master' of git://github.com/marinaglancy/moodle 2016-06-06 13:17:13 +01:00
Dan Poltawski
a7de32a265 Merge branch 'wip-MDL-49852-master' of git://github.com/abgreeve/moodle 2016-06-06 11:59:42 +01:00
Eloy Lafuente (stronk7)
294c242532 Merge branch 'MDL-41922-master-c' of git://github.com/FMCorz/moodle 2016-06-06 11:23:09 +02: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
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
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
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
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