Commit graph

19008 commits

Author SHA1 Message Date
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
Andrew Nicols
62bc2e84c5 Merge branch 'MDL-54712-master' of git://github.com/junpataleta/moodle 2016-06-16 09:04:08 +01:00
Andrew Nicols
337ee7ffa2 Merge branch 'MDL-54787_master' of https://github.com/snake/moodle 2016-06-16 09:04:07 +01:00
Andrew Nicols
de0298d5fd Merge branch 'MDL-54859_master' of git://github.com/dmonllao/moodle 2016-06-16 09:04:05 +01:00
Eloy Lafuente (stronk7)
392c40467f Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:04 +01:00
Stephen Bourget
77971021ff MDL-54935 Survey: Remove duplicate event trigger 2016-06-15 17:09:17 -04:00
Nicholas Hoobin
99a5377bb7 MDL-53788 mod_lti: fix aggressive course cache rebuilding 2016-06-15 10:42:27 +10:00
Dan Poltawski
d25e8fde45 Merge branch 'MDL-54772-master' of git://github.com/junpataleta/moodle 2016-06-13 09:35:58 +01:00
Dan Poltawski
88b0045106 Merge branch 'MDL-54562_master' of git://github.com/dmonllao/moodle 2016-06-13 09:17:49 +01:00
Marina Glancy
8fef061da4 MDL-53292 core: deprecate callback delete_course 2016-06-13 10:48:06 +08:00
Jun Pataleta
cdbdb2f9b7 MDL-54772 mod_assign: Fixes for PDF editor
* Render the annotations and comments within the drawing canvas, not in
the drawing region.
* Remove edit-related event bindings for stamp annotations.
2016-06-13 09:54:02 +08:00
Stephen Bourget
1e93eb58ce MDL-54656 Behat: Additional tests for advanced search 2016-06-12 20:50:46 -04:00
Jake Dallimore
cd6dfd68d8 MDL-54787 mod_quiz: Fix notification error on regrade 2016-06-10 18:26:30 +08:00
Dan Poltawski
8b766dd1d8 MDL-54890 assignfeedback_editpdf: Fix missing semicolon
Detected by eslint rule 'semi'
2016-06-10 10:06:25 +01:00
Jun Pataleta
93f3988cf7 MDL-54712 mod_lti: Remove markup from LTI admin notification messages 2016-06-10 15:10:45 +08:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible.
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
2016-06-10 08:06:49 +10:00
Stephen Bourget
fb8b18a44d MDL-53111 Lesson: Allow "end reached" criteria to be disabled 2016-06-09 12:18:34 -04:00
David Monllao
dc4c357435 MDL-54859 mod_wiki: Client rules only when fields are visible 2016-06-08 16:44:45 +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
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
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
a7de32a265 Merge branch 'wip-MDL-49852-master' of git://github.com/abgreeve/moodle 2016-06-06 11:59:42 +01:00