moodle.git
10 years agoMerge branch 'w41_MDL-29785_m22_tinymce' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 19:24:39 +0000 (21:24 +0200)]
Merge branch 'w41_MDL-29785_m22_tinymce' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-29719-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 10:05:05 +0000 (12:05 +0200)]
Merge branch 'MDL-29719-master' of git://github.com/sammarshallou/moodle

10 years agoMDL-29719 Option to display course shortname alongside fullname on course lists
sam marshall [Mon, 10 Oct 2011 12:50:01 +0000 (13:50 +0100)]
MDL-29719 Option to display course shortname alongside fullname on course lists

10 years agoNOBUG - whitespace fixes (MDL-19488, MDL-27242, MDL-29435)
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 08:19:59 +0000 (10:19 +0200)]
NOBUG - whitespace fixes (MDL-19488, MDL-27242, MDL-29435)

10 years agoMerge branch 'MDL-28170' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 17 Oct 2011 05:52:23 +0000 (18:52 +1300)]
Merge branch 'MDL-28170' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-26953' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 17 Oct 2011 04:37:49 +0000 (17:37 +1300)]
Merge branch 'MDL-26953' of git://github.com/lazydaisy/moodle

10 years agoMerge branch 'MDL-29435' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 17 Oct 2011 04:31:52 +0000 (17:31 +1300)]
Merge branch 'MDL-29435' of git://github.com/mouneyrac/moodle

10 years agoMerge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 17 Oct 2011 04:28:32 +0000 (17:28 +1300)]
Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-28945-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 17 Oct 2011 03:25:33 +0000 (16:25 +1300)]
Merge branch 'MDL-28945-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-29781' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 17 Oct 2011 02:21:45 +0000 (15:21 +1300)]
Merge branch 'MDL-29781' of git://github.com/lazydaisy/moodle

10 years agoMerge branch 'MDL-26893' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 17 Oct 2011 00:54:03 +0000 (13:54 +1300)]
Merge branch 'MDL-26893' of git://github.com/lazydaisy/moodle

10 years agoMerged branch 'MDL-29277' of git://github.com/mouneyrac/moodle.git with improvements
Sam Hemelryk [Mon, 17 Oct 2011 00:18:30 +0000 (13:18 +1300)]
Merged branch 'MDL-29277' of git://github.com/mouneyrac/moodle.git with improvements

10 years agoMDL-28170 environment - add new 2.2 section
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 00:09:46 +0000 (02:09 +0200)]
MDL-28170 environment - add new 2.2 section

nothing changes from 2.1 as far as it was agreed that this will be
the last version supporting 1.9 upgrade. See issue for details.

10 years agoMDL-19488 mod_feedback: Coding style improvement
Sam Hemelryk [Sun, 16 Oct 2011 22:12:33 +0000 (11:12 +1300)]
MDL-19488 mod_feedback: Coding style improvement

10 years agoMerge branch 'MDL-19488_master_wip' of git://github.com/grabs/moodle
Sam Hemelryk [Sun, 16 Oct 2011 22:07:25 +0000 (11:07 +1300)]
Merge branch 'MDL-19488_master_wip' of git://github.com/grabs/moodle

10 years agoMerge branch 'MDL-28219d' of git://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 19:16:38 +0000 (21:16 +0200)]
Merge branch 'MDL-28219d' of git://github.com/bostelm/moodle

10 years agoMerge branch 'MDL-27351' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 17:21:57 +0000 (19:21 +0200)]
Merge branch 'MDL-27351' of git://github.com/nebgor/moodle

10 years agoMerge branch 'MDL-28436' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 17:13:00 +0000 (19:13 +0200)]
Merge branch 'MDL-28436' of git://github.com/nebgor/moodle

10 years agoMDL-29191 wiki - avoid one more username leak
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 17:01:57 +0000 (19:01 +0200)]
MDL-29191 wiki - avoid one more username leak

