Andrew Nicols [Tue, 19 Apr 2016 02:32:56 +0000 (10:32 +0800)]
Merge branch 'MDL-53779-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 19 Apr 2016 02:05:17 +0000 (10:05 +0800)]
Merge branch 'MDL-48506-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Tue, 19 Apr 2016 01:45:30 +0000 (09:45 +0800)]
Merge branch 'MDL-53535_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 18 Apr 2016 23:58:13 +0000 (01:58 +0200)]
Merge branch 'MDL-53796_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 18 Apr 2016 23:44:46 +0000 (01:44 +0200)]
Merge branch 'MDL-53795-master' of git://github.com/merrill-oakland/moodle
Ryan Wyllie [Thu, 14 Apr 2016 07:37:20 +0000 (07:37 +0000)]
MDL-48506 cachestore_memcached: added shared cache config option
When added a memcached instance you can now select whether the cache is
being shared by other applications. The setting will determine the
purging strategy.
Shared caches will have individual keys deleted while dedicated caches
will have the entire cache purged (better performance over networks).
Note: This option only works with the correct version of the php
memcached extension and with the multi-site safe changes.
Sam Hemelryk [Thu, 11 Dec 2014 03:49:58 +0000 (16:49 +1300)]
MDL-48506 cachestore_memcached: added upgrade notice
Sam Hemelryk [Thu, 11 Dec 2014 03:42:21 +0000 (16:42 +1300)]
MDL-48506 cachestore_memcached: is now multi-site safe
David Monllao [Mon, 18 Apr 2016 06:03:32 +0000 (14:03 +0800)]
Merge branch 'MDL-53841-master' of github.com/damyon/moodle
David Monllao [Thu, 24 Mar 2016 10:10:49 +0000 (18:10 +0800)]
MDL-53535 search_solr: Solr version restrictions
Also removing is_server_ready call from execute_query as in production
workflows search is done through \core_search\manager::search and
\core_search\manager::instance already checks is_server_ready. In
testing environment setUp functions should check that the server is
ready before performing other actions.
Ben Kelada [Thu, 31 Mar 2016 03:19:05 +0000 (14:19 +1100)]
MDL-53345 forum: rename itemid
Ben Kelada [Thu, 31 Mar 2016 03:13:37 +0000 (14:13 +1100)]
MDL-53345 forum: Add attachmentareaid to support attachments in api
Ben Kelada [Fri, 4 Mar 2016 02:44:32 +0000 (13:44 +1100)]
MDL-53345 forum: Add item id as parameter to support inline attachments
Damyon Wiese [Sun, 17 Apr 2016 14:33:09 +0000 (22:33 +0800)]
MDL-53841 assign: Fix for assignment listing page.
Was throwing debugging because there is no course module defined on this page.
Eloy Lafuente (stronk7) [Fri, 15 Apr 2016 08:19:04 +0000 (10:19 +0200)]
weekly release 3.1dev
Eloy Lafuente (stronk7) [Fri, 15 Apr 2016 08:19:04 +0000 (10:19 +0200)]
NOBUG: Fixed file access permissions
Eloy Lafuente (stronk7) [Fri, 15 Apr 2016 08:18:59 +0000 (10:18 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Damyon Wiese [Fri, 15 Apr 2016 05:44:16 +0000 (13:44 +0800)]
MDL-52954 assign: Behat fixes because the assign grading ui has changed
Damyon Wiese [Thu, 14 Apr 2016 06:56:00 +0000 (14:56 +0800)]
MDL-53772 externallib: Deprecate external_function_info()
Damyon Wiese [Thu, 14 Apr 2016 06:21:23 +0000 (14:21 +0800)]
MDL-53772 libraries: More context fixes
1. Improve upgrade note
2. Don't abuse $PAGE to get the current course/cm
3. Use validate_context, never $PAGE->set_context()
4. Reset current coursemodule in validate_context().
5. Respect moodlepageclass when calling an external function.
David Monllao [Thu, 14 Apr 2016 06:26:16 +0000 (14:26 +0800)]
Merge branch 'MDL-52954-master-behat-fixes' of git://github.com/damyon/moodle
David Monllao [Thu, 14 Apr 2016 06:01:16 +0000 (14:01 +0800)]
Merge branch 'MDL-53772-master' of git://github.com/damyon/moodle
Conflicts:
lib/upgrade.txt
Marina Glancy [Tue, 12 Apr 2016 04:39:23 +0000 (12:39 +0800)]
MDL-53772 inplace_editable: set context in callbacks
Damyon Wiese [Fri, 8 Apr 2016 05:01:06 +0000 (13:01 +0800)]
MDL-53772 externallib: Fix busted webservices context handling
Fix:
$PAGE->context must be reset when calling validate_context
Improve:
Provide wrapper for calling an external function
The wrapper correctly checks the function parameters and return type against
the description of the external function, and stores the PAGE and COURSE global
state variables, restoring them before the function returns.
Fix: buggy unit tests.
These tests are expecting debugging from a bug that was fixed, and calling web
service functions with no user or session.
Damyon Wiese [Wed, 13 Apr 2016 06:27:23 +0000 (14:27 +0800)]
MDL-52954 assign: Fixes to webservices and context.
This patch gets the behat tests passing again - but only with MDL-53772 in the branch.
Dan Poltawski [Wed, 13 Apr 2016 09:48:59 +0000 (10:48 +0100)]
Revert "Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle"
This reverts commit
61a0465ce76154dbe223649c58c66313e9b510ae, reversing
changes made to
2408f8fe2bf6321592cc1ab5a8db6f9b3c65eb4b.
David Monllao [Wed, 13 Apr 2016 04:41:04 +0000 (12:41 +0800)]
Merge branch 'wip-MDL-53443-fix' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 13 Apr 2016 04:00:14 +0000 (12:00 +0800)]
MDL-53443 mod_feedback: fix SQL statment to work on all DB
David Monllao [Wed, 13 Apr 2016 02:34:03 +0000 (10:34 +0800)]
MDL-53796 behat: Move get_debug_text to base class
David Monllao [Wed, 13 Apr 2016 01:51:35 +0000 (09:51 +0800)]
Merge branch 'wip-MDL-16855-master' of https://github.com/marinaglancy/moodle
Eric Merrill [Wed, 13 Apr 2016 01:44:15 +0000 (21:44 -0400)]
MDL-53795 logging: Add DB index for use when backing up logs
David Monllao [Wed, 13 Apr 2016 01:38:12 +0000 (09:38 +0800)]
Merge branch 'wip-MDL-45064-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 13 Apr 2016 01:26:46 +0000 (03:26 +0200)]
Merge branch 'wip-MDL-53443-master' of https://github.com/marinaglancy/moodle
Marina Glancy [Fri, 11 Mar 2016 14:42:41 +0000 (22:42 +0800)]
MDL-53443 mod_feedback: templates code clean up and behat tests
Marina Glancy [Mon, 4 Apr 2016 00:58:12 +0000 (08:58 +0800)]
MDL-45064 mod_lti: use callback get_shortcuts()
deprecate callback for ltisource plugins get_types(), instead introduce
get_shortcuts()
Marina Glancy [Mon, 4 Apr 2016 00:57:09 +0000 (08:57 +0800)]
MDL-45064 course: mod callback get_shortcuts()
also deprecate callback get_types()
John Okely [Fri, 22 Jan 2016 08:35:15 +0000 (08:35 +0000)]
MDL-45064 lti: LTI types in activity chooser
Marina Glancy [Tue, 12 Apr 2016 23:46:44 +0000 (07:46 +0800)]
MDL-52707 tags: fix SQL query to work on all DBs
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
AMOS bot [Tue, 12 Apr 2016 16:04:10 +0000 (00:04 +0800)]
Automatically generated installer lang files
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
Frederic Massart [Tue, 12 Apr 2016 08:55:21 +0000 (16:55 +0800)]
MDL-53779 external: get_string and get_strings use PARAM_RAW
For the string parameters and translated strings.
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
AMOS bot [Mon, 11 Apr 2016 16:04:19 +0000 (00:04 +0800)]
Automatically generated installer lang files
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 [Thu, 17 Mar 2016 02:55:48 +0000 (10:55 +0800)]
MDL-16855 tags: allow to filter tags on management page
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
