Marina Glancy [Mon, 7 Mar 2016 13:29:33 +0000 (21:29 +0800)]
MDL-25742 mod_wiki: show wiki pages tagged with a tag
Eloy Lafuente (stronk7) [Tue, 12 Apr 2016 20:39:26 +0000 (22:39 +0200)]
Merge branch 'MDL-53642-master' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 12 Apr 2016 19:34:41 +0000 (21:34 +0200)]
Merge branch 'MDL-53167-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Tue, 12 Apr 2016 15:50:29 +0000 (16:50 +0100)]
Merge branch 'MDL-52263-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Tue, 12 Apr 2016 13:13:36 +0000 (14:13 +0100)]
Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle
Pau Ferrer Ocaña [Tue, 12 Apr 2016 12:36:07 +0000 (14:36 +0200)]
MDL-52263 libraries: Add test cases to external_format_text options
Pau Ferrer Ocaña [Wed, 30 Mar 2016 16:45:27 +0000 (18:45 +0200)]
MDL-52263 libraries: Add options to external_format_text
Damyon Wiese [Tue, 12 Apr 2016 05:18:50 +0000 (13:18 +0800)]
MDL-52954 assign: Fix CSS lint issues
David Monllao [Tue, 12 Apr 2016 06:34:11 +0000 (14:34 +0800)]
Merge branch 'wip-MDL-52707-master' of https://github.com/marinaglancy/moodle
David Monllao [Tue, 12 Apr 2016 03:31:17 +0000 (11:31 +0800)]
Merge branch 'MDL-53007_master' of https://github.com/marxjohnson/moodle
David Monllao [Tue, 12 Apr 2016 02:54:03 +0000 (10:54 +0800)]
Merge branch 'MDL-53770-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 12 Apr 2016 02:06:30 +0000 (10:06 +0800)]
Merge branch 'MDL-53703-master' of git://github.com/dpalou/moodle
Eric Merrill [Tue, 12 Apr 2016 01:24:18 +0000 (21:24 -0400)]
MDL-53167 search: Adding unit tests for external API change
Dan Poltawski [Mon, 11 Apr 2016 15:36:50 +0000 (16:36 +0100)]
Merge branch 'MDL-53417-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Mon, 11 Apr 2016 15:34:26 +0000 (16:34 +0100)]
Merge branch 'wip-MDL-53363-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 11 Apr 2016 14:28:37 +0000 (15:28 +0100)]
Merge branch 'MDL-53440-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Mon, 11 Apr 2016 14:14:59 +0000 (15:14 +0100)]
Merge branch 'MDL-53613-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 11 Apr 2016 13:29:14 +0000 (14:29 +0100)]
Merge branch 'MDL-53674-master-eventmsg' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 11 Apr 2016 13:02:29 +0000 (14:02 +0100)]
Merge branch 'MDL-53728' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 11 Apr 2016 12:53:18 +0000 (13:53 +0100)]
Merge branch 'MDL-52338' of https://github.com/dg711/moodle
Dani Palou [Tue, 5 Apr 2016 06:59:43 +0000 (08:59 +0200)]
MDL-53703 wiki: Add tests for mod_wiki_get_subwiki_files
Dani Palou [Mon, 4 Apr 2016 13:57:05 +0000 (15:57 +0200)]
MDL-53703 wiki: New WS mod_wiki_get_subwiki_files
Dan Poltawski [Mon, 11 Apr 2016 09:07:17 +0000 (10:07 +0100)]
MDL-52954 mod_assign: fix trailing whitespace
Dan Poltawski [Mon, 11 Apr 2016 08:55:38 +0000 (09:55 +0100)]
MDL-52954 editpdf: fix phpdoc
Dan Poltawski [Mon, 11 Apr 2016 08:52:40 +0000 (09:52 +0100)]
Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle
Dani Palou [Tue, 5 Apr 2016 09:50:04 +0000 (11:50 +0200)]
MDL-53709 wiki: Return content size if includecontent=0
David Monllao [Mon, 11 Apr 2016 06:24:27 +0000 (14:24 +0800)]
Merge branch 'MDL-52942-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 11 Apr 2016 05:54:23 +0000 (13:54 +0800)]
Merge branch 'MDL-52385-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Tue, 8 Mar 2016 07:51:56 +0000 (15:51 +0800)]
MDL-53363 tags: helper to search for tagged items; search course modules
Andrew Nicols [Fri, 12 Feb 2016 00:56:06 +0000 (08:56 +0800)]
MDL-52942 forum: Allow posting to multiple groups in eachuser forums
Devang Gaur [Mon, 4 Apr 2016 16:12:23 +0000 (21:42 +0530)]
MDL-52338 blocks: message link should not appear when set false
David Monllao [Mon, 11 Apr 2016 02:13:39 +0000 (10:13 +0800)]
MDL-53709 mod_wiki: Update includecontent description
David Monllao [Mon, 11 Apr 2016 02:12:02 +0000 (10:12 +0800)]
Merge branch 'MDL-53709-master' of git://github.com/dpalou/moodle
Marina Glancy [Sun, 10 Jan 2016 14:32:02 +0000 (22:32 +0800)]
MDL-52707 core_tag: allow to combine tags
Marina Glancy [Mon, 11 Apr 2016 01:03:49 +0000 (09:03 +0800)]
MDL-53770 mod_lti: allow to uninstall ltisource plugins
David Mudrák [Thu, 31 Mar 2016 13:42:06 +0000 (15:42 +0200)]
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.
Cameron Ball [Fri, 8 Apr 2016 04:22:14 +0000 (12:22 +0800)]
MDL-52944 atto: Use event-key to handle enter key
Panagiotis Nikoloutsopoulos [Mon, 14 Mar 2016 02:48:23 +0000 (02:48 +0000)]
MDL-52944 atto: Contenteditable command 'FormatBlock' set to 'p'
Eric Merrill [Tue, 5 Apr 2016 02:21:29 +0000 (22:21 -0400)]
MDL-53613 search: Add collaborative wiki pages to global search
Eric Merrill [Thu, 7 Apr 2016 18:47:47 +0000 (14:47 -0400)]
MDL-53642 search: Allow selection of multiple areas to filter
Eric Merrill [Thu, 7 Apr 2016 18:41:59 +0000 (14:41 -0400)]
MDL-53167 search: Add ability to limit courses searched
Mark Johnson [Tue, 29 Mar 2016 10:43:26 +0000 (11:43 +0100)]
MDL-53007 block_navigation: Set width of item text to prevent overflow
Dan Poltawski [Thu, 7 Apr 2016 08:43:39 +0000 (09:43 +0100)]
weekly release 3.1dev
Juan Leyva [Wed, 6 Apr 2016 10:49:29 +0000 (12:49 +0200)]
MDL-53000 mod_assign: Unit tests for get_file_areas
Dani Palou [Tue, 5 Apr 2016 09:50:04 +0000 (11:50 +0200)]
MDL-53709 wiki: Return content size if includecontent=0
Andrew Nicols [Thu, 7 Apr 2016 06:00:25 +0000 (14:00 +0800)]
weekly release 3.1dev
Andrew Nicols [Thu, 7 Apr 2016 06:00:21 +0000 (14:00 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 7 Apr 2016 04:10:57 +0000 (12:10 +0800)]
Merge branch 'MDL-53577-fix' of https://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 7 Apr 2016 04:10:26 +0000 (12:10 +0800)]
MDL-53577 JS: get_string requires component
Daniel Neis Araujo [Tue, 5 Apr 2016 20:52:19 +0000 (17:52 -0300)]
MDL-52385 tasks: Queue ad-hoc tasks in future
Abhijit A.M [Wed, 6 Apr 2016 10:34:13 +0000 (16:04 +0530)]
MDL-53440 course: Better interface for approving multiple courses
Added another target 'pending' in course/edit.php for redirection
This will help administrator/managers approve multiple courses
one after another
Andrew Nicols [Thu, 7 Apr 2016 01:40:40 +0000 (09:40 +0800)]
Merge branch 'MDL-53579-intfix' of https://github.com/merrill-oakland/moodle
Andrew Nicols [Thu, 7 Apr 2016 01:38:52 +0000 (09:38 +0800)]
Merge branch 'wip-mdl-52502-fix' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 7 Apr 2016 01:29:50 +0000 (09:29 +0800)]
MDL-52502 behat: Flush buffer to show differences
Eric Merrill [Thu, 7 Apr 2016 01:26:55 +0000 (21:26 -0400)]
MDL-53579 search: Improve solr engine field name
Eric Merrill [Wed, 6 Apr 2016 18:09:35 +0000 (14:09 -0400)]
MDL-53579 search: Fix conflict with eDisMax parser and indexed files
AMOS bot [Wed, 6 Apr 2016 16:04:42 +0000 (00:04 +0800)]
Automatically generated installer lang files
Tim Hunt [Wed, 6 Apr 2016 14:31:35 +0000 (15:31 +0100)]
MDL-53728 question import/export: improve form structure
Dan Poltawski [Wed, 6 Apr 2016 07:42:27 +0000 (08:42 +0100)]
Merge branch 'wip-mdl-53571' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 24 Mar 2016 05:01:26 +0000 (13:01 +0800)]
MDL-53571 behat: Use Escaper for escaping
xpathLiteral has been depreacted, use Escaper instead
Andrew Nicols [Wed, 6 Apr 2016 03:53:41 +0000 (11:53 +0800)]
Merge branch 'wip-mdl-53381' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Fri, 1 Apr 2016 02:31:21 +0000 (10:31 +0800)]
MDL-53381 behat: Pointing to 3.31.1 release tag.
Rajesh Taneja [Fri, 18 Mar 2016 04:12:42 +0000 (12:12 +0800)]
MDL-53381 behat: Replaced chained steps with api.
Behat 3.x doesn't support chained steps and hence
this is first step to get rid of chained steps in core.
Eloy Lafuente (stronk7) [Wed, 6 Apr 2016 02:35:50 +0000 (04:35 +0200)]
Merge branch 'wip-MDL-43470-master2' of https://github.com/marinaglancy/moodle
Marina Glancy [Wed, 6 Apr 2016 02:22:01 +0000 (10:22 +0800)]
MDL-43470 mod_feedback: remove mapping form autosave
Marina Glancy [Thu, 3 Mar 2016 09:56:11 +0000 (17:56 +0800)]
MDL-43470 mod_feedback: select courses for mapping
- use course autocomplete element to map courses
- add a tab and navigation node
- clean up some html
- cover course mapping with behat tests
Eloy Lafuente (stronk7) [Wed, 6 Apr 2016 01:32:57 +0000 (03:32 +0200)]
Merge branch 'MDL-53115-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 6 Apr 2016 00:56:07 +0000 (08:56 +0800)]
MDL-53461 assign: Unit test regex fix
Andrew Nicols [Wed, 6 Apr 2016 00:47:12 +0000 (08:47 +0800)]
Merge branch 'MDL-53461-master' of git://github.com/crazyserver/moodle
Eloy Lafuente (stronk7) [Tue, 5 Apr 2016 22:16:08 +0000 (00:16 +0200)]
MDL-52502 behat: clean 2 uses of deleted method
Eloy Lafuente (stronk7) [Tue, 5 Apr 2016 22:12:00 +0000 (00:12 +0200)]
Merge branch 'wip-mdl-52502' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 5 Apr 2016 21:57:21 +0000 (23:57 +0200)]
Merge branch 'MDL-53671-master' of git://github.com/dpalou/moodle
Eloy Lafuente (stronk7) [Tue, 5 Apr 2016 20:02:02 +0000 (22:02 +0200)]
Merge branch 'MDL-53669_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 5 Apr 2016 19:59:23 +0000 (21:59 +0200)]
Merge branch 'MDL-53647' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 5 Apr 2016 15:25:05 +0000 (16:25 +0100)]
Merge branch 'MDL-53612-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Tue, 5 Apr 2016 15:23:24 +0000 (16:23 +0100)]
Merge branch 'MDL-50050-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 5 Apr 2016 13:46:20 +0000 (14:46 +0100)]
MDL-53449 mod_feedback: reponses page clean up and behat
Dan Poltawski [Tue, 5 Apr 2016 13:27:25 +0000 (14:27 +0100)]
Merge branch 'MDL-53104-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 5 Apr 2016 11:23:50 +0000 (12:23 +0100)]
MDL-53175 upgrade.txt: fix trailing whitespace
Dan Poltawski [Tue, 5 Apr 2016 09:47:19 +0000 (10:47 +0100)]
Merge branch 'MDL-53175-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 5 Apr 2016 08:40:41 +0000 (09:40 +0100)]
Merge branch 'MDL-53633-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 5 Apr 2016 08:38:00 +0000 (09:38 +0100)]
Merge branch 'MDL-53577_master' of https://github.com/jinhofer/moodle
Pau Ferrer Ocaña [Mon, 14 Mar 2016 11:59:14 +0000 (12:59 +0100)]
MDL-53461 assign: Fix intro images to be shown in the mobile app
Dan Poltawski [Tue, 5 Apr 2016 07:28:48 +0000 (08:28 +0100)]
Merge branch 'MDL-53595' of git://github.com/stronk7/moodle
Andrew Nicols [Tue, 5 Apr 2016 06:58:57 +0000 (14:58 +0800)]
MDL-53056 JS: Whitespace fix
Andrew Nicols [Tue, 5 Apr 2016 06:57:26 +0000 (14:57 +0800)]
Merge branch 'MDL-53056-master' of git://github.com/damyon/moodle
Andrew Nicols [Tue, 5 Apr 2016 04:54:58 +0000 (12:54 +0800)]
Merge branch 'MDL-53462-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 5 Apr 2016 04:22:42 +0000 (12:22 +0800)]
Merge branch 'MDL-53500-master' of git://github.com/cameron1729/moodle
Rajesh Taneja [Tue, 29 Mar 2016 05:21:43 +0000 (13:21 +0800)]
MDL-52502 behat: Ensure php web and cli version is same
Rajesh Taneja [Tue, 15 Dec 2015 13:45:32 +0000 (21:45 +0800)]
MDL-52502 phpunit: Add php, db and os deatils
Andrew Nicols [Tue, 5 Apr 2016 03:20:45 +0000 (11:20 +0800)]
Merge branch 'MDL-53579-master' of git://github.com/merrill-oakland/moodle
Andrew Nicols [Tue, 5 Apr 2016 02:22:01 +0000 (10:22 +0800)]
MDL-53588 mod_feedback: Behat scenario verb change
Andrew Nicols [Tue, 5 Apr 2016 01:36:16 +0000 (09:36 +0800)]
Merge branch 'wip-MDL-53588-master' of https://github.com/marinaglancy/moodle
Ben Tindell [Mon, 4 May 2015 17:29:32 +0000 (12:29 -0500)]
MDL-53577 repository: Added maxbytes error message
Changing the error message that is displayed to users when they
upload a file that is greater than the maximum upload size. Does not
include all upload cases; focuses on those most used by students.
Eric Merrill [Mon, 4 Apr 2016 19:14:22 +0000 (15:14 -0400)]
MDL-53612 search: Add book chapter search area
Eloy Lafuente (stronk7) [Wed, 23 Mar 2016 17:19:36 +0000 (18:19 +0100)]
MDL-53595 install: update the list of stale files for 3.1
Note I've deleted a couple of files there, 99.99% not problematic
(repository/boxnet) because as a general rule it's better to avoid
adding plugin files in the function and, instead, use core ones that
cannot be "reinstalled". Exception to the rule (what's a rule without
an exception) being forum that cannot be deleted. ;-)
Eloy Lafuente (stronk7) [Mon, 4 Apr 2016 17:02:44 +0000 (19:02 +0200)]
Merge branch 'MDL-53256-m' of https://github.com/micaherne/moodle
Dan Poltawski [Mon, 4 Apr 2016 15:59:46 +0000 (16:59 +0100)]
Merge branch 'MDL-53641' of git://github.com/stronk7/moodle
Eric Merrill [Mon, 4 Apr 2016 14:33:32 +0000 (10:33 -0400)]
MDL-53272: Fix calls to missing cache def
Dan Poltawski [Mon, 4 Apr 2016 11:10:17 +0000 (12:10 +0100)]
Merge branch 'wip-MDL-49861-master' of git://github.com/abgreeve/moodle