10 years agoMDL-29191 - Show creator's fullname instead of username
Sun Zhigang [Wed, 31 Aug 2011 08:36:31 +0000 (16:36 +0800)]
MDL-29191 - Show creator's fullname instead of username

10 years agoMDL-29698 Assignment: Fix broken logentry
Stephen Bourget [Fri, 7 Oct 2011 16:17:23 +0000 (12:17 -0400)]
MDL-29698 Assignment: Fix broken logentry

10 years agoMDL-29768 debugstringids new help lang string now used
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 15:51:59 +0000 (17:51 +0200)]
MDL-29768 debugstringids new help lang string now used

10 years agoMerge branch 'MDL-29768-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 15:46:18 +0000 (17:46 +0200)]
Merge branch 'MDL-29768-master' of git://github.com/sammarshallou/moodle

10 years agoMDL-29785 enable TinyMCE on iOS 5 devices
Petr Skoda [Sun, 16 Oct 2011 15:37:12 +0000 (17:37 +0200)]
MDL-29785 enable TinyMCE on iOS 5 devices

10 years agoMerge branch 'MDL-28483-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 15:30:45 +0000 (17:30 +0200)]
Merge branch 'MDL-28483-master' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'MDL-29788-langpack_version' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 15:23:35 +0000 (17:23 +0200)]
Merge branch 'MDL-29788-langpack_version' of git://github.com/mudrd8mz/moodle

10 years agoMDL-29785 import latest TinyMCE 3.4.6
Petr Skoda [Sun, 16 Oct 2011 15:12:39 +0000 (17:12 +0200)]
MDL-29785 import latest TinyMCE 3.4.6

using https://github.com/moodle/custom-tinymce/tree/MOODLE_22_3.4.6 and https://github.com/moodle/custom-tinymce_spellchecker_php/tree/MOODLE_22_2.0.6 customised branches

10 years agoMDL-29788 Fixed the version of installed language packs
David Mudrak [Fri, 14 Oct 2011 21:55:27 +0000 (23:55 +0200)]
MDL-29788 Fixed the version of installed language packs

10 years agoMDL-29781 FIX for side-post-only layout
Mary Evans [Fri, 14 Oct 2011 19:39:36 +0000 (20:39 +0100)]
MDL-29781 FIX for side-post-only layout

10 years agoMDL-29773 prevent negative unix timestamps in the files table
Petr Skoda [Fri, 14 Oct 2011 13:50:27 +0000 (15:50 +0200)]
MDL-29773 prevent negative unix timestamps in the files table

10 years agoMDL-29773 use db debuginfo when file record insertion fails
Petr Skoda [Fri, 14 Oct 2011 13:30:54 +0000 (15:30 +0200)]
MDL-29773 use db debuginfo when file record insertion fails

10 years agoMDL-26953 FIX for side-post-only layout
Mary Evans [Fri, 14 Oct 2011 01:28:03 +0000 (02:28 +0100)]
MDL-26953 FIX for side-post-only layout

10 years agoMDL-28945: Fix course/activity completion reports initial selection broken
Tony Levi [Tue, 16 Aug 2011 02:30:29 +0000 (12:00 +0930)]
MDL-28945: Fix course/activity completion reports initial selection broken

10 years agoMDL-29768 debugstringids option did not do anything
sam marshall [Thu, 13 Oct 2011 11:57:55 +0000 (12:57 +0100)]
MDL-29768 debugstringids option did not do anything

10 years agoMDL-27242 Conditional availability dates should support time as well as day
sam marshall [Tue, 11 Oct 2011 13:50:01 +0000 (14:50 +0100)]
MDL-27242 Conditional availability dates should support time as well as day

Change also adds minor feature to date-time selector so you can specify the time it uses as default when the value is 0 (disabled).

Credit: This feature was developed collaboratively by Charles Fulton, Neill Magill, and me.

10 years agoMDL-19488 - allow the creation of a "Public" feedback
Andreas Grabs [Tue, 11 Oct 2011 20:37:47 +0000 (22:37 +0200)]
MDL-19488 - allow the creation of a "Public" feedback

