Dan Poltawski [Mon, 10 Dec 2012 04:03:33 +0000 (12:03 +0800)]
Merge branch 'w49_MDL-35456_m23_paypal' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 10 Dec 2012 03:36:49 +0000 (11:36 +0800)]
Merge branch 'MDL-35404_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 10 Dec 2012 01:59:31 +0000 (14:59 +1300)]
Merge branch 'MDL-30961-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 10 Dec 2012 01:57:10 +0000 (09:57 +0800)]
Merge branch 'MDL-36680_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 10 Dec 2012 01:28:24 +0000 (14:28 +1300)]
Merge branch 'MDL-34592_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 10 Dec 2012 01:24:10 +0000 (14:24 +1300)]
Merge branch 'MDL-36608_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 10 Dec 2012 01:21:08 +0000 (14:21 +1300)]
Merge branch 'MDL-36978_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Mark Nielsen [Tue, 13 Nov 2012 20:55:44 +0000 (12:55 -0800)]
MDL-36579: Adding missing fields in mod/lti backup
Sam Hemelryk [Mon, 10 Dec 2012 01:12:24 +0000 (14:12 +1300)]
Merge branch 'MDL-36607_dndBlocks' of https://github.com/moodlerooms/moodle into MOODLE_23_STABLE
Mary Evans [Mon, 10 Dec 2012 00:06:03 +0000 (00:06 +0000)]
MDL-34592 theme_magazine: Fixes the report grader fixed column misalignment in magazine/style/core.css theme, plus fixes all CORE themes with minor adjustment to grade/report/grader/style.css
Sam Hemelryk [Sun, 9 Dec 2012 23:13:10 +0000 (12:13 +1300)]
Merge branch 'MDL-36433' of git://github.com/itamart/moodle into MOODLE_23_STABLE
Dan Poltawski [Thu, 22 Nov 2012 02:05:10 +0000 (10:05 +0800)]
MDL-36764 ddl/oracle: fix misleading comment
Sam Hemelryk [Sun, 9 Dec 2012 22:51:20 +0000 (11:51 +1300)]
Merge branch 'MDL-36778-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 9 Dec 2012 22:47:44 +0000 (11:47 +1300)]
Merge branch 'MDL-36887-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 9 Dec 2012 22:42:35 +0000 (11:42 +1300)]
Merge branch 'MDL-36640-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE
Andrew Robert Nicols [Mon, 3 Dec 2012 12:18:21 +0000 (12:18 +0000)]
MDL-36918 Decode HTML entities on ajax update title
Sam Hemelryk [Sun, 9 Dec 2012 21:58:50 +0000 (10:58 +1300)]
Merge branch 'message_nav_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 9 Dec 2012 21:54:00 +0000 (10:54 +1300)]
Merge branch 'MDL-36761_loop_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 9 Dec 2012 21:48:33 +0000 (10:48 +1300)]
Merge branch 'MDL-34591_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 9 Dec 2012 21:41:20 +0000 (10:41 +1300)]
Merge branch 'wip-MDL-35221-MOODLE_23_STABLE' of git://github.com/kwiliarty/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 9 Dec 2012 21:33:33 +0000 (10:33 +1300)]
Merge branch 'wip-MDL-36906-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 9 Dec 2012 21:27:07 +0000 (10:27 +1300)]
Merge branch 'wip-MDL-36915-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 9 Dec 2012 21:23:35 +0000 (10:23 +1300)]
Merge branch 'wip-MDL-37026-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 9 Dec 2012 21:19:22 +0000 (10:19 +1300)]
Merge branch 'MDL-33125_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE
Andreas Grabs [Wed, 5 Dec 2012 11:24:21 +0000 (12:24 +0100)]
MDL-34591 - paypal does not allow unenrol
Mary Evans [Sat, 8 Dec 2012 22:20:05 +0000 (22:20 +0000)]
MDL-36978 theme_standardold: fixes misplaced block region check in layout/frontpage.php which, with hindsight should have been fixed in MDL-23226.
Petr Škoda [Sat, 8 Dec 2012 10:58:05 +0000 (11:58 +0100)]
MDL-35456 use HTTP 1.1 for PayPal IPN
Eloy Lafuente (stronk7) [Sat, 8 Dec 2012 01:55:28 +0000 (02:55 +0100)]
weekly release 2.3.3+
Eloy Lafuente (stronk7) [Sat, 8 Dec 2012 01:49:16 +0000 (02:49 +0100)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
AMOS bot [Fri, 7 Dec 2012 00:40:52 +0000 (00:40 +0000)]
Automatically generated installer lang files
Adrian Greeve [Thu, 6 Dec 2012 02:52:09 +0000 (10:52 +0800)]
MDL-37026 - lib: The function user_can_assign() returns true for admins.
David Mudrák [Wed, 5 Dec 2012 23:03:25 +0000 (00:03 +0100)]
MDL-37003 Fix repeated line in update notification email
There was a problem experienced after 2.4.0 release because the version
of the 2.4.0 release was the same as 2.5dev release. So the version
value matched twice in the loop and the line was repeated in the email.
David Mudrák [Wed, 5 Dec 2012 22:47:54 +0000 (23:47 +0100)]
MDL-36943 Do not notify about already installed updates
Before this patch, the available_update_checker::cron_notifications()
method accessed the availableupdates property. But for plugins, that property
basically contains the most recent version available. So we were missing
the check against the actual version installed.
The fix was simple - obtain available updates via the available_updates()
method that performs the check.
Eloy Lafuente (stronk7) [Mon, 3 Dec 2012 22:26:00 +0000 (23:26 +0100)]
weekly release 2.3.3+
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
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
AMOS bot [Sat, 1 Dec 2012 00:43:07 +0000 (00:43 +0000)]
Automatically generated installer lang files
Tim Hunt [Fri, 30 Nov 2012 11:48:26 +0000 (11:48 +0000)]
MDL-35404 question export: make it work with slasharguments off.
Thanks to Brian King for working out the problem and how to fix it. I am
just committing his patch.
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.
Eloy Lafuente (stronk7) [Fri, 30 Nov 2012 12:25:29 +0000 (13:25 +0100)]
weekly release 2.3.3+
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
Jerome Mouneyrac [Fri, 30 Nov 2012 06:22:16 +0000 (14:22 +0800)]
MDL-30961 get_course_contents: returned activity name should not be check against PARAM_TEXT, it could be anything
Dan Poltawski [Fri, 30 Nov 2012 04:15:51 +0000 (12:15 +0800)]
MDL-36778 course - prevent undefined index warnings
When logged in as a guest the mform didn't set userid.
Dan Poltawski [Fri, 30 Nov 2012 03:44:33 +0000 (11:44 +0800)]
MDL-36887 quiz: reorder upgrade.txt's
Andrew Davis [Tue, 27 Nov 2012 02:04:59 +0000 (10:04 +0800)]
MDL-36761 core_grade:shifted a call to count() out of a loop
Adrian Greeve [Fri, 30 Nov 2012 01:57:45 +0000 (09:57 +0800)]
MDL-36915 - mod/data: A database with no entries no longer displays the export to portfolio button.
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.
Kevin Wiliarty [Tue, 4 Sep 2012 05:50:07 +0000 (01:50 -0400)]
MDL-35221 mod_feedback: replace checkbox with advcheckbox for all requirable feedback question types
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.
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
Adrian Greeve [Thu, 29 Nov 2012 06:43:25 +0000 (14:43 +0800)]
MDL-36906 - mod_data: Latitude and Logitude error fix.
Thanks to Marcus Boon for providing a patch for this issue.
mod/data/field/latlong/kml.php was missing a context variable.
This was causing an error when trying to download a kml file for
google earth. This variable has now been included.
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.
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.
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
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
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
Andrew Davis [Wed, 21 Nov 2012 03:05:16 +0000 (11:05 +0800)]
MDL-36680 core_grade: fixed grade_report::blank_hidden_total() and added unit tests
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
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
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
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
Andrew Robert Nicols [Tue, 27 Nov 2012 14:51:05 +0000 (14:51 +0000)]
MDL-36752 Be more specific about tooltip selectors
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
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(簡文章).
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
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
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
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
Damyon Wiese [Mon, 26 Nov 2012 04:06:40 +0000 (12:06 +0800)]
MDL-36302 course: Set correct URL on settings page for navigation.
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
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
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
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
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
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
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
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
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
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
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
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.
Adam Olley [Wed, 1 Aug 2012 00:09:33 +0000 (09:39 +0930)]
MDL-33125: core_backup: Prevent import/activity duplication from duplicating manual grade items
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
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
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
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
AMOS bot [Sat, 24 Nov 2012 00:42:52 +0000 (00:42 +0000)]
Automatically generated installer lang files
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.
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.
Dan Poltawski [Fri, 23 Nov 2012 07:20:23 +0000 (15:20 +0800)]
weekly release 2.3.3+
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
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
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.
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.
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.
AMOS bot [Thu, 22 Nov 2012 09:05:24 +0000 (09:05 +0000)]
Automatically generated installer lang files
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
Petr Škoda [Wed, 21 Nov 2012 11:40:17 +0000 (12:40 +0100)]
MDL-36753 fix invalid sectionid in backup tests
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
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