moodle.git
8 years agoMDL-36110 - Blocks - Community finder icon alt attribute is now empty
Jason Fowler [Tue, 4 Dec 2012 07:15:22 +0000 (15:15 +0800)]
MDL-36110 - Blocks - Community finder icon alt attribute is now empty

8 years agoweekly release 2.3.3+
Eloy Lafuente (stronk7) [Mon, 3 Dec 2012 22:26:00 +0000 (23:26 +0100)]
weekly release 2.3.3+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Eloy Lafuente (stronk7) [Mon, 3 Dec 2012 22:24:56 +0000 (23:24 +0100)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36914-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 3 Dec 2012 06:45:49 +0000 (14:45 +0800)]
Merge branch 'MDL-36914-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoAutomatically generated installer lang files
AMOS bot [Sat, 1 Dec 2012 00:43:07 +0000 (00:43 +0000)]
Automatically generated installer lang files

8 years agoSatisfy version checker requirements
Eloy Lafuente (stronk7) [Fri, 30 Nov 2012 12:35:48 +0000 (13:35 +0100)]
Satisfy version checker requirements

In stable branches, 8 first digits of the backup version
must be >= than the 8 first digits of the main version.

8 years agoweekly release 2.3.3+
Eloy Lafuente (stronk7) [Fri, 30 Nov 2012 12:25:29 +0000 (13:25 +0100)]
weekly release 2.3.3+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Eloy Lafuente (stronk7) [Fri, 30 Nov 2012 11:48:29 +0000 (12:48 +0100)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoRevert "MDL-36838 moodle->mahara mnet SSO failure in FF17"
Dan Poltawski [Fri, 30 Nov 2012 01:25:10 +0000 (09:25 +0800)]
Revert "MDL-36838 moodle->mahara mnet SSO failure in FF17"

Firefox have now decided to reverse their UA change (since integration)
and this patch has some minor drawbacks.

This reverts commit 166d3b60d33eee6e162d53ff97a45a7f3a10df23.

8 years agoMDL-36914: Assignment upgrade. Clean up patch to include outcomes in the upgrade
Damyon Wiese [Thu, 29 Nov 2012 08:07:20 +0000 (16:07 +0800)]
MDL-36914: Assignment upgrade. Clean up patch to include outcomes in the upgrade

Thanks to Nathan Mares for reporting this issue.

8 years agoMDL-36914: Re-associate all grade_item records when upgrading assignments to prevent...
Nathan Mares [Tue, 27 Nov 2012 23:21:32 +0000 (10:21 +1100)]
MDL-36914: Re-associate all grade_item records when upgrading assignments to prevent data loss

8 years agoMDL-36858 SCORM: improve lang help for attempts grading to warn about failed status.
Dan Marsden [Wed, 28 Nov 2012 07:53:18 +0000 (20:53 +1300)]
MDL-36858 SCORM: improve lang help for attempts grading to warn about failed status.

8 years agoMDL-36878 course: fixed issue with module metadata cache
Sam Hemelryk [Wed, 28 Nov 2012 23:56:52 +0000 (12:56 +1300)]
MDL-36878 course: fixed issue with module metadata cache

Credit goes to Sam Chaffee.

8 years agoMerge branch 'MDL-36838-FF17-MNETSSO-23' of git://github.com/peterbulmer/moodle into...
Dan Poltawski [Wed, 28 Nov 2012 09:36:09 +0000 (17:36 +0800)]
Merge branch 'MDL-36838-FF17-MNETSSO-23' of git://github.com/peterbulmer/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 28 Nov 2012 06:15:41 +0000 (14:15 +0800)]
Merge branch 'MDL-35966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36752-MOODLE_23_STABLE-2' of git://git.luns.net.uk/moodle into...
Dan Poltawski [Wed, 28 Nov 2012 01:41:30 +0000 (09:41 +0800)]
Merge branch 'MDL-36752-MOODLE_23_STABLE-2' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36336_MOODLE_23_STABLE' of git://github.com/moodlerooms/moodle...
Sam Hemelryk [Tue, 27 Nov 2012 22:47:53 +0000 (11:47 +1300)]
Merge branch 'MDL-36336_MOODLE_23_STABLE' of git://github.com/moodlerooms/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-mdl-36238-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Sam Hemelryk [Tue, 27 Nov 2012 22:41:35 +0000 (11:41 +1300)]
Merge branch 'wip-mdl-36238-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-MDL-34530_MOODLE_23_STABLE' of git://github.com/jason-platts/moodle...
Sam Hemelryk [Tue, 27 Nov 2012 22:24:56 +0000 (11:24 +1300)]
Merge branch 'wip-MDL-34530_MOODLE_23_STABLE' of git://github.com/jason-platts/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36012-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 27 Nov 2012 22:12:30 +0000 (11:12 +1300)]
Merge branch 'MDL-36012-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMDL-36752 Be more specific about tooltip selectors
Andrew Robert Nicols [Tue, 27 Nov 2012 14:51:05 +0000 (14:51 +0000)]
MDL-36752 Be more specific about tooltip selectors

8 years agoMerge branch 'MDL-36865_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 27 Nov 2012 08:26:08 +0000 (16:26 +0800)]
Merge branch 'MDL-36865_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMDL-35966 Assignment - Localisation issue - use userdate not strftime
Damyon Wiese [Tue, 27 Nov 2012 05:48:31 +0000 (13:48 +0800)]
MDL-35966 Assignment - Localisation issue - use userdate not strftime

This is causing a database error (reported on MySQL) when strftime returns
non-utf8 characters.  This occurs when sending assignment notifications.

This was reported and a solution provided by Chien Wen-Chang(簡文章).

8 years agoMDL-36865 filepicker: ensuring the dnd arrow displays in the center of the filepicker...
Mark Nelson [Tue, 27 Nov 2012 07:58:30 +0000 (15:58 +0800)]
MDL-36865 filepicker: ensuring the dnd arrow displays in the center of the filepicker for all supported browsers

8 years agoMerge branch 'MDL-36841_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 27 Nov 2012 06:56:36 +0000 (14:56 +0800)]
Merge branch 'MDL-36841_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-34695_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 27 Nov 2012 06:23:44 +0000 (14:23 +0800)]
Merge branch 'MDL-34695_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36302-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 27 Nov 2012 06:10:06 +0000 (14:10 +0800)]
Merge branch 'MDL-36302-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMDL-36302 course: Set correct URL on settings page for navigation.
Damyon Wiese [Mon, 26 Nov 2012 04:06:40 +0000 (12:06 +0800)]
MDL-36302 course: Set correct URL on settings page for navigation.

8 years agoMerge branch 'MDL-36184-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 27 Nov 2012 05:58:29 +0000 (13:58 +0800)]
Merge branch 'MDL-36184-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36752-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE...
Dan Poltawski [Tue, 27 Nov 2012 05:32:47 +0000 (13:32 +0800)]
Merge branch 'MDL-36752-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36806_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 27 Nov 2012 05:26:46 +0000 (13:26 +0800)]
Merge branch 'MDL-36806_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-36841 portfolio: ensure variables in parent function match those of childs to...
Mark Nelson [Tue, 27 Nov 2012 04:38:11 +0000 (12:38 +0800)]
MDL-36841 portfolio: ensure variables in parent function match those of childs to prevent strict standard error

8 years agoMerge branch 'wip-mdl-36767-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Aparup Banerjee [Tue, 27 Nov 2012 04:20:25 +0000 (12:20 +0800)]
Merge branch 'wip-mdl-36767-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMDL-36767 Administration: user_filter_yesno use different name for sql filter
Rajesh Taneja [Thu, 22 Nov 2012 06:55:50 +0000 (14:55 +0800)]
MDL-36767 Administration: user_filter_yesno use different name for sql filter

user_filter_yesno extends user_filter_simpleselect, so if user bulk action filter has both
user_filter_simpleselect and user_filter_yesno, they use the same filter name but counter is
different as they are different classes. Hence using different filter name will avoid confilts

8 years agoMerge branch 'MDL-36305-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 27 Nov 2012 03:53:09 +0000 (11:53 +0800)]
Merge branch 'MDL-36305-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMDL-36838 moodle->mahara mnet SSO failure in FF17
Peter Bulmer [Tue, 27 Nov 2012 02:31:24 +0000 (15:31 +1300)]
MDL-36838 moodle->mahara mnet SSO failure in FF17

In MDL-36838 Firefox 17 users are unable to sso from moodle to mahara.

Firefox 17 uses a different user agent (UA) string for Moodle sites than it
does for Mahara or other sites.
This patch relaxes the check which previously required that the UA string
being presented to the SP on landing matched the UA string presented to the IP
when jumping.
Likewise, checks associated with logout calls have been relaxed

8 years agoMerge branch 'wip-MDL-36795-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle...
Sam Hemelryk [Mon, 26 Nov 2012 22:21:55 +0000 (11:21 +1300)]
Merge branch 'wip-MDL-36795-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35760_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 26 Nov 2012 22:10:25 +0000 (11:10 +1300)]
Merge branch 'MDL-35760_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36760_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 26 Nov 2012 21:40:57 +0000 (10:40 +1300)]
Merge branch 'MDL-36760_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-36795 - lib / administration: maxsections now limits the default setting for...
Adrian Greeve [Mon, 26 Nov 2012 07:53:30 +0000 (15:53 +0800)]
MDL-36795 - lib / administration: maxsections now limits the default setting for numsections.

In the default course settings, setting the maximum number topics / weeks  to 0 would not
change the default number of sections on the same page as any other number would.
A more appropriate check has been put in place.

This also incorporates a fix for MDL-28584. The course edit screen now also checks to see
if maxsections is set or numeric. If it is not set or numeric then it defaults to 52.

8 years agoMerge branch 'MDL-36609_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 26 Nov 2012 01:57:57 +0000 (14:57 +1300)]
Merge branch 'MDL-36609_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-MDL-36551-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle...
Sam Hemelryk [Mon, 26 Nov 2012 01:44:27 +0000 (14:44 +1300)]
Merge branch 'wip-MDL-36551-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36763-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE...
Sam Hemelryk [Sun, 25 Nov 2012 22:42:13 +0000 (11:42 +1300)]
Merge branch 'MDL-36763-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35963-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 25 Nov 2012 21:31:57 +0000 (10:31 +1300)]
Merge branch 'MDL-35963-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoAutomatically generated installer lang files
AMOS bot [Sat, 24 Nov 2012 00:42:52 +0000 (00:42 +0000)]
Automatically generated installer lang files

8 years agoMDL-36806 question files: fix unnecessary require_login call.
Tim Hunt [Fri, 23 Nov 2012 15:54:58 +0000 (15:54 +0000)]
MDL-36806 question files: fix unnecessary require_login call.

quiz_question_pluginfile later does the correct check. Doing this
other check first means you get an error about changing $PAGE->context.

8 years agoMDL-36760 formslib: fix frozen elements with [] in name.
Tim Hunt [Thu, 22 Nov 2012 15:20:38 +0000 (15:20 +0000)]
MDL-36760 formslib: fix frozen elements with [] in name.

This was a regression caused by MDL-30845 or, to be precise, the related
issue MDL-32785.

Form elements with names like multipier[0] require special handling,
such as is present in HTML_QuickForm_element::_prepareValue. I have
added equivalent handling to MoodleQuickForm::exportValues. I am afraid
that I could not think of a way to do this reliably without duplicating
code.

8 years agoweekly release 2.3.3+
Dan Poltawski [Fri, 23 Nov 2012 07:20:23 +0000 (15:20 +0800)]
weekly release 2.3.3+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Dan Poltawski [Fri, 23 Nov 2012 07:12:29 +0000 (15:12 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36204-files-with-spaces_23' of git://github.com/mudrd8mz/moodle...
Dan Poltawski [Fri, 23 Nov 2012 03:20:04 +0000 (11:20 +0800)]
Merge branch 'MDL-36204-files-with-spaces_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

8 years agoMDL-36204 Improve moodle1 conversion of embedded files
David Mudrák [Wed, 21 Nov 2012 19:35:57 +0000 (20:35 +0100)]
MDL-36204 Improve moodle1 conversion of embedded files

URL of files referenced in HTML fields via $@FILEPHP$@ are usually
encoded if they were linked using the HTML editor. So if they contain
spaces or plus signs in the name, their URL is encoded to use %20 and
%2B respectively.

Sometimes, for example when the HTML was edited manually in 1.9 without
the editor, non-encoded file names may be put into the HTML text. Such a
link used to work in 1.9 so we add an explicit support for it, too.

However, we do not support partially encoded URLs (e.g. only spaces are
encoded while plus signs are not). Such links are unmodified and will
rely on Legacy files support.

8 years agoMDL-35819 Improve performance of help tooltip
Andrew Robert Nicols [Wed, 21 Nov 2012 09:31:41 +0000 (09:31 +0000)]
MDL-35819 Improve performance of help tooltip

Rather than using an event handler for each help link, we add the
'helpicon' class to them and delegate the display function.

In order for this to work, we modify the way that Y.io fetches the help to
use the intended target of the anchor rather than a value provided in the
add call. We also no longer modify this URL and instead add the ajaxurl
parameter to it using the Y.io data parameter.

This change is backwards compatible with people calling it without using
the help icon renderer.

8 years agoMDL-36763 Remove onclick event when creating activity left indent link
Andrew Robert Nicols [Thu, 22 Nov 2012 10:47:49 +0000 (10:47 +0000)]
MDL-36763 Remove onclick event when creating activity left indent link

The left indent onclick is now handled by a Y.delegate so there is no need
for a seperate event handler.

8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 22 Nov 2012 09:05:24 +0000 (09:05 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'wip-MDL-36668-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle...
Dan Poltawski [Thu, 22 Nov 2012 02:33:15 +0000 (10:33 +0800)]
Merge branch 'wip-MDL-36668-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

8 years agoMDL-36753 fix invalid sectionid in backup tests
Petr Škoda [Wed, 21 Nov 2012 11:40:17 +0000 (12:40 +0100)]
MDL-36753 fix invalid sectionid in backup tests

8 years agoMerge branch 'w47_MDL-36547_m23_sectiongen' of git://github.com/skodak/moodle into...
Dan Poltawski [Wed, 21 Nov 2012 07:34:22 +0000 (15:34 +0800)]
Merge branch 'w47_MDL-36547_m23_sectiongen' of git://github.com/skodak/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-30884_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 21 Nov 2012 07:19:24 +0000 (15:19 +0800)]
Merge branch 'MDL-30884_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-35963: Assignment - do not accept empty submissions
Damyon Wiese [Mon, 19 Nov 2012 08:56:02 +0000 (16:56 +0800)]
MDL-35963: Assignment - do not accept empty submissions

Conflicts:

mod/assign/locallib.php

8 years agoMDL-35760 filemanager: ensuring the dnd arrow displays in the center of the filemanag...
Mark Nelson [Wed, 21 Nov 2012 04:03:54 +0000 (12:03 +0800)]
MDL-35760 filemanager: ensuring the dnd arrow displays in the center of the filemanager for all supported browsers

8 years agoMDL-36012: Assignment, Accessibility - Add user information to alt text for grade...
Damyon Wiese [Wed, 21 Nov 2012 03:57:47 +0000 (11:57 +0800)]
MDL-36012: Assignment, Accessibility - Add user information to alt text for grade icon in grading table.

Conflicts:

mod/assign/lang/en/assign.php

8 years agoMerge branch 'MDL-35675-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 21 Nov 2012 04:02:58 +0000 (12:02 +0800)]
Merge branch 'MDL-35675-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36289-m23' of git://github.com/netspotau/moodle-mod_assign into...
Dan Poltawski [Wed, 21 Nov 2012 04:01:03 +0000 (12:01 +0800)]
Merge branch 'MDL-36289-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-30377_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 21 Nov 2012 03:53:21 +0000 (11:53 +0800)]
Merge branch 'MDL-30377_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36170_m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 21 Nov 2012 03:47:39 +0000 (11:47 +0800)]
Merge branch 'MDL-36170_m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE

8 years agoMDL-36184: Assignment quickgrading should only update lastmodified dates for modified...
Damyon Wiese [Wed, 21 Nov 2012 03:10:12 +0000 (11:10 +0800)]
MDL-36184: Assignment quickgrading should only update lastmodified dates for modified submissions

8 years agoMDL-36551 - mod_data: Onsite presets now retain the advanced search template.
Adrian Greeve [Wed, 14 Nov 2012 04:22:51 +0000 (12:22 +0800)]
MDL-36551 - mod_data: Onsite presets now retain the advanced search template.

Presets that were saved to the site would lose the advanced search template when being used.
The previous check was put in place to see if the advanced search template existed or not (presets pre 1.9),
This checked external files properly but not onsite files.

Now checks are being done on both internal and external preset files.

8 years agoMerge branch 'MDL-25552_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 20 Nov 2012 20:00:17 +0000 (09:00 +1300)]
Merge branch 'MDL-25552_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMDL-36170 - mod/data - Don't display the blocks editing button within table HTML...
Justin Filip [Mon, 29 Oct 2012 04:18:06 +0000 (12:18 +0800)]
MDL-36170 - mod/data - Don't display the blocks editing button within table HTML, use a standard API to create it.

8 years agoMDL-30884 quiz: ARIA attribute for the coutdown timer.
Tim Hunt [Thu, 27 Sep 2012 11:19:56 +0000 (12:19 +0100)]
MDL-30884 quiz: ARIA attribute for the coutdown timer.

8 years agoMDL-25552 mod_lesson: changing filepicker element to filemanager to allow the deletio...
Mark Nelson [Tue, 20 Nov 2012 09:42:28 +0000 (17:42 +0800)]
MDL-25552 mod_lesson: changing filepicker element to filemanager to allow the deletion of a file

8 years agoMerge branch 'wip-mdl-36707-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Aparup Banerjee [Tue, 20 Nov 2012 08:28:00 +0000 (16:28 +0800)]
Merge branch 'wip-mdl-36707-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-33863_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 20 Nov 2012 08:16:41 +0000 (16:16 +0800)]
Merge branch 'MDL-33863_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36022-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE...
Dan Poltawski [Tue, 20 Nov 2012 08:04:19 +0000 (16:04 +0800)]
Merge branch 'MDL-36022-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-30731-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 20 Nov 2012 07:31:38 +0000 (15:31 +0800)]
Merge branch 'MDL-30731-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36646_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 20 Nov 2012 07:12:00 +0000 (15:12 +0800)]
Merge branch 'MDL-36646_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36571_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 20 Nov 2012 07:01:38 +0000 (15:01 +0800)]
Merge branch 'MDL-36571_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-30731 calendar: Fixed display of images in event descriptions
Frederic Massart [Fri, 2 Nov 2012 05:08:07 +0000 (13:08 +0800)]
MDL-30731 calendar: Fixed display of images in event descriptions

8 years agoMerge branch 'MDL-36548_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 20 Nov 2012 06:45:04 +0000 (14:45 +0800)]
Merge branch 'MDL-36548_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-MDL-36453-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle...
Dan Poltawski [Tue, 20 Nov 2012 06:32:05 +0000 (14:32 +0800)]
Merge branch 'wip-MDL-36453-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

8 years agoMDL-36305 theme: Forum reply button is not removed using MyMobile
Frederic Massart [Tue, 20 Nov 2012 05:54:13 +0000 (13:54 +0800)]
MDL-36305 theme: Forum reply button is not removed using MyMobile

8 years agoMDL-36707 Course: set conditionalhidden class properly, so it doesn't overlap with...
Rajesh Taneja [Tue, 20 Nov 2012 05:40:25 +0000 (13:40 +0800)]
MDL-36707 Course: set conditionalhidden class properly, so it doesn't overlap with dimmed class

8 years agoMerge branch 'MDL-36204_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 20 Nov 2012 04:45:32 +0000 (12:45 +0800)]
Merge branch 'MDL-36204_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'm23_MDL-36168' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 20 Nov 2012 04:38:33 +0000 (12:38 +0800)]
Merge branch 'm23_MDL-36168' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35158-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 20 Nov 2012 04:28:59 +0000 (12:28 +0800)]
Merge branch 'MDL-35158-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-32865_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 20 Nov 2012 04:05:46 +0000 (12:05 +0800)]
Merge branch 'MDL-32865_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-30871-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 20 Nov 2012 03:47:26 +0000 (11:47 +0800)]
Merge branch 'MDL-30871-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-26439_message_search_23' of git://github.com/andyjdavis/moodle...
Dan Poltawski [Tue, 20 Nov 2012 03:20:51 +0000 (11:20 +0800)]
Merge branch 'MDL-26439_message_search_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36683_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 20 Nov 2012 00:33:49 +0000 (01:33 +0100)]
Merge branch 'MDL-36683_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-33863 question restore: better hint identification.
Jean-Michel Vedrine [Mon, 19 Nov 2012 23:27:44 +0000 (23:27 +0000)]
MDL-33863 question restore: better hint identification.

This is very similar to what MDL-30018 did for question_answers.

8 years agoMDL-36683 qtype match restore: better subq indentification.
Tim Hunt [Mon, 19 Nov 2012 17:46:25 +0000 (17:46 +0000)]
MDL-36683 qtype match restore: better subq indentification.

This is very similar to what MDL-30018 did for question_answers.

8 years agoMDL-36571 qtype multichoice: don't corrupt unicode characters.
Tim Hunt [Mon, 19 Nov 2012 17:21:00 +0000 (17:21 +0000)]
MDL-36571 qtype multichoice: don't corrupt unicode characters.

It seems that \s includes non-breaking space, and the typical one-byte
representation of that is the same as some parts of multibyte unicode
characters. Therefore, you need to include the u modifer on the regular
expressions.

Also, remove any number of <br /> at the end of the answer.

Thanks to Joseph Rézeau and Jean-Michel Vedrine for working out what the
problem was, and how to fix it.

8 years agoMerge branch 'MDL-36696-MOODLE_23_STABLE' of git://github.com/mrverrall/moodle into...
Dan Poltawski [Mon, 19 Nov 2012 16:03:56 +0000 (00:03 +0800)]
Merge branch 'MDL-36696-MOODLE_23_STABLE' of git://github.com/mrverrall/moodle into MOODLE_23_STABLE

8 years agoMDL-36696 - filepicker: remove superfluous comma
Paul Verrall [Mon, 19 Nov 2012 15:08:11 +0000 (15:08 +0000)]
MDL-36696 - filepicker: remove superfluous comma

It causes problems with older versions of IE.

8 years agoMDL-36609 javascript: ensure HTML element exists before attempting to perform JS...
Mark Nelson [Mon, 19 Nov 2012 07:43:12 +0000 (15:43 +0800)]
MDL-36609 javascript: ensure HTML element exists before attempting to perform JS functionality

8 years agoMerge branch 'MDL-36655-m23' of git://github.com/netspotau/moodle-mod_assign into...
Dan Poltawski [Mon, 19 Nov 2012 07:01:54 +0000 (15:01 +0800)]
Merge branch 'MDL-36655-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-34204_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 19 Nov 2012 02:33:31 +0000 (10:33 +0800)]
Merge branch 'MDL-34204_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-36668 - mod/data: Removed duplicate data_content join in simple searches.
Adrian Greeve [Mon, 29 Oct 2012 06:13:43 +0000 (14:13 +0800)]
MDL-36668 - mod/data: Removed duplicate data_content join in simple searches.

Thanks to Patrick Pollet (patrick.pollet@insa-lyon.fr) for his patch

8 years agoMerge branch 'MDL-36589_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 19 Nov 2012 01:55:22 +0000 (14:55 +1300)]
Merge branch 'MDL-36589_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMDL-32865 CLOZE Questions imported from another course end up with broken image links
Jean-Michel Vedrine [Thu, 1 Nov 2012 10:16:01 +0000 (11:16 +0100)]
MDL-32865 CLOZE Questions imported from another course end up with broken image links