10 years agoMDL-19488 - allow the creation of a "Public" feedback
Andreas Grabs [Mon, 10 Oct 2011 19:42:29 +0000 (21:42 +0200)]
MDL-19488 - allow the creation of a "Public" feedback

10 years agoMDL-19488 - allow the creation of a "Public" feedback
Andreas Grabs [Sat, 8 Oct 2011 16:21:23 +0000 (18:21 +0200)]
MDL-19488 - allow the creation of a "Public" feedback

10 years agoMDL-27351 Quiz : updated string to reflect validation looking for embedded questions.
Aparup Banerjee [Mon, 10 Oct 2011 02:34:01 +0000 (10:34 +0800)]
MDL-27351 Quiz : updated string to reflect validation looking for embedded questions.

10 years agoMDL-28483 URL adding validation checks and changing field externalurl to not-null
Ankit Kumar Agarwal [Thu, 22 Sep 2011 10:10:48 +0000 (15:40 +0530)]
MDL-28483 URL adding validation checks and changing field externalurl to not-null

10 years agoMDL-28483 URL making url field required
Adrian [Thu, 22 Sep 2011 09:21:32 +0000 (14:51 +0530)]
MDL-28483 URL making url field required

10 years agoMDL-28436 webservice : fixed missing field in query
Aparup Banerjee [Mon, 10 Oct 2011 05:50:01 +0000 (13:50 +0800)]
MDL-28436 webservice : fixed missing field in query

10 years agoMDL-26983 FIX for side-post-only layout
Mary Evans [Thu, 13 Oct 2011 01:43:04 +0000 (02:43 +0100)]
MDL-26983 FIX for side-post-only layout

10 years agoMDL-28219 QE2 adaptive behaviour: fix scores and penalties
Henning Bostelmann [Sat, 8 Oct 2011 22:02:52 +0000 (23:02 +0100)]
MDL-28219 QE2 adaptive behaviour: fix scores and penalties

10 years agoweekly release 2.2dev
Eloy Lafuente (stronk7) [Wed, 12 Oct 2011 21:46:36 +0000 (23:46 +0200)]
weekly release 2.2dev

10 years agoMerge branch 'MDL-29625' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 11 Oct 2011 10:10:51 +0000 (12:10 +0200)]
Merge branch 'MDL-29625' of git://github.com/timhunt/moodle

10 years agoMDL-29625 new helper function get_plugin_list_with_class.
Tim Hunt [Mon, 3 Oct 2011 13:32:34 +0000 (14:32 +0100)]
MDL-29625 new helper function get_plugin_list_with_class.

Based on the existing get_plugin_list_with_function. As part
of implementing this, I refactored out a
get_plugin_list_with_file function, which may also be useful.

10 years agoMerge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solve...
Aparup Banerjee [Tue, 11 Oct 2011 05:37:34 +0000 (13:37 +0800)]
Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solved conflict)

10 years agoMerge branch 'wip-MDL-27278-master' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 11 Oct 2011 03:19:14 +0000 (11:19 +0800)]
Merge branch 'wip-MDL-27278-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-28549-master' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 11 Oct 2011 01:46:16 +0000 (09:46 +0800)]
Merge branch 'wip-MDL-28549-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-28582-master' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 11 Oct 2011 01:26:30 +0000 (09:26 +0800)]
Merge branch 'wip-MDL-28582-master' of git://github.com/samhemelryk/moodle

10 years agoMDL-20306 Add course_category idnumber field: version bump and fix missing add_field...
Eloy Lafuente (stronk7) [Mon, 10 Oct 2011 21:34:27 +0000 (23:34 +0200)]
MDL-20306 Add course_category idnumber field: version bump and fix missing add_field() call

10 years agoMDL-20306 Add course_category idnumber field
Andrew Robert Nicols [Fri, 7 Oct 2011 08:35:17 +0000 (09:35 +0100)]
MDL-20306 Add course_category idnumber field

