moodle.git
5 years agoMerge branch 'MDL-51673-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Mon, 19 Oct 2015 05:38:53 +0000 (13:38 +0800)]
Merge branch 'MDL-51673-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-51759-master-2' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 19 Oct 2015 05:30:17 +0000 (13:30 +0800)]
Merge branch 'MDL-51759-master-2' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-50993-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Mon, 19 Oct 2015 04:43:40 +0000 (12:43 +0800)]
Merge branch 'MDL-50993-master' of git://github.com/ryanwyllie/moodle

5 years agoMDL-50993 forum: Display timed posts/discussions in a logical order
Adam Olley [Wed, 16 Sep 2015 06:42:21 +0000 (16:12 +0930)]
MDL-50993 forum: Display timed posts/discussions in a logical order

Users that don't have permission to view timed posts outside of the release
time frame will have discussions that have entered the visible frame appear
in an odd order from their point of view on the discussion list.

Example:
Discussion 1, modified 2015-01-01, hidden till 2015-01-03
Discussion 2, modified 2015-01-02, not hidden

The standard 'modified descending' order means that D2 is listed at the top
even after D1 becomes visible. When scanning the list of discussions for new
posts, the user could be tricked into thinking they'd already read it.

This fix instead takes into account the release time of the discussion when
timed forum posts are enabled.

I opted to use CASE statements to handle this instead of GREATEST as the
latter is not supported by MSSQL.

5 years agoMerge branch 'MDL-50412-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Sun, 18 Oct 2015 23:56:51 +0000 (07:56 +0800)]
Merge branch 'MDL-50412-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-51673 messages: Added codes for the unit tests
Jun Pataleta [Fri, 16 Oct 2015 21:05:30 +0000 (16:05 -0500)]
MDL-51673 messages: Added codes for the unit tests

5 years agoMDL-51673 messages: remove strict type check of int vs string
Ben Kelada [Tue, 6 Oct 2015 04:09:42 +0000 (15:09 +1100)]
MDL-51673 messages: remove strict type check of int vs string

5 years agoMDL-49329 fixtures: remove trailing whitespace
Dan Poltawski [Fri, 16 Oct 2015 14:22:37 +0000 (15:22 +0100)]
MDL-49329 fixtures: remove trailing whitespace

5 years agoMerge branch 'MDL-49329-master-multiplug' of git://github.com/mudrd8mz/moodle
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

5 years agoon-demand release 3.0dev+
Eloy Lafuente (stronk7) [Fri, 16 Oct 2015 10:51:49 +0000 (12:51 +0200)]
on-demand release 3.0dev+

5 years agoMDL-50647 profile: Styling fix
Andrew Nicols [Fri, 16 Oct 2015 04:01:31 +0000 (12:01 +0800)]
MDL-50647 profile: Styling fix

5 years agoMerge branch 'MDL-49984-master' of git://github.com/barbararamiro/moodle
Andrew Nicols [Fri, 16 Oct 2015 03:48:04 +0000 (11:48 +0800)]
Merge branch 'MDL-49984-master' of git://github.com/barbararamiro/moodle

5 years agoMDL-50647 groups: Documentation fix
Andrew Nicols [Fri, 16 Oct 2015 03:28:06 +0000 (11:28 +0800)]
MDL-50647 groups: Documentation fix

5 years agoMerge branch 'wip-mdl-50647' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Fri, 16 Oct 2015 03:16:36 +0000 (11:16 +0800)]
Merge branch 'wip-mdl-50647' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-51629 mod_survey: Coding style violation fix
Andrew Nicols [Fri, 16 Oct 2015 03:10:38 +0000 (11:10 +0800)]
MDL-51629 mod_survey: Coding style violation fix

5 years agoMDL-50647 behat: Expanded behat to not use example
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.

5 years agoMerge branch 'MDL-51629-master' of git://github.com/jleyva/moodle
Andrew Nicols [Fri, 16 Oct 2015 02:56:19 +0000 (10:56 +0800)]
Merge branch 'MDL-51629-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-51565-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

