Commit graph

18132 commits

Author SHA1 Message Date
Davo Smith
3bc7382d10 MDL-55057 mod_scorm: fix handling of SCO identifiers with apostrophes 2016-06-29 08:44:24 +01:00
Dan Poltawski
ce63e9b2d7 Merge branch 'MDL-55002-master-enfix' of git://github.com/mudrd8mz/moodle 2016-06-29 15:05:25 +08:00
Andrew Nicols
ea5241410d Merge branch 'MDL-54991-master' of git://github.com/crazyserver/moodle 2016-06-29 15:05:24 +08:00
Andrew Nicols
df4b55e05b Merge branch 'MDL-54909-master' of git://github.com/crazyserver/moodle 2016-06-29 15:05:23 +08:00
Andrew Nicols
3654734601 Merge branch 'MDL-54910_m32v2' of https://github.com/sbourget/moodle 2016-06-29 15:05:20 +08:00
Andrew Nicols
be88488274 Merge branch 'MDL-54911_m32v3' of https://github.com/sbourget/moodle 2016-06-29 15:05:19 +08:00
Andrew Nicols
e1ac41ecc4 Merge branch 'MDL-54935_m32v1' of git://github.com/sbourget/moodle 2016-06-29 15:05:16 +08:00
David Mudrák
46994de566 MDL-55002 lang: Fix behat scenarios using modified strings 2016-06-27 22:57:34 +02:00
Helen Foster
25558b808e MDL-55002 lang: Merge English strings from the en_fix language pack 2016-06-27 22:03:40 +02:00
Eloy Lafuente (stronk7)
0efd933a1f Merge branch 'MDL-54900-master' of git://github.com/marinaglancy/moodle 2016-06-27 18:53:23 +02:00
Eloy Lafuente (stronk7)
bc413a6078 Merge branch 'MDL-52887-master' of git://github.com/marinaglancy/moodle 2016-06-27 16:13:25 +02:00
Eloy Lafuente (stronk7)
f780baf063 Merge branch 'MDL-54663-master' of git://github.com/andrewnicols/moodle 2016-06-27 13:26:34 +02:00
Pau Ferrer Ocaña
ff6de75396 MDL-54991 assign: Invalid submissiongroup when not using groups 2016-06-27 09:24:29 +02:00
Andrew Nicols
623395ff7b Merge branch 'MDL-53111_m32v1' of https://github.com/sbourget/moodle 2016-06-27 13:30:51 +08:00
Marina Glancy
540200aee5 MDL-54900 mod_choice: correctly count number of answered users 2016-06-27 12:47:49 +08:00
Jun Pataleta
eb55f72d63 MDL-55022 mod_lti: Fix undefined variable 2016-06-27 11:40:03 +08:00
Jake Dallimore
f56cbd3bbf MDL-54610 mod_lti: Fix cartridge support for admin tool add/edit forms 2016-06-24 14:14:28 +08:00
Stephen Bourget
443ab2cea9 MDL-54911 mod_feedback: start date should be before the end date 2016-06-23 17:39:48 -04:00
Stephen Bourget
316f20a0b6 MDL-54910 mod_data: Open dates should be before close dates 2016-06-23 17:32:19 -04:00
Stephen Bourget
5d3821ebcc MDL-32135 mod_choice: Open time should be before close time 2016-06-23 17:21:27 -04:00
Pau Ferrer Ocaña
36f1d79ea2 MDL-54909 assign: Style editpdf background to differ from page bg 2016-06-23 15:06:59 +02:00
Pau Ferrer Ocaña
796161018c MDL-54855 assign: Add missing field in get_assignments 2016-06-23 15:05:17 +02:00
Marina Glancy
dcd320b5ad MDL-52887 mod_choice: backup allowmultiple option 2016-06-22 13:51:36 +08:00
Andrew Nicols
d1a62a5046 MDL-54663 forum: Correct digest link to forum preferences 2016-06-22 13:11:23 +08:00
Marina Glancy
d74d4f4aab MDL-54953 mod_chat: remove Safari hack
This hack was introduced in MDL-16878 and is not needed in modern Safari versions
but it was reported that it can breaks chat in IE
2016-06-22 12:21:40 +08:00
Eloy Lafuente (stronk7)
0f20bf7507 Merge branch 'wip-mdl-54589-mac' of https://github.com/rajeshtaneja/moodle 2016-06-22 01:42:15 +02:00
Eloy Lafuente (stronk7)
e822312af3 Merge branch 'MDL-54939-master' of git://github.com/danpoltawski/moodle 2016-06-21 20:00:36 +02:00
Juan Leyva
23717c804d MDL-54980 mod_assign: Add WS list_participants to the Mobile service 2016-06-21 15:30:58 +01:00
Andrew Nicols
4a837c7ba0 Merge branch 'MDL-54881' of https://github.com/mr-russ/moodle 2016-06-21 11:31:19 +08:00
Andrew Nicols
62d34a4af2 Merge branch 'MDL-54654-master' of git://github.com/danpoltawski/moodle 2016-06-21 09:58:18 +08:00
Andrew Nicols
da871bb4c1 Merge branch 'wip-MDL-53292-master' of https://github.com/marinaglancy/moodle 2016-06-21 08:46:38 +08:00
Russell Smith
8675453e82 MDL-54881 quiz: Ensure user attempts are deterministic for testing. 2016-06-21 08:31:26 +10:00
Juan Leyva
d889b58747 MDL-54955 webservice: Apply external_format_string in course names 2016-06-20 13:16:52 +01:00
Rajesh Taneja
f55d87c55c MDL-54589 behat: Fixed failures for phantomjs standalone 2016-06-20 16:03:36 +08:00
Rajesh Taneja
fba0ac63b8 MDL-54589 behat: Added hack for some OS/browsers 2016-06-20 16:03:36 +08:00
Adrian Greeve
ccc9777aee MDL-47113 mod_lti: Use of html_writer rather than hard coded HTML. 2016-06-20 14:49:04 +08:00
Ben Kelada
b346737e75 MDL-47113 lti: Add link to open in new window, when popup blocked 2016-06-20 14:39:39 +08:00
Rajesh Taneja
3aaf98f62c MDL-54589 behat: Trigger change event after selecting option
After selecting option, some browsers need
explicit change event
2016-06-20 09:43:08 +08:00
Dan Poltawski
c96f55e6f9 MDL-54939 amd: fix lint issues
Mostly correcting jsdoc, some other line wrapping rules and empty
functions.
2016-06-17 09:03:18 +01:00
Dan Poltawski
926ac16ef3 MDL-54654 mod: fix forum/scorm invalid css 2016-06-16 20:52:04 +01:00
Dan Poltawski
c6eddafcad MDL-54654 mod_data: fix invalid css for image gallery preset 2016-06-16 20:52:04 +01:00
Dan Poltawski
f909e9e5a9 MDL-54654 choice: remove CSS definitions
The 'inherit' for border colour was not valid and so no border was
displayed.

The display:inline does not work with floated elemenets.
2016-06-16 20:52:04 +01:00
Dan Poltawski
48d5c2183a MDL-54654 choice: reformat CSS 2016-06-16 20:52:04 +01:00
Dan Poltawski
f567699fe4 MDL-54654 book: silence csslint warning
(Important is by design for print layout)
2016-06-16 20:52:04 +01:00
Dan Poltawski
4c62bdab0d MDL-54654 assignfeedback_editpdf: remove invalid CSS
The 'left' positioing was invalid and conflicting with the
right definition anyway, so wasn't necessary.
2016-06-16 20:52:04 +01:00
Dan Poltawski
35be582696 MDL-54939 amd: Fix lint issues fixable with eslint --fix 2016-06-16 19:33:00 +01:00
Andrew Nicols
a029e5212d Merge branch 'MDL-53788_modlti_master' of git://github.com/nhoobin/moodle 2016-06-16 09:04:15 +01:00
Andrew Nicols
00f99e270a Merge branch 'MDL-54649-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:14 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Dan Poltawski
4f400df523 Merge branch 'MDL-54036_master' of https://github.com/liorgil/moodle 2016-06-16 09:04:09 +01:00