10 years agoMerge branch 'MDL-29447' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 10 Oct 2011 21:25:33 +0000 (10:25 +1300)]
Merge branch 'MDL-29447' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-29640_master' of git://github.com/kordan/moodle
Sam Hemelryk [Mon, 10 Oct 2011 21:15:46 +0000 (10:15 +1300)]
Merge branch 'MDL-29640_master' of git://github.com/kordan/moodle

10 years agoMerge branch 'wip-MDL-29224-master' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Mon, 10 Oct 2011 15:14:05 +0000 (23:14 +0800)]
Merge branch 'wip-MDL-29224-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-29672-master' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Mon, 10 Oct 2011 14:45:01 +0000 (22:45 +0800)]
Merge branch 'wip-MDL-29672-master' of git://github.com/samhemelryk/moodle

10 years agoMDL-29640 fix for master
Kordan [Mon, 10 Oct 2011 11:19:15 +0000 (13:19 +0200)]
MDL-29640 fix for master

10 years agoMDL-29564 Assignment: whitespace fix
Eloy Lafuente (stronk7) [Mon, 10 Oct 2011 11:08:48 +0000 (13:08 +0200)]
MDL-29564 Assignment: whitespace fix

10 years agoMerge branch 'MDL-16553' of git://github.com/bostelm/moodle
Sam Hemelryk [Mon, 10 Oct 2011 04:56:14 +0000 (17:56 +1300)]
Merge branch 'MDL-16553' of git://github.com/bostelm/moodle

10 years agoMDL-29661 - lib/googleapi.php - Switch to SSL urls
Dan Poltawski [Thu, 6 Oct 2011 11:46:11 +0000 (12:46 +0100)]
MDL-29661 - lib/googleapi.php - Switch to SSL urls

I am not sure why I did not use these in the first instance, I don't
think Google supported SSL in the first versions of their API.

They do now, and it seems that this week they stopped supporting non-ssl
requests.

10 years agoMDL-29692 enrol: cohort: Fix default role issue in Chrome
Ruslan Kabalin [Fri, 7 Oct 2011 09:21:47 +0000 (10:21 +0100)]
MDL-29692 enrol: cohort: Fix default role issue in Chrome

This is related to MDL-24280, the issue still persists in Chrome. The patch
fixes it for Chrome and works fine for the most major browsers.

10 years agoMerge branch 'w40_MDL-29686_m2_yuicaching' of git://github.com/skodak/moodle
Sam Hemelryk [Sun, 9 Oct 2011 23:20:38 +0000 (12:20 +1300)]
Merge branch 'w40_MDL-29686_m2_yuicaching' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-29668' of git://github.com/stronk7/moodle
Sam Hemelryk [Sun, 9 Oct 2011 23:09:34 +0000 (12:09 +1300)]
Merge branch 'MDL-29668' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-29677' of git://github.com/stronk7/moodle
Sam Hemelryk [Sun, 9 Oct 2011 23:03:39 +0000 (12:03 +1300)]
Merge branch 'MDL-29677' of git://github.com/stronk7/moodle

10 years agoMDL-29564 Assignment: Fixed a fatal error caused by a missing include
Stephen Bourget [Tue, 4 Oct 2011 17:44:59 +0000 (13:44 -0400)]
MDL-29564 Assignment: Fixed a fatal error caused by a missing include

10 years agoMerge branch 'master_MDL-29690' of git://github.com/danmarsden/moodle
Sam Hemelryk [Sun, 9 Oct 2011 22:24:44 +0000 (11:24 +1300)]
Merge branch 'master_MDL-29690' of git://github.com/danmarsden/moodle

10 years agoMDL-27058 navigation: Added a setting to control whether user forum links are added
Sam Hemelryk [Thu, 6 Oct 2011 01:00:13 +0000 (14:00 +1300)]
MDL-27058 navigation: Added a setting to control whether user forum links are added

10 years agoMDL-28582 course-report: Added a nothing to display notification to the outline and...
Sam Hemelryk [Thu, 6 Oct 2011 02:23:19 +0000 (15:23 +1300)]
MDL-28582 course-report: Added a nothing to display notification to the outline and complete activity reports

