Dan Poltawski [Fri, 16 Oct 2015 14:22:37 +0000 (15:22 +0100)]
MDL-49329 fixtures: remove trailing whitespace
Dan Poltawski [Fri, 16 Oct 2015 13:53:26 +0000 (14:53 +0100)]
Merge branch 'MDL-49329-master-multiplug' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Fri, 16 Oct 2015 10:51:49 +0000 (12:51 +0200)]
on-demand release 3.0dev+
Andrew Nicols [Fri, 16 Oct 2015 04:01:31 +0000 (12:01 +0800)]
MDL-50647 profile: Styling fix
Andrew Nicols [Fri, 16 Oct 2015 03:48:04 +0000 (11:48 +0800)]
Merge branch 'MDL-49984-master' of git://github.com/barbararamiro/moodle
Andrew Nicols [Fri, 16 Oct 2015 03:28:06 +0000 (11:28 +0800)]
MDL-50647 groups: Documentation fix
Andrew Nicols [Fri, 16 Oct 2015 03:16:36 +0000 (11:16 +0800)]
Merge branch 'wip-mdl-50647' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Fri, 16 Oct 2015 03:10:38 +0000 (11:10 +0800)]
MDL-51629 mod_survey: Coding style violation fix
rajesh Taneja [Fri, 16 Oct 2015 03:01:39 +0000 (11:01 +0800)]
MDL-50647 behat: Expanded behat to not use example
Reason for not using scenario example is:
1. Lot of options, hence hard to read and match
2. Example will run whole scenario (created db for each row),
Which is not needed.
Andrew Nicols [Fri, 16 Oct 2015 02:56:19 +0000 (10:56 +0800)]
Merge branch 'MDL-51629-master' of git://github.com/jleyva/moodle
Andrew Nicols [Fri, 16 Oct 2015 01:35:23 +0000 (09:35 +0800)]
Merge branch 'MDL-51565-master' of git://github.com/jleyva/moodle
Andrew Nicols [Fri, 16 Oct 2015 01:21:45 +0000 (09:21 +0800)]
Merge branch 'MDL-51651-master' of git://github.com/danpoltawski/moodle
Davo Smith [Fri, 19 Jun 2015 11:01:08 +0000 (12:01 +0100)]
MDL-50647 group: add 'not in group' section to groups overview
Also adds 'No group' and 'No grouping' filters to the top of the page
Andrew Nicols [Fri, 16 Oct 2015 00:07:04 +0000 (08:07 +0800)]
Merge branch 'MDL-50182' of git://github.com/stronk7/moodle
Juan Leyva [Thu, 1 Oct 2015 15:50:39 +0000 (17:50 +0200)]
MDL-51629 mod_survey: New WS mod_survey_submit_answers
Juan Leyva [Thu, 1 Oct 2015 12:00:51 +0000 (14:00 +0200)]
MDL-51629 mod_survey: New WS mod_survey_get_questions
Juan Leyva [Thu, 1 Oct 2015 10:21:50 +0000 (12:21 +0200)]
MDL-51629 mod_survey: New Web Service mod_survey_view_survey
Juan Leyva [Thu, 1 Oct 2015 10:01:47 +0000 (12:01 +0200)]
MDL-51629 mod_survey: New WS mod_survey_get_surveys_by_courses
Juan Leyva [Fri, 9 Oct 2015 14:26:59 +0000 (16:26 +0200)]
MDL-51703 mod_survey: Trigger response_submitted event in correct place
Dan Poltawski [Thu, 15 Oct 2015 12:52:46 +0000 (13:52 +0100)]
Merge branch 'MDL-51500-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Thu, 15 Oct 2015 12:50:10 +0000 (13:50 +0100)]
Merge branch 'MDL-51563-master' of git://github.com/jleyva/moodle
Dan Poltawski [Thu, 15 Oct 2015 12:45:10 +0000 (13:45 +0100)]
Merge branch 'MDL-51652-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Thu, 15 Oct 2015 10:41:26 +0000 (11:41 +0100)]
Merge branch 'MDL-51679-groupmode-ajax' of https://github.com/Dagefoerde/moodle
Dan Poltawski [Thu, 15 Oct 2015 10:08:26 +0000 (11:08 +0100)]
Merge branch 'MDL-51781_master' of git://github.com/markn86/moodle
Dan Poltawski [Thu, 15 Oct 2015 09:03:59 +0000 (10:03 +0100)]
MDL-51651 lang: add consitency for application of firstdayofweek
1) Set the site-wide default based on language pack
2) Use the site/user preference for js popups, like we do in /calendar/
Dan Poltawski [Thu, 8 Oct 2015 14:08:00 +0000 (15:08 +0100)]
MDL-51651 lang: the first day of the week is Monday
Mark Nelson [Wed, 14 Oct 2015 22:54:12 +0000 (15:54 -0700)]
MDL-51781 tool_log: marked log values as NOT_MAPPED if mapping not found
David Monllao [Thu, 15 Oct 2015 08:21:07 +0000 (16:21 +0800)]
Merge branch 'wip-MDL-51604-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Thu, 15 Oct 2015 08:04:55 +0000 (16:04 +0800)]
Merge branch 'MDL-51790-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 15 Oct 2015 07:58:23 +0000 (08:58 +0100)]
Merge branch 'wip-mdl-50940' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 15 Oct 2015 07:22:37 +0000 (15:22 +0800)]
Merge branch 'MDL-51756-master' of git://github.com/damyon/moodle
Andrew Nicols [Thu, 15 Oct 2015 06:40:49 +0000 (14:40 +0800)]
MDL-51756 tests: Refactor test to use data-provider
The benefit is that this becomes one test per external function instead of one
test testing them all - so more information is shown on failure and we get lots
more dots (we love dots!).
Damyon Wiese [Thu, 15 Oct 2015 07:08:51 +0000 (15:08 +0800)]
MDL-51790 block_community: xmlrpc expects correct types
This is defined as an int on the hub site, so it must be sent as an int.
Andrew Nicols [Thu, 15 Oct 2015 06:19:10 +0000 (14:19 +0800)]
Merge branch 'MDL-51594-master' of git://github.com/jleyva/moodle
Damyon Wiese [Wed, 14 Oct 2015 04:03:38 +0000 (12:03 +0800)]
MDL-51756 externallib: Show debugging when optional params are wrong
Optional params are not allowed as the top level value for external_function_parameters.
This is because stricter protocols (xmlrpc and soap) cannot handle optional parameters, only
optional properties in a structure.
Barbara Ramiro [Tue, 13 Oct 2015 13:32:35 +0000 (21:32 +0800)]
MDL-49984 Profile: Decluttering, grouping and adding white space to easily find info
Marina Glancy [Sat, 29 Aug 2015 07:17:05 +0000 (15:17 +0800)]
MDL-51260 core_tag: Use new tag autocomplete for related tags
Damyon Wiese [Mon, 31 Aug 2015 09:29:28 +0000 (17:29 +0800)]
MDL-51260 tags: Update the tags form element to use the autocomplete field
AMOS BEGIN
REM [interestslist_help,moodle] Commas are no longer required
REM [entertags,tag] Commas are no longer required
REM [othertags,tag] Commas are no longer required
AMOS END
David Monllao [Thu, 15 Oct 2015 03:54:53 +0000 (11:54 +0800)]
Merge branch 'MDL-49545-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Thu, 15 Oct 2015 02:23:50 +0000 (02:23 +0000)]
MDL-49545 backup: Restore does not respect some capabilities
Thanks to Daniel Neis for the original patch that formed the
basis of these changes.
Andrew Nicols [Thu, 15 Oct 2015 02:22:18 +0000 (10:22 +0800)]
Merge branch 'MDL-51610-master' of git://github.com/merrill-oakland/moodle
Damyon Wiese [Fri, 18 Sep 2015 02:48:19 +0000 (10:48 +0800)]
MDL-51247 forms: All new aria-pimped autocomplete mform element.
Supports static list of options - or options fetched via ajax.
Has options for single,multi and tags support.
Dan Poltawski [Wed, 14 Oct 2015 14:02:50 +0000 (15:02 +0100)]
Merge branch 'MDL-51399' of https://github.com/andrewhancox/moodle
Dan Poltawski [Wed, 14 Oct 2015 13:15:14 +0000 (14:15 +0100)]
Merge branch 'MDL-38214_wipd' of git://github.com/ppichet/moodle
Dan Poltawski [Wed, 14 Oct 2015 12:40:19 +0000 (13:40 +0100)]
Merge branch 'MDL-51467-master' of https://github.com/sammarshallou/moodle
Jan C. Dageförde [Wed, 7 Oct 2015 05:48:00 +0000 (07:48 +0200)]
MDL-51679 course: Update groupmode CSS class
Changing groupmode of an activity via AJAX did not change the button's CSS class accordingly.
Juan Leyva [Wed, 14 Oct 2015 12:29:12 +0000 (14:29 +0200)]
MDL-51594 webservice: Fix typos in choice and SCORM documentation
Dan Poltawski [Wed, 14 Oct 2015 09:49:01 +0000 (10:49 +0100)]
weekly release 3.0dev
Dan Poltawski [Wed, 14 Oct 2015 09:49:01 +0000 (10:49 +0100)]
NOBUG: Fixed file access permissions
Dan Poltawski [Wed, 14 Oct 2015 09:49:00 +0000 (10:49 +0100)]
NOBUG: Fixed SVG browser compatibility
Dan Poltawski [Tue, 13 Oct 2015 18:01:42 +0000 (19:01 +0100)]
MDL-51536 webservices: fix invalid param definitions
Dan Poltawski [Tue, 13 Oct 2015 14:44:31 +0000 (15:44 +0100)]
Merge branch 'MDL-40710-master' of git://github.com/barbararamiro/moodle
Dan Poltawski [Tue, 13 Oct 2015 10:39:52 +0000 (11:39 +0100)]
Merge branch 'MDL-51435' of https://github.com/NeillM/moodle
Dan Poltawski [Tue, 13 Oct 2015 08:53:38 +0000 (09:53 +0100)]
MDL-47494 copyright: missed fixes from last commit
With thanks to Tim!
Dan Poltawski [Tue, 13 Oct 2015 08:36:20 +0000 (09:36 +0100)]
MDL-47494 copyright: fix incorrect statement
(From copy/paste error, blame Tim :P)
Dan Poltawski [Tue, 13 Oct 2015 08:23:31 +0000 (09:23 +0100)]
Merge branch 'MDL-51576-master-2' of git://github.com/ryanwyllie/moodle
Damyon Wiese [Tue, 13 Oct 2015 06:24:08 +0000 (14:24 +0800)]
MDL-48861 assign: Make the requires grading filter consistent
Consistently include submissions with a null grade (see MDL-47694).
Damyon Wiese [Tue, 13 Oct 2015 04:57:10 +0000 (12:57 +0800)]
MDL-48861 assign: Fix unit tests and behat tests
The tests were not working with the change to the needs grading filter.
David Monllao [Tue, 13 Oct 2015 03:42:40 +0000 (11:42 +0800)]
Merge branch 'MDL-46455-master-
20151012' of git://github.com/damyon/moodle
Andrew Nicols [Tue, 13 Oct 2015 03:33:23 +0000 (11:33 +0800)]
Merge branch 'MDL-51302-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 13 Oct 2015 03:05:05 +0000 (11:05 +0800)]
Merge branch 'wip-MDL-49515-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Tue, 13 Oct 2015 02:33:32 +0000 (10:33 +0800)]
Merge branch 'MDL-51517_master' of git://github.com/lazydaisy/moodle
Andrew Nicols [Tue, 13 Oct 2015 02:13:43 +0000 (10:13 +0800)]
Merge branch 'MDL-51427-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 13 Oct 2015 02:11:55 +0000 (10:11 +0800)]
Merge branch 'MDL-51568-master' of git://github.com/jleyva/moodle
Ryan Wyllie [Tue, 13 Oct 2015 01:46:25 +0000 (01:46 +0000)]
MDL-51576 navigation: stop course nav duplication
The course navigation was getting duplicate nodes because
it was loading the nav tree plugin functions twice. Once
specifically for the reports and then a second time more generally.
The code will now explicitly skip loading the report plugin
functions on the second load.
Andrew Nicols [Tue, 13 Oct 2015 01:45:41 +0000 (09:45 +0800)]
Merge branch 'MDL-40442-master' of git://github.com/danpoltawski/moodle
Adrian Greeve [Tue, 13 Oct 2015 01:10:18 +0000 (09:10 +0800)]
MDL-49515 libraries: Update to editpdf/classes/pdf.php
This updates fpdi_bridge to extend our Moodle pdf class
as was done before.
Andrew Nicols [Tue, 13 Oct 2015 01:24:31 +0000 (09:24 +0800)]
Merge branch 'MDL-50079-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 13 Oct 2015 00:08:51 +0000 (08:08 +0800)]
Merge branch 'MDL-50788-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 8 Oct 2015 22:14:09 +0000 (00:14 +0200)]
MDL-50182 core: add 3.0 environmental requirements
Only change from 2.9 is the modification of the slasharguments
admin setting string to recommend always to keep the setting enabled
and fix the problem in the server, warning about the drawbacks
of disabling it.
Also, there is a little phpdoc note added to one custom check
to have clearly specified when we can get rid of it.
sam marshall [Fri, 2 Oct 2015 11:06:16 +0000 (12:06 +0100)]
MDL-51467 Availability: Course reset should change restrict dates
Dan Poltawski [Mon, 12 Oct 2015 16:01:41 +0000 (17:01 +0100)]
Merge branch 'MDL-51375' of git://github.com/timhunt/moodle
Eric Merrill [Mon, 12 Oct 2015 15:11:39 +0000 (11:11 -0400)]
MDL-51610 course: Change section menu to "Edit" and order buttons
Dan Poltawski [Mon, 12 Oct 2015 15:53:18 +0000 (16:53 +0100)]
Merge branch 'MDL-48861-master' of git://github.com/damyon/moodle
Juan Leyva [Mon, 12 Oct 2015 11:53:57 +0000 (13:53 +0200)]
MDL-51563 core_user: Fix invalid passed parameteres in get_user
Dan Poltawski [Mon, 12 Oct 2015 11:41:03 +0000 (12:41 +0100)]
Merge branch 'MDL-36606-master' of git://github.com/merrill-oakland/moodle
Juan Leyva [Mon, 12 Oct 2015 11:24:49 +0000 (13:24 +0200)]
MDL-51565 webservice: Fix return types definitions
This commit also format the activity name via external_format_string in
some cases
Dan Poltawski [Mon, 12 Oct 2015 10:47:45 +0000 (11:47 +0100)]
Merge branch 'MDL-51536-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 12 Oct 2015 09:47:13 +0000 (10:47 +0100)]
Merge branch 'MDL-51586-master' of git://github.com/xow/moodle
sam marshall [Fri, 9 Oct 2015 10:05:54 +0000 (11:05 +0100)]
MDL-51652 Availability: OR conditions fail when filtering user lists
When filtering a user list, if there is an OR tree where one of the
conditions does not restrict user lists such as a date condition,
then the overall result should include all users (not be filtered).
This was not working correctly.
David Monllao [Mon, 12 Oct 2015 09:08:27 +0000 (17:08 +0800)]
Merge branch 'MDL-51637-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 12 Oct 2015 08:57:06 +0000 (16:57 +0800)]
Merge branch 'MDL-51083-master' of git://github.com/xow/moodle
Dan Poltawski [Mon, 12 Oct 2015 08:46:00 +0000 (09:46 +0100)]
Merge branch 'MDL-51605-master' of git://github.com/damyon/moodle
Damyon Wiese [Mon, 12 Oct 2015 08:23:39 +0000 (16:23 +0800)]
MDL-46455 Events: Add db mapping info even if not part of backup
We can return db mapping info even for objects that are not included
in backup/restore and it may be useful in future (no use in core yet).
Juan Leyva [Fri, 2 Oct 2015 08:21:33 +0000 (10:21 +0200)]
MDL-51637 forum: Make forum_get_discussions_paginated return group post
Juan Leyva [Mon, 28 Sep 2015 12:04:04 +0000 (14:04 +0200)]
MDL-51568 self_enrol: New Web Service enrol_self_enrol_user
Andrew Nicols [Mon, 12 Oct 2015 06:54:34 +0000 (14:54 +0800)]
MDL-49682 mod_forum: Correct arguments to format_message_text
This feeds straight into context_module::instance() and I was inadvertantly
using the forum->id, rather than the cm->id.
Andrew Nicols [Mon, 12 Oct 2015 06:15:14 +0000 (14:15 +0800)]
Merge branch 'MDL-51528-int-fix-1' of https://github.com/ryanwyllie/moodle
David Monllao [Mon, 12 Oct 2015 06:07:55 +0000 (14:07 +0800)]
MDL-49682 mod_forum: Bump version for caches
David Monllao [Mon, 12 Oct 2015 06:05:02 +0000 (14:05 +0800)]
Merge branch 'MDL-49682-master' of git://github.com/andrewnicols/moodle
Ryan Wyllie [Mon, 12 Oct 2015 05:45:13 +0000 (05:45 +0000)]
MDL-51528 themes: bootstrap v2.3.2 in thirdpartylibs
Increase the bootstrap version from v2.3.0 to v2.3.2
in the thirdpartylibs.xml file.
Andrew Nicols [Mon, 12 Oct 2015 05:37:14 +0000 (13:37 +0800)]
MDL-46497 atto: Whitespace/coding style fix
Andrew Nicols [Mon, 12 Oct 2015 05:35:24 +0000 (13:35 +0800)]
Merge branch 'MDL-46497_master' of https://github.com/nadavkav/moodle
Andrew Nicols [Fri, 25 Sep 2015 11:57:05 +0000 (19:57 +0800)]
MDL-49682 mod_forum: Build forum email templates
Andrew Nicols [Mon, 12 Oct 2015 02:42:15 +0000 (10:42 +0800)]
Merge branch 'MDL-51528-master' of git://github.com/ryanwyllie/moodle
David Monllao [Mon, 12 Oct 2015 02:36:05 +0000 (10:36 +0800)]
Merge branch 'MDL-51524-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 12 Oct 2015 02:10:51 +0000 (10:10 +0800)]
Merge branch 'MDL-51451-master' of https://github.com/sammarshallou/moodle
Mark Nelson [Tue, 6 Oct 2015 23:44:18 +0000 (16:44 -0700)]
MDL-46455 events: added more mapping
Also fixed a few bugs.
Andrew Nicols [Fri, 9 Oct 2015 05:03:33 +0000 (13:03 +0800)]
MDL-51524 tests: Fix broken tests
The upgraded version of HTML2Text highlighted some bugs in our unit tests.
In the IOS test, the HTML content includes a couple of patches of
In the previous version of HTML2Text, these were being converted to
breaking spaces. In one of these cases, it was then removed due to a trim.
The expected texts have been converted to use the correct non-breaking spaces.
In the case of the trimmed one, it is no longer trimmed as non-breaking
spaces are not trimmed.
This gives a truer reflection of the actual text.
In the case of the Outlook test, this trailing whitespace is not present in
the source. It was likely caused by a bug in the previous version of
HTML2Text.
In the case of the weblib change, the test was just wrong. Both of the
actual characters are encodings for an HTML bullet (decimal and hex) and
should both be converted to the relevant UTF8 representation of this
bullet.
Andrew Nicols [Thu, 1 Oct 2015 06:04:15 +0000 (14:04 +0800)]
MDL-51524 libraries: Update to latest version of html2text
We were previously using an ancient version of html2text from RoundCube
with many customisations.
This patchset moves to the version included in the latest version of
HTML2Text, and wraps the library in a moodle-provided class. This
moves all previous hacks away from that class.
Unfortunately, two hacks still remain - two of the functions in the
RoundCube class are private, and must be modified to protected in order to
use the class effectively.