Commit graph

78354 commits

Author SHA1 Message Date
Dan Poltawski
23f1dbde67 Merge branch 'MDL-53859_master' of https://github.com/StudiUM/moodle 2016-04-26 10:31:00 +01:00
Dan Poltawski
11ec31188a Merge branch 'MDL-53924-master' of git://github.com/FMCorz/moodle 2016-04-26 10:28:37 +01:00
Dan Poltawski
4648ae9e14 Merge branch 'MDL-52035_master' of git://github.com/markn86/moodle 2016-04-26 10:07:38 +01:00
Dan Poltawski
6bd3ab0717 on-demand release 3.1dev+ 2016-04-26 09:29:04 +01:00
Mark Nelson
73870f77f5 MDL-52035 enrol_lti: added PHPUnit and Behat tests 2016-04-26 16:15:48 +08:00
Mark Nelson
da39029a5d MDL-52035 enrol_lti: added backup/restore functionality 2016-04-26 16:15:48 +08:00
Mark Nelson
8ed2bbcfed MDL-52035 enrol_lti: added sync_<grades/members> tasks 2016-04-26 16:15:48 +08:00
Mark Nelson
01bb32a2b1 MDL-52035 enrol_lti: added enrol plugin 2016-04-26 16:15:47 +08:00
Mark Nelson
1d8886fa31 MDL-52035 auth_lti: added auth plugin 2016-04-26 15:58:08 +08:00
Mark Nelson
30498d9a0e MDL-52035 core_enrol: allow redirection to another page 2016-04-26 15:58:08 +08:00
Frederic Massart
f1a9fcd96a MDL-53924 competency: Relax strictness of default capabilities 2016-04-26 12:12:46 +08:00
Mark Nelson
581ea5013a MDL-52035 core_block: avoid PHP error when there is no region
This occurs when sharing a quiz via the LTI provider when it
adds a 'fake block' for quiz navigation. There may be other
occurrences.
2016-04-26 12:08:31 +08:00
Mark Nelson
466a1713a0 MDL-52035 core: added ability to override pagelayout
This is required by the LTI plugin when we share an
activity. We do not want the user to be shown the
navigation blocks etc. The activity should be the
only thing displayed.
2016-04-26 12:08:31 +08:00
David Monllao
6e233df58e Merge branch 'MDL-53667-master' of git://github.com/FMCorz/moodle 2016-04-26 11:38:00 +08:00
David Monllao
e7c979dff8 Merge branch 'MDL-53632-master' of git://github.com/FMCorz/moodle 2016-04-26 11:29:51 +08:00
David Monllao
8bfd0e6187 Merge branch 'MDL-52550-master' of git://github.com/cameron1729/moodle 2016-04-26 11:11:40 +08:00
David Monllao
29752d05ae Merge branch 'MDL-53733_master' of https://github.com/StudiUM/moodle 2016-04-26 10:55:03 +08:00
David Monllao
e9eb7ca21f Merge branch 'MDL-53878_master' of https://github.com/StudiUM/moodle 2016-04-26 10:49:32 +08:00
David Monllao
e1f9593de4 Merge branch 'MDL-53678_master' of https://github.com/StudiUM/moodle 2016-04-26 10:45:40 +08:00
David Monllao
4db87b505c Merge branch 'MDL-53813-master' of git://github.com/danpoltawski/moodle 2016-04-26 10:13:24 +08:00
David Monllao
1ef42d5f29 Merge branch 'MDL-53865-master' of git://github.com/junpataleta/moodle 2016-04-26 09:38:33 +08:00
Dan Poltawski
7064aaa11e Merge branch 'MDL-53717_master' of git://github.com/markn86/moodle 2016-04-25 22:20:31 +01:00
Dan Poltawski
55905d6313 Merge branch 'MDL-53811_master' of git://github.com/markn86/moodle 2016-04-25 22:01:38 +01:00
Dan Poltawski
ca6cbe3428 Merge branch 'MDL-53853-master' of git://github.com/junpataleta/moodle 2016-04-25 22:00:18 +01:00
Dan Poltawski
32bdfd74c0 Merge branch 'MDL-53864_master-alt' of git://github.com/markn86/moodle 2016-04-25 15:53:12 +01:00
Dan Poltawski
f60e024fdc Merge branch 'MDL-49754-master' of https://github.com/xow/moodle 2016-04-25 14:13:51 +01:00
Dan Poltawski
ff72bc88e0 Merge branch 'wip-MDL-47672-master' of https://github.com/marinaglancy/moodle 2016-04-24 14:31:45 +01:00
Issam Taboubi
18daa64cbf MDL-53878 tool_lp: Condition on displaying Link competencies button 2016-04-22 13:57:09 -04:00
Issam Taboubi
e65fda6b7f MDL-53733 tool_lp: Competency heading misaligned in templatecompetency 2016-04-22 13:54:02 -04:00
Issam Taboubi
ee0ca65f4e MDL-53678 tool_lp: Dropdown list plan displays horizontal scroll bar 2016-04-22 13:51:52 -04:00
Serge Gauthier
eeb477079e MDL-53859 competency: Can't change user in course competency breakdown 2016-04-22 11:41:36 -04:00
Eloy Lafuente (stronk7)
6c1342d7e5 weekly release 3.1dev 2016-04-22 10:56:57 +02:00
Eloy Lafuente (stronk7)
16d26ae0c1 NOBUG: Fixed file access permissions 2016-04-22 10:56:57 +02:00
Eloy Lafuente (stronk7)
7e122c6e29 NOBUG: Fixed SVG browser compatibility 2016-04-22 10:56:53 +02:00
Andrew Nicols
e1bb3cd3c2 Merge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle 2016-04-22 14:25:03 +08:00
Simey Lameze
7c2bdca2f6 MDL-52781 core_user: remove invalid countries from unit tests 2016-04-22 14:10:55 +08:00
Andrew Nicols
284ac4240f Merge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle 2016-04-22 13:23:16 +08:00
Simey Lameze
aa788b3c42 MDL-52781 core_user: fix wrong lang check 2016-04-22 13:07:22 +08:00
David Monllao
c047386123 Merge branch 'MDL-53451-master-fixup3' of https://github.com/FMCorz/moodle 2016-04-22 12:59:59 +08:00
Frederic Massart
5592edb646 MDL-53451 competency: Improve performance by bypassing api::is_enabled() 2016-04-22 11:34:39 +08:00
Simey Lameze
48da3eef6e MDL-52490 mod_assign: fix lang strings to make it consistent 2016-04-22 10:25:07 +08:00
Dan Poltawski
86dd906aa7 Merge branch 'MDL-46092' of git://github.com/timhunt/moodle 2016-04-21 13:21:03 +01:00
Tim Hunt
0569063924 MDL-46092 quiz nav: fix buttons in requiresgrading state 2016-04-21 12:25:45 +01:00
Dan Poltawski
2b311b2d3e Merge branch 'MDL-51603-fixes' of git://github.com/dmonllao/moodle 2016-04-21 09:24:28 +01:00
David Monllao
547d779012 MDL-51603 dataformat_ods: Setting the sheet name
Clearning according to Box\Spout\Writer\Common\Sheet::isNameValid
2016-04-21 16:20:36 +08:00
David Monllao
fef111472c MDL-51603 dataformats: Using the long name instead of the short one 2016-04-21 16:20:36 +08:00
David Monllao
bc3b5a6a2f MDL-51603 quiz statistics: Using dataformats selector 2016-04-21 16:20:36 +08:00
David Monllao
9df4ae4189 MDL-51603 dataformats: coding_exception if output buffering 2016-04-21 16:20:36 +08:00
Brendan Heywood
5b95105600 MDL-51603 dataformat: Fixed worksheet title bug 2016-04-21 16:20:36 +08:00
Andrew Nicols
6ab41abd3e Merge branch 'MDL-52781-master' of git://github.com/lameze/moodle 2016-04-21 15:54:45 +08:00