10 years agoMDL-28549 navigation: Added a missing login check when adding the calendar link to...
Sam Hemelryk [Wed, 5 Oct 2011 23:13:13 +0000 (12:13 +1300)]
MDL-28549 navigation: Added a missing login check when adding the calendar link to the navigation

10 years agoMDL-29672 user: Fixed user edit page for non-admin users
Sam Hemelryk [Thu, 6 Oct 2011 01:19:03 +0000 (14:19 +1300)]
MDL-29672 user: Fixed user edit page for non-admin users

10 years agoMDL-27278 navigation: Admin users can now set the home page preference like normal...
Sam Hemelryk [Sun, 9 Oct 2011 21:17:00 +0000 (10:17 +1300)]
MDL-27278 navigation: Admin users can now set the home page preference like normal users

10 years agoemergency release 2.2dev
Eloy Lafuente (stronk7) [Sun, 9 Oct 2011 20:40:35 +0000 (22:40 +0200)]
emergency release 2.2dev

10 years agoMDL-29520 - mysql multitable delete, outer join some tables
Eloy Lafuente (stronk7) [Sun, 9 Oct 2011 20:15:27 +0000 (22:15 +0200)]
MDL-29520 - mysql multitable delete, outer join some tables

10 years agoMDL-29668 xmldb editor - fix PHP generation for foreign-unique keys
Eloy Lafuente (stronk7) [Sat, 8 Oct 2011 19:49:56 +0000 (21:49 +0200)]
MDL-29668 xmldb editor - fix PHP generation for foreign-unique keys

10 years agoMDL-16553 Assignment, student view: show response files when no grade available
Henning Bostelmann [Sat, 20 Aug 2011 19:17:44 +0000 (20:17 +0100)]
MDL-16553 Assignment, student view: show response files when no grade available

10 years agoMDL-29690 fix usage of select all/deselect all in choice reports
Dan Marsden [Fri, 7 Oct 2011 08:41:35 +0000 (21:41 +1300)]
MDL-29690 fix usage of select all/deselect all in choice reports

10 years agoMDL-29277 when validate externallib function parameters or return values, build the...
Jerome Mouneyrac [Fri, 7 Oct 2011 08:06:19 +0000 (16:06 +0800)]
MDL-29277 when validate externallib function parameters or return values, build the path to the error into the debuginfo. This patch also revert the exception to the original invalid_parameter_exception and invalid_response_exception

10 years agoMDL-29686 obey caching setting for moodle yui modules
Petr Skoda [Fri, 7 Oct 2011 06:40:42 +0000 (08:40 +0200)]
MDL-29686 obey caching setting for moodle yui modules

10 years agoMDL-29435 SOAP/XMLRPC server return debuginfo into the exception message when DEBUG...
Jerome Mouneyrac [Fri, 7 Oct 2011 06:21:41 +0000 (14:21 +0800)]
MDL-29435 SOAP/XMLRPC server return debuginfo into the exception message when DEBUG >= NORMAL

10 years agoMDL-29677 unit tests - missing global was causing tons of incorrect debugging info
Eloy Lafuente (stronk7) [Wed, 5 Oct 2011 23:19:43 +0000 (01:19 +0200)]
MDL-29677 unit tests - missing global was causing tons of incorrect debugging info

10 years agoweekly release 2.2dev
Eloy Lafuente (stronk7) [Thu, 6 Oct 2011 22:09:23 +0000 (00:09 +0200)]
weekly release 2.2dev

10 years agofix permissions
Eloy Lafuente (stronk7) [Thu, 6 Oct 2011 22:07:15 +0000 (00:07 +0200)]
fix permissions

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 6 Oct 2011 22:04:52 +0000 (00:04 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoMDL-29224 navigation: Navigation now respects a modules onclick event when preparing...
Sam Hemelryk [Thu, 6 Oct 2011 06:32:27 +0000 (19:32 +1300)]
MDL-29224 navigation: Navigation now respects a modules onclick event when preparing navigation nodes

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 6 Oct 2011 00:55:31 +0000 (00:55 +0000)]
Automatically generated installer lang files

