Commit graph

78488 commits

Author SHA1 Message Date
Marina Glancy
df003a85f0 MDL-53443 mod_feedback: templates code clean up and behat tests 2016-04-13 09:21:33 +08:00
Marina Glancy
2348c13732 MDL-45064 mod_lti: use callback get_shortcuts()
deprecate callback for ltisource plugins get_types(), instead introduce
get_shortcuts()
2016-04-13 08:30:05 +08:00
Marina Glancy
9ca0420e93 MDL-45064 course: mod callback get_shortcuts()
also deprecate callback get_types()
2016-04-13 08:30:04 +08:00
John Okely
01e8bfd745 MDL-45064 lti: LTI types in activity chooser 2016-04-13 08:30:04 +08:00
Marina Glancy
92c90b96ce MDL-25742 mod_wiki: show wiki pages tagged with a tag 2016-04-13 07:57:58 +08:00
Marina Glancy
f40b444ef8 MDL-52707 tags: fix SQL query to work on all DBs 2016-04-13 07:46:44 +08:00
Eloy Lafuente (stronk7)
aca13ea2b6 Merge branch 'MDL-53642-master' of git://github.com/merrill-oakland/moodle 2016-04-12 22:39:26 +02:00
Eloy Lafuente (stronk7)
11c673f3a3 Merge branch 'MDL-53167-master' of git://github.com/merrill-oakland/moodle 2016-04-12 21:34:41 +02:00
AMOS bot
6526005fcf Automatically generated installer lang files 2016-04-13 00:04:10 +08:00
Dan Poltawski
d350414813 Merge branch 'MDL-52263-master' of git://github.com/crazyserver/moodle 2016-04-12 16:50:29 +01:00
Dan Poltawski
61a0465ce7 Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle 2016-04-12 14:13:36 +01:00
Pau Ferrer Ocaña
b1a9804a9b MDL-52263 libraries: Add test cases to external_format_text options 2016-04-12 15:05:46 +02:00
Pau Ferrer Ocaña
19a131edff MDL-52263 libraries: Add options to external_format_text 2016-04-12 14:39:23 +02:00
Frederic Massart
bf6239eddb MDL-53779 external: get_string and get_strings use PARAM_RAW
For the string parameters and translated strings.
2016-04-12 17:04:19 +08:00
Damyon Wiese
2408f8fe2b MDL-52954 assign: Fix CSS lint issues 2016-04-12 08:19:31 +01:00
spvickers
82f5226576 MDL-49754 mod_lti: Fixes to JSON format
@id elements in JSON corrected to match the IMS spec.  Version number of
the service updated.
2016-04-12 15:08:28 +08:00
David Monllao
212153767a Merge branch 'wip-MDL-52707-master' of https://github.com/marinaglancy/moodle 2016-04-12 14:34:11 +08:00
Adrian Greeve
cfd1bcfa03 MDL-52642 blog: Fix notices for swapping contexts in activities. 2016-04-12 11:53:34 +08:00
David Monllao
45c49f3218 Merge branch 'MDL-53007_master' of https://github.com/marxjohnson/moodle 2016-04-12 11:31:17 +08:00
David Monllao
b79b53d452 Merge branch 'MDL-53770-master' of git://github.com/marinaglancy/moodle 2016-04-12 10:54:03 +08:00
Stephen Bourget
2ed2e692a6 MDL-52642 block_blog_menu: behat test 2016-04-12 10:45:33 +08:00
David Monllao
87c221a7a9 Merge branch 'MDL-53703-master' of git://github.com/dpalou/moodle 2016-04-12 10:06:30 +08:00
Eric Merrill
935ee1c6c6 MDL-53167 search: Adding unit tests for external API change 2016-04-11 21:24:18 -04:00
Henning Bostelmann
64ccb37d49 MDL-53780 mod_assign: Remove teachers from submission group members 2016-04-11 19:45:26 +01:00
AMOS bot
f82ad999cb Automatically generated installer lang files 2016-04-12 00:04:19 +08:00
Dan Poltawski
1dd254bbf1 Merge branch 'MDL-53417-master' of git://github.com/cameron1729/moodle 2016-04-11 16:36:50 +01:00
Dan Poltawski
4a39dd3071 Merge branch 'wip-MDL-53363-master' of https://github.com/marinaglancy/moodle 2016-04-11 16:34:26 +01:00
Dan Poltawski
d5327021e0 Merge branch 'MDL-53440-master' of git://github.com/cameron1729/moodle 2016-04-11 15:28:37 +01:00
Dan Poltawski
c62fa3c0b9 Merge branch 'MDL-53613-master' of git://github.com/merrill-oakland/moodle 2016-04-11 15:14:59 +01:00
Dan Poltawski
6ff935c206 Merge branch 'MDL-53674-master-eventmsg' of git://github.com/mudrd8mz/moodle 2016-04-11 14:29:14 +01:00
Dan Poltawski
35b3f50ee2 Merge branch 'MDL-53728' of git://github.com/timhunt/moodle 2016-04-11 14:02:29 +01:00
Dan Poltawski
5ce14ec291 Merge branch 'MDL-52338' of https://github.com/dg711/moodle 2016-04-11 13:53:18 +01:00
Dani Palou
7ef81de827 MDL-53703 wiki: Add tests for mod_wiki_get_subwiki_files 2016-04-11 11:13:02 +02:00
Dani Palou
62e20cfed6 MDL-53703 wiki: New WS mod_wiki_get_subwiki_files 2016-04-11 11:13:01 +02:00
Dan Poltawski
a8b33e8e10 MDL-52954 mod_assign: fix trailing whitespace 2016-04-11 10:07:17 +01:00
Dan Poltawski
728da02780 MDL-52954 editpdf: fix phpdoc 2016-04-11 09:55:38 +01:00
Dan Poltawski
5702a8289b Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle 2016-04-11 09:52:40 +01:00
Dani Palou
31bfb00809 MDL-53709 wiki: Return content size if includecontent=0 2016-04-11 09:00:53 +02:00
David Monllao
9bfb76c40d Merge branch 'MDL-52942-master' of git://github.com/andrewnicols/moodle 2016-04-11 14:24:27 +08:00
David Monllao
468ef66775 Merge branch 'MDL-52385-master' of git://github.com/andrewnicols/moodle 2016-04-11 13:54:23 +08:00
Marina Glancy
4218ad9371 MDL-53363 tags: helper to search for tagged items; search course modules 2016-04-11 13:22:47 +08:00
Andrew Nicols
c0e3c8ae0d MDL-52942 forum: Allow posting to multiple groups in eachuser forums 2016-04-11 12:23:47 +08:00
Devang Gaur
f58c96f6b0 MDL-52338 blocks: message link should not appear when set false 2016-04-11 08:28:31 +05:30
David Monllao
2a84fae088 MDL-53709 mod_wiki: Update includecontent description 2016-04-11 10:13:39 +08:00
David Monllao
67fc5bcb75 Merge branch 'MDL-53709-master' of git://github.com/dpalou/moodle 2016-04-11 10:12:02 +08:00
Marina Glancy
1e34257ec2 MDL-16855 tags: allow to filter tags on management page 2016-04-11 10:04:17 +08:00
Marina Glancy
0d2027896d MDL-52707 core_tag: allow to combine tags 2016-04-11 09:49:56 +08:00
Marina Glancy
a0dbba8308 MDL-53770 mod_lti: allow to uninstall ltisource plugins 2016-04-11 09:03:49 +08:00
liorgi
73dcd8282a MDL-53702 mod_forum: Remove unused variables 2016-04-10 08:51:57 +03:00
David Mudrák
db1d5b104b MDL-53674 event monitor: Do not send HTML as plain text formatted emails
There were two problems here.

* The $msgdata->fullmessage was always formatted as HTML even if the
  $msgdata->fullmessageformat was set to the original template's format.
* The plain text part of the emailed message contained HTML code.

The patch makes sure that the original template is always formatted into
HTML and then converted to plain text before setting the text/plain
multipart of the sent email.
2016-04-08 15:14:23 +02:00