5 years agoMerge branch 'MDL-51651-master' of git://github.com/danpoltawski/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

5 years agoMDL-50647 group: add 'not in group' section to groups overview
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

5 years agoMerge branch 'MDL-50182' of git://github.com/stronk7/moodle
Andrew Nicols [Fri, 16 Oct 2015 00:07:04 +0000 (08:07 +0800)]
Merge branch 'MDL-50182' of git://github.com/stronk7/moodle

5 years agoMDL-51759 theme: Ensure that non-svg images are cached and returned
Andrew Nicols [Wed, 14 Oct 2015 05:39:26 +0000 (13:39 +0800)]
MDL-51759 theme: Ensure that non-svg images are cached and returned

5 years agoMDL-51629 mod_survey: New WS mod_survey_submit_answers
Juan Leyva [Thu, 1 Oct 2015 15:50:39 +0000 (17:50 +0200)]
MDL-51629 mod_survey: New WS mod_survey_submit_answers

5 years agoMDL-51629 mod_survey: New WS mod_survey_get_questions
Juan Leyva [Thu, 1 Oct 2015 12:00:51 +0000 (14:00 +0200)]
MDL-51629 mod_survey: New WS mod_survey_get_questions

5 years agoMDL-51629 mod_survey: New Web Service mod_survey_view_survey
Juan Leyva [Thu, 1 Oct 2015 10:21:50 +0000 (12:21 +0200)]
MDL-51629 mod_survey: New Web Service mod_survey_view_survey

5 years agoMDL-51629 mod_survey: New WS mod_survey_get_surveys_by_courses
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

5 years agoMDL-51703 mod_survey: Trigger response_submitted event in correct place
Juan Leyva [Fri, 9 Oct 2015 14:26:59 +0000 (16:26 +0200)]
MDL-51703 mod_survey: Trigger response_submitted event in correct place

5 years agoMerge branch 'MDL-51500-master' of git://github.com/merrill-oakland/moodle
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

5 years agoMerge branch 'MDL-51563-master' of git://github.com/jleyva/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

5 years agoMerge branch 'MDL-51652-master' of https://github.com/sammarshallou/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

5 years agoMerge branch 'MDL-51679-groupmode-ajax' of https://github.com/Dagefoerde/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

5 years agoMerge branch 'MDL-51781_master' of git://github.com/markn86/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

5 years agoMDL-51651 lang: add consitency for application of firstdayofweek
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/

5 years agoMDL-51651 lang: the first day of the week is Monday
Dan Poltawski [Thu, 8 Oct 2015 14:08:00 +0000 (15:08 +0100)]
MDL-51651 lang: the first day of the week is Monday

5 years agoMDL-51781 tool_log: marked log values as NOT_MAPPED if mapping not found
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

5 years agoMerge branch 'wip-MDL-51604-master' of git://github.com/marinaglancy/moodle
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

5 years agoMerge branch 'MDL-51790-master' of git://github.com/damyon/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

5 years agoMerge branch 'wip-mdl-50940' of https://github.com/rajeshtaneja/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

5 years agoMerge branch 'MDL-51756-master' of git://github.com/damyon/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

5 years agoMDL-51756 tests: Refactor test to use data-provider
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!).

5 years agoMDL-51790 block_community: xmlrpc expects correct types
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.

5 years agoMerge branch 'MDL-51594-master' of git://github.com/jleyva/moodle
Andrew Nicols [Thu, 15 Oct 2015 06:19:10 +0000 (14:19 +0800)]
Merge branch 'MDL-51594-master' of git://github.com/jleyva/moodle

5 years agoMDL-51756 externallib: Show debugging when optional params are wrong
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.

5 years agoMDL-49984 Profile: Decluttering, grouping and adding white space to easily find info
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

5 years agoMDL-51260 core_tag: Use new tag autocomplete for related tags
Marina Glancy [Sat, 29 Aug 2015 07:17:05 +0000 (15:17 +0800)]
MDL-51260 core_tag: Use new tag autocomplete for related tags