10 years agoMDL-29089 gradebook: fixed incorrect precision
Aparup Banerjee [Wed, 5 Oct 2011 07:14:27 +0000 (15:14 +0800)]
MDL-29089 gradebook: fixed incorrect precision

10 years agoMerge branch 'wip-MDL-28615-master-squashed' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Wed, 5 Oct 2011 02:54:05 +0000 (10:54 +0800)]
Merge branch 'wip-MDL-28615-master-squashed' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-28469' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2011 23:13:57 +0000 (01:13 +0200)]
Merge branch 'MDL-28469' of git://github.com/timhunt/moodle

10 years agoMerge branch 'wip-MDL-25697-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2011 23:10:03 +0000 (01:10 +0200)]
Merge branch 'wip-MDL-25697-master' of git://github.com/samhemelryk/moodle

10 years agoMDL-28615 forum: Fixed up a couple of minor regressions
Sam Hemelryk [Tue, 4 Oct 2011 22:08:50 +0000 (11:08 +1300)]
MDL-28615 forum: Fixed up a couple of minor regressions

10 years agoMDL-29447 quiz course reset does not reset the quiz_grades table.
Tim Hunt [Tue, 4 Oct 2011 21:47:32 +0000 (22:47 +0100)]
MDL-29447 quiz course reset does not reset the quiz_grades table.

Thank to Jean-Michel Vedrine for working out the basic idea of the fix.

10 years agoMerge branch 'MDL-29644' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2011 21:34:15 +0000 (23:34 +0200)]
Merge branch 'MDL-29644' of git://github.com/timhunt/moodle

10 years agoMDL-29644 qtype multianswer, hints lost doing Moodle XML export.
Tim Hunt [Tue, 4 Oct 2011 15:50:15 +0000 (16:50 +0100)]
MDL-29644 qtype multianswer, hints lost doing Moodle XML export.

This commit also includes a lot of useful tidying up of some of the unit
test helper code. I turned out that I could not use all the helper code
in my new tests, but despite that it will be useful in the future, so I
am committing it here.

10 years agoMerge branch 'MDL-29089_grade_history_missing_columns2' of git://github.com/andyjdavi...
Aparup Banerjee [Tue, 4 Oct 2011 18:44:28 +0000 (02:44 +0800)]
Merge branch 'MDL-29089_grade_history_missing_columns2' of git://github.com/andyjdavis/moodle.git (resolved version.php conflicts)

10 years agoMerge branch 'MDL-27857-assignment-portfolio' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2011 10:42:32 +0000 (12:42 +0200)]
Merge branch 'MDL-27857-assignment-portfolio' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-29548' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2011 10:31:34 +0000 (12:31 +0200)]
Merge branch 'MDL-29548' of git://github.com/timhunt/moodle

10 years agoMDL-29548 allow message plugins to control message
Tim Hunt [Tue, 27 Sep 2011 17:05:38 +0000 (18:05 +0100)]
MDL-29548 allow message plugins to control message
defaults.

At the moment, each message_provider can specify defaults for
each message output, to say whether that message output should be
used for this type of message:
http://docs.moodle.org/dev/Messaging_2.0#Adding_new_message_type.

If the message provider does not set a default, this change allows
the message output to set the default.

10 years agoMerge branch 'MDL-19575-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 4 Oct 2011 10:12:08 +0000 (12:12 +0200)]
Merge branch 'MDL-19575-master' of git://github.com/ankitagarwal/moodle

10 years agoMDL-29520 question engine: work-around bad MySQL delete performance.
Tim Hunt [Fri, 30 Sep 2011 10:31:04 +0000 (11:31 +0100)]
MDL-29520 question engine: work-around bad MySQL delete performance.

This is a temporary fix, until the new API from MDL-29589 is available.

(amended to fix comments)