79885 Commits

Author SHA1 Message Date
Andrew Nicols
30c7ec63df Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-08-04 09:58:34 +08:00
Rajesh Taneja
99ad3223a5
MDL-54656 behat: Skip test if db family is not mysql or postgres 2016-08-04 08:46:04 +08:00
Tim Hunt
0e9132e56e MDL-55454 quiz: loses shufflequestion setting restoring old backups 2016-08-03 18:42:51 +01:00
Mark Nielsen
d900d61798 MDL-55453 core_lib: Fix usage of js_send_uncached 2016-08-03 10:18:41 -07:00
Davo Smith
946ab15c72 MDL-3782 qtype_multianswer: support 'multiple-answer' subquestions 2016-08-03 08:04:49 +01:00
Andrew Nicols
d21942998c Merge branch 'MDL-55367-master-fix' of https://github.com/lameze/moodle 2016-08-03 14:41:47 +08:00
Andrew Nicols
0731226023 Merge branch 'MDL-54941-master-fixes' of https://github.com/andrewnicols/moodle 2016-08-03 14:35:08 +08:00
Andrew Nicols
1a354b81b6 MDL-54941 glossary: Correct variable naming for entry files 2016-08-03 14:33:53 +08:00
Simey Lameze
e3df6df02e MDL-55367 report_log: declare log array indexes to avoid errors 2016-08-03 14:23:44 +08:00
Andrew Nicols
079e06adcd Merge branch 'MDL-55355-master-fix' of https://github.com/lameze/moodle 2016-08-03 10:45:15 +08:00
Simey Lameze
472ac2d390 MDL-55355 mod_feedback: Change show chart data step to avoid errors 2016-08-03 10:22:58 +08:00
Simey Lameze
14cc6df5f9 MDL-55355 core: Fix incorrect chart link selector 2016-08-03 10:21:48 +08:00
Eloy Lafuente (stronk7)
4a3a49353c Merge branch 'MDL-24343-master' of git://github.com/andrewnicols/moodle 2016-08-03 03:22:16 +02:00
Andrew Nicols
2c2f4f17c3 MDL-24343 core: Deprecate unzip_file 2016-08-03 09:05:55 +08:00
Eloy Lafuente (stronk7)
f00780105c Merge branch 'MDL-55276-master' of git://github.com/junpataleta/moodle 2016-08-03 01:01:51 +02:00
Eloy Lafuente (stronk7)
bc7817edab Merge branch 'MDL-54656_m32v3' of https://github.com/sbourget/moodle 2016-08-03 00:50:19 +02:00
Eloy Lafuente (stronk7)
a9b1af901b Merge branch 'MDL-55166-master-blocksettings' of git://github.com/mudrd8mz/moodle 2016-08-03 00:33:58 +02:00
Eloy Lafuente (stronk7)
8c7840df32 Merge branch 'MDL-54941-master' of git://github.com/jleyva/moodle 2016-08-03 00:29:45 +02:00
Eloy Lafuente (stronk7)
dffeff0a4b Merge branch 'MDL-55322-master' of https://github.com/snake/moodle 2016-08-03 00:12:10 +02:00
Eloy Lafuente (stronk7)
5fe1db394b Merge branch 'MDL-54745_master' of https://github.com/snake/moodle 2016-08-02 23:13:25 +02:00
Eloy Lafuente (stronk7)
babfc9886c Merge branch 'MDL-44369_m32v3' of https://github.com/sbourget/moodle 2016-08-02 21:25:24 +02:00
Dan Poltawski
de741b1551 MDL-54847 tests: fix unused var 2016-08-02 20:11:27 +01:00
Dan Poltawski
805f1c8d0b Merge branch 'MDL-54847-master-fix' of git://github.com/cameron1729/moodle 2016-08-02 20:09:45 +01:00
Cameron Ball
c353674f21 MDL-54847 weblib: Test media attributes individually 2016-08-03 02:53:29 +08:00
Eloy Lafuente (stronk7)
f31c65d784 Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle 2016-08-02 19:54:00 +02:00
Dan Poltawski
091a1f9290 MDL-55167 npm: add stylelint-checkstyle-formatter
Useful for automations (like the Moodle prechecker)
2016-08-02 18:52:41 +01:00
Eloy Lafuente (stronk7)
648bbbbbd0 Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle 2016-08-02 18:54:49 +02:00
Eloy Lafuente (stronk7)
e0519d032d Merge branch 'MDL-55314-master' of https://github.com/mrmark/moodle 2016-08-02 17:16:07 +02:00
Eloy Lafuente (stronk7)
8a78cb42da Merge branch 'MDL-55315-master' of https://github.com/mrmark/moodle 2016-08-02 17:07:16 +02:00
Eloy Lafuente (stronk7)
2460f3be57 Merge branch 'MDL-55316-master' of https://github.com/mrmark/moodle 2016-08-02 17:01:46 +02:00
Dan Poltawski
8ce58c99f0 MDL-53572 mathjax: always load mathjax using https
It's considered an anti-pattern now to use protocol relative urls and
reduces a setting.