5 years agoMDL-51260 tags: Update the tags form element to use the autocomplete field
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

5 years agoMerge branch 'MDL-49545-master' of git://github.com/ryanwyllie/moodle
David Monllao [Thu, 15 Oct 2015 03:54:53 +0000 (11:54 +0800)]
Merge branch 'MDL-49545-master' of git://github.com/ryanwyllie/moodle

5 years agoMDL-49545 backup: Restore does not respect some capabilities
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.

5 years agoMerge branch 'MDL-51610-master' of git://github.com/merrill-oakland/moodle
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

5 years agoMDL-51247 forms: All new aria-pimped autocomplete mform element.
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.

5 years agoMerge branch 'MDL-51399' of https://github.com/andrewhancox/moodle
Dan Poltawski [Wed, 14 Oct 2015 14:02:50 +0000 (15:02 +0100)]
Merge branch 'MDL-51399' of https://github.com/andrewhancox/moodle

5 years agoMerge branch 'MDL-38214_wipd' of git://github.com/ppichet/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

5 years agoMerge branch 'MDL-51467-master' of https://github.com/sammarshallou/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

5 years agoMDL-51679 course: Update groupmode CSS class
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.

5 years agoMDL-51594 webservice: Fix typos in choice and SCORM documentation
Juan Leyva [Wed, 14 Oct 2015 12:29:12 +0000 (14:29 +0200)]
MDL-51594 webservice: Fix typos in choice and SCORM documentation

5 years agoweekly release 3.0dev
Dan Poltawski [Wed, 14 Oct 2015 09:49:01 +0000 (10:49 +0100)]
weekly release 3.0dev

5 years agoNOBUG: Fixed file access permissions
Dan Poltawski [Wed, 14 Oct 2015 09:49:01 +0000 (10:49 +0100)]
NOBUG: Fixed file access permissions

5 years agoNOBUG: Fixed SVG browser compatibility
Dan Poltawski [Wed, 14 Oct 2015 09:49:00 +0000 (10:49 +0100)]
NOBUG: Fixed SVG browser compatibility

5 years agoMDL-51536 webservices: fix invalid param definitions
Dan Poltawski [Tue, 13 Oct 2015 18:01:42 +0000 (19:01 +0100)]
MDL-51536 webservices: fix invalid param definitions

5 years agoMerge branch 'MDL-40710-master' of git://github.com/barbararamiro/moodle
Dan Poltawski [Tue, 13 Oct 2015 14:44:31 +0000 (15:44 +0100)]
Merge branch 'MDL-40710-master' of git://github.com/barbararamiro/moodle

5 years agoMerge branch 'MDL-51435' of https://github.com/NeillM/moodle
Dan Poltawski [Tue, 13 Oct 2015 10:39:52 +0000 (11:39 +0100)]
Merge branch 'MDL-51435' of https://github.com/NeillM/moodle

5 years agoMDL-47494 copyright: missed fixes from last commit
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!

5 years agoMDL-47494 copyright: fix incorrect statement
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)

5 years agoMerge branch 'MDL-51576-master-2' of git://github.com/ryanwyllie/moodle
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

5 years agoMDL-48861 assign: Make the requires grading filter consistent
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).

5 years agoMDL-48861 assign: Fix unit tests and behat tests
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.

5 years agoMerge branch 'MDL-46455-master-20151012' of git://github.com/damyon/moodle
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

5 years agoMerge branch 'MDL-51302-master' of git://github.com/danpoltawski/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

5 years agoMerge branch 'wip-MDL-49515-master' of git://github.com/abgreeve/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

5 years agoMerge branch 'MDL-51517_master' of git://github.com/lazydaisy/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

5 years agoMerge branch 'MDL-51427-master' of git://github.com/marinaglancy/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

5 years agoMerge branch 'MDL-51568-master' of git://github.com/jleyva/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

5 years agoMDL-51576 navigation: stop course nav duplication
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.