(Also fixed an incorrectly placed 3.1.0 upgrade marker)
2016-08-02 15:55:23 +01:00
Eloy Lafuente (stronk7)
03961256d1 Merge branch 'MDL-55348-master' of git://github.com/dpalou/moodle 2016-08-02 16:48:26 +02:00
Dan Poltawski
8ea6cc2455 Merge branch 'wip-MDL-33741-master' of git://github.com/marinaglancy/moodle 2016-08-02 12:20:11 +01:00
Dan Poltawski
bf3b8a35d8 Merge branch 'MDL-45734_m32v4' of https://github.com/sbourget/moodle 2016-08-02 12:17:03 +01:00
Dan Poltawski
2961f1075b Merge branch 'MDL-55357_master' of git://github.com/dmonllao/moodle 2016-08-02 10:54:28 +01:00
Dan Poltawski
25054c40e1 Merge branch 'MDL-54847-master' of git://github.com/cameron1729/moodle 2016-08-02 10:54:21 +01:00
Marina Glancy
134494e07a MDL-55418 behat: correct exception class name 2016-08-02 17:45:12 +08:00
Marina Glancy
145f29034b MDL-55397 block_site_main_menu: eliminate CSS conflict
CSS for '.path-admin .buttons' defines padding, border and background that affected how main menu looks on admin pages
2016-08-02 14:20:18 +08:00
Cameron Ball
37c10287be
MDL-54847 MDL-54847 weblib: Support basic HTML media tags 2016-08-02 10:58:48 +08:00
Andrew Nicols
8dc3b7697b Merge branch 'MDL-55355-master' of git://github.com/lameze/moodle 2016-08-02 10:29:30 +08:00
Andrew Nicols
346cf5abb9 Merge branch 'MDL-55352-master-fix' of https://github.com/lameze/moodle 2016-08-02 10:10:38 +08:00
Simey Lameze
30452f23cb MDL-55352 mod_feedback: Change series labels on multi choice rated 2016-08-02 09:23:18 +08:00
Stephen Bourget
7c4dfba89e MDL-51078 report_log: Allow filtering by all changes 2016-08-01 21:13:05 -04:00
Andrew Nicols
b34d7e700b Merge branch 'MDL-54879-master' of git://github.com/junpataleta/moodle 2016-08-02 09:10:19 +08:00
Stephen Bourget
952c6e2697 MDL-55398 mod_feedback: prevent direct script access to lib files. 2016-08-01 20:53:46 -04:00
Andrew Nicols
8f33657dae Merge branch 'MDL-55140_m32v2' of https://github.com/sbourget/moodle 2016-08-02 08:48:36 +08:00
Dan Poltawski
6349765c44 Merge branch 'MDL-55360-master-workshopgradepass' of git://github.com/mudrd8mz/moodle 2016-08-01 18:57:00 +01:00
AMOS bot
fa76a5b0af Automatically generated installer lang files 2016-08-02 00:04:17 +08:00
Dan Poltawski
4638a26eca MDL-55376 assign: trailing whitespace 2016-08-01 16:07:43 +01:00
Dan Poltawski
b9fe2f38d4 Merge branch 'MDL-55376-master' of git://github.com/cameron1729/moodle 2016-08-01 16:07:00 +01:00