5 years agoMerge branch 'MDL-40442-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 13 Oct 2015 01:45:41 +0000 (09:45 +0800)]
Merge branch 'MDL-40442-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-49515 libraries: Update to editpdf/classes/pdf.php
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.

5 years agoMerge branch 'MDL-50079-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 13 Oct 2015 01:24:31 +0000 (09:24 +0800)]
Merge branch 'MDL-50079-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-50788-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

5 years agoMDL-50182 core: add 3.0 environmental requirements
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.

5 years agoMDL-51467 Availability: Course reset should change restrict dates
sam marshall [Fri, 2 Oct 2015 11:06:16 +0000 (12:06 +0100)]
MDL-51467 Availability: Course reset should change restrict dates

5 years agoMerge branch 'MDL-51375' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 12 Oct 2015 16:01:41 +0000 (17:01 +0100)]
Merge branch 'MDL-51375' of git://github.com/timhunt/moodle

5 years agoMDL-51610 course: Change section menu to "Edit" and order buttons
Eric Merrill [Mon, 12 Oct 2015 15:11:39 +0000 (11:11 -0400)]
MDL-51610 course: Change section menu to "Edit" and order buttons

5 years agoMerge branch 'MDL-48861-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 12 Oct 2015 15:53:18 +0000 (16:53 +0100)]
Merge branch 'MDL-48861-master' of git://github.com/damyon/moodle

5 years agoMDL-51563 core_user: Fix invalid passed parameteres in get_user
Juan Leyva [Mon, 12 Oct 2015 11:53:57 +0000 (13:53 +0200)]
MDL-51563 core_user: Fix invalid passed parameteres in get_user

5 years agoMerge branch 'MDL-36606-master' of git://github.com/merrill-oakland/moodle
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

5 years agoMDL-51565 webservice: Fix return types definitions
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

5 years agoMerge branch 'MDL-51536-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 12 Oct 2015 10:47:45 +0000 (11:47 +0100)]
Merge branch 'MDL-51536-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-51586-master' of git://github.com/xow/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

5 years agoMDL-51652 Availability: OR conditions fail when filtering user lists
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.

5 years agoMerge branch 'MDL-51637-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 12 Oct 2015 09:08:27 +0000 (17:08 +0800)]
Merge branch 'MDL-51637-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-51083-master' of git://github.com/xow/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

5 years agoMerge branch 'MDL-51605-master' of git://github.com/damyon/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

5 years agoMDL-46455 Events: Add db mapping info even if not part of backup
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).

5 years agoMDL-51637 forum: Make forum_get_discussions_paginated return group post
Juan Leyva [Fri, 2 Oct 2015 08:21:33 +0000 (10:21 +0200)]
MDL-51637 forum: Make forum_get_discussions_paginated return group post

5 years agoMDL-51568 self_enrol: New Web Service enrol_self_enrol_user
Juan Leyva [Mon, 28 Sep 2015 12:04:04 +0000 (14:04 +0200)]
MDL-51568 self_enrol: New Web Service enrol_self_enrol_user

5 years agoMDL-49682 mod_forum: Correct arguments to format_message_text
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.

5 years agoMerge branch 'MDL-51528-int-fix-1' of https://github.com/ryanwyllie/moodle
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

5 years agoMDL-49682 mod_forum: Bump version for caches
David Monllao [Mon, 12 Oct 2015 06:07:55 +0000 (14:07 +0800)]
MDL-49682 mod_forum: Bump version for caches

5 years agoMerge branch 'MDL-49682-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 12 Oct 2015 06:05:02 +0000 (14:05 +0800)]
Merge branch 'MDL-49682-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-51528 themes: bootstrap v2.3.2 in thirdpartylibs
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.

5 years agoMDL-46497 atto: Whitespace/coding style fix
Andrew Nicols [Mon, 12 Oct 2015 05:37:14 +0000 (13:37 +0800)]
MDL-46497 atto: Whitespace/coding style fix