moodle.git
9 years agoMerge branch 'master_MDL-31085' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 13 Feb 2012 04:52:48 +0000 (17:52 +1300)]
Merge branch 'master_MDL-31085' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-31502-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 13 Feb 2012 04:48:12 +0000 (17:48 +1300)]
Merge branch 'MDL-31502-master-2' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'wip-MDL-25185-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 13 Feb 2012 04:34:50 +0000 (17:34 +1300)]
Merge branch 'wip-MDL-25185-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'wip-MDL-31396-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 13 Feb 2012 04:15:56 +0000 (17:15 +1300)]
Merge branch 'wip-MDL-31396-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'wip-MDL-31463-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 13 Feb 2012 04:02:45 +0000 (17:02 +1300)]
Merge branch 'wip-MDL-31463-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'wip-mdl-31576' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 13 Feb 2012 02:29:43 +0000 (15:29 +1300)]
Merge branch 'wip-mdl-31576' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'wip-mdl-31529' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 13 Feb 2012 02:28:26 +0000 (15:28 +1300)]
Merge branch 'wip-mdl-31529' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-31554' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 13 Feb 2012 02:26:06 +0000 (15:26 +1300)]
Merge branch 'MDL-31554' of git://github.com/timhunt/moodle

9 years agoMDL-31529 csslib: third param passed to css_store_css fixed
Rajesh Taneja [Tue, 7 Feb 2012 05:54:54 +0000 (13:54 +0800)]
MDL-31529 csslib: third param passed to css_store_css fixed

9 years agoMDL-31576 core: Duplicate message definition removed from get_core_subsystem
Rajesh Taneja [Thu, 9 Feb 2012 09:09:29 +0000 (17:09 +0800)]
MDL-31576 core: Duplicate message definition removed from get_core_subsystem

9 years agoMerge branch 'MDL-25883-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Mon, 13 Feb 2012 01:35:19 +0000 (14:35 +1300)]
Merge branch 'MDL-25883-master' of https://github.com/mackensen/moodle

9 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Mon, 13 Feb 2012 00:17:41 +0000 (01:17 +0100)]
weekly release 2.3dev

9 years agoRevert "MDL-31345 theme_afterburner fixes pagelayout-report overflow"
Eloy Lafuente (stronk7) [Sun, 12 Feb 2012 22:19:20 +0000 (23:19 +0100)]
Revert "MDL-31345 theme_afterburner fixes pagelayout-report overflow"

This reverts commit 5d24254a9ded2c9a20304ecf0ecbfa3ef08f91d6.

9 years agoMDL-31463 - navigation - added a context check in the navigation for fullname permission.
Adrian Greeve [Fri, 3 Feb 2012 03:38:50 +0000 (11:38 +0800)]
MDL-31463 - navigation - added a context check in the navigation for fullname permission.

9 years agoMerge branch 'wip-MDL-31417-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Thu, 9 Feb 2012 01:43:54 +0000 (09:43 +0800)]
Merge branch 'wip-MDL-31417-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-25185 - data - Allowing data from the database to be exported according to group...
Adrian Greeve [Mon, 30 Jan 2012 07:52:20 +0000 (15:52 +0800)]
MDL-25185 - data - Allowing data from the database to be exported according to group roles.

9 years agoMerge branch 'MDL-30983' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Wed, 8 Feb 2012 16:04:53 +0000 (17:04 +0100)]
Merge branch 'MDL-30983' of git://github.com/rwijaya/moodle

9 years agoMDL-31554 quiz view.php notices when guest / no enroled.
Tim Hunt [Wed, 8 Feb 2012 15:39:26 +0000 (15:39 +0000)]
MDL-31554 quiz view.php notices when guest / no enroled.

9 years agoMerge branch 'wip-mdl-30980' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 8 Feb 2012 12:18:49 +0000 (13:18 +0100)]
Merge branch 'wip-mdl-30980' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-27891 tag logs: minibump version
Eloy Lafuente (stronk7) [Wed, 8 Feb 2012 10:43:40 +0000 (11:43 +0100)]
MDL-27891 tag logs: minibump version

9 years agoMerge branch 'MDL-27891-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 8 Feb 2012 10:36:21 +0000 (11:36 +0100)]
Merge branch 'MDL-27891-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Wed, 8 Feb 2012 10:13:53 +0000 (11:13 +0100)]
Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-31316-master-4' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 8 Feb 2012 10:07:55 +0000 (11:07 +0100)]
Merge branch 'MDL-31316-master-4' of git://git.luns.net.uk/moodle

9 years agoMDL-31316 Fix block controls when default home is My Moodle
Ruslan Kabalin [Fri, 20 Jan 2012 16:01:03 +0000 (16:01 +0000)]
MDL-31316 Fix block controls when default home is My Moodle

9 years agoMDL-31345 theme_afterburner fixes pagelayout-report overflow
Mary Evans [Wed, 8 Feb 2012 03:52:15 +0000 (03:52 +0000)]
MDL-31345 theme_afterburner fixes pagelayout-report overflow

9 years agoMerge branch 'MDL-31407' of git://github.com/timhunt/moodle
Aparup Banerjee [Wed, 8 Feb 2012 03:25:44 +0000 (11:25 +0800)]
Merge branch 'MDL-31407' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-29892_overview_hidden' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Wed, 8 Feb 2012 02:38:36 +0000 (03:38 +0100)]
Merge branch 'MDL-29892_overview_hidden' of git://github.com/andyjdavis/moodle

9 years agoMDL-27891 Tags Flagging tags is now logged
Ankit Agarwal [Tue, 31 Jan 2012 06:01:23 +0000 (11:31 +0530)]
MDL-27891 Tags Flagging tags is now logged

9 years agoMerge branch 'master_MDL-31461' of git://github.com/danmarsden/moodle
Aparup Banerjee [Wed, 8 Feb 2012 02:12:20 +0000 (10:12 +0800)]
Merge branch 'master_MDL-31461' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-31482-master' of git://github.com/sammarshallou/moodle
Aparup Banerjee [Wed, 8 Feb 2012 01:57:55 +0000 (09:57 +0800)]
Merge branch 'MDL-31482-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'MDL-30722_forum_unsubscribe' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Wed, 8 Feb 2012 01:37:11 +0000 (02:37 +0100)]
Merge branch 'MDL-30722_forum_unsubscribe' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'wip-MDL-30540-master' of git://github.com/phalacee/moodle
Eloy Lafuente (stronk7) [Wed, 8 Feb 2012 00:17:51 +0000 (01:17 +0100)]
Merge branch 'wip-MDL-30540-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'MDL-26384-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 7 Feb 2012 23:48:32 +0000 (00:48 +0100)]
Merge branch 'MDL-26384-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-27360' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Tue, 7 Feb 2012 22:49:01 +0000 (23:49 +0100)]
Merge branch 'MDL-27360' of git://github.com/mouneyrac/moodle

9 years agoMDL-31482 Lib: IE8/IE7 (even with stupid user agent) should not be 'legacy' device...
sam marshall [Thu, 2 Feb 2012 13:49:35 +0000 (13:49 +0000)]
MDL-31482 Lib: IE8/IE7 (even with stupid user agent) should not be 'legacy' device type

9 years agoMDL-31502 Check whether a category has subcategories or courses within it before...
Andrew Robert Nicols [Mon, 6 Feb 2012 11:59:07 +0000 (11:59 +0000)]
MDL-31502 Check whether a category has subcategories or courses within it before using those variables

9 years agoMerge branch 'MDL-31469' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 7 Feb 2012 07:11:43 +0000 (15:11 +0800)]
Merge branch 'MDL-31469' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-31445' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 7 Feb 2012 07:02:32 +0000 (15:02 +0800)]
Merge branch 'MDL-31445' of git://github.com/timhunt/moodle

9 years agoMDL-30980 core: Php document updated for string api
Rajesh Taneja [Thu, 12 Jan 2012 07:01:18 +0000 (15:01 +0800)]
MDL-30980 core: Php document updated for string api

9 years agoMerge branch 'MDL-31491_master' of git://github.com/kordan/moodle
Aparup Banerjee [Tue, 7 Feb 2012 06:10:26 +0000 (14:10 +0800)]
Merge branch 'MDL-31491_master' of git://github.com/kordan/moodle

9 years agoMDL-31985 - fix quotes in filter
Dan Marsden [Mon, 9 Jan 2012 23:55:52 +0000 (12:55 +1300)]
MDL-31985 - fix quotes in filter

9 years agoMDL-31417: updated list of world currencies
Marina Glancy [Wed, 1 Feb 2012 02:23:16 +0000 (10:23 +0800)]
MDL-31417: updated list of world currencies

Some countries do not exist any more, some currencies do not exist. Some countries (and currencies) started to exist recently. Some currency codes are changed (mistype or result of denomination).

Also I tried to keep the moodle formation of the name of the currencies. The first word is not the country name but the 'belonging-to-country', i.e. not 'Sweden Krona' but 'Swedish Krona'. For some countries it was not so easy to find the correct spelling.

And finally there were some mistakes in the list, like 'Schilling' instead of 'Shilling', 'Riyal' instead of 'Rial', etc. I used currencies spelling from ISO.

9 years agowip-MDL-31396 - data - Exporting a preset as a zip code changed to remove errors.
Adrian Greeve [Thu, 2 Feb 2012 23:59:52 +0000 (07:59 +0800)]
wip-MDL-31396 - data - Exporting a preset as a zip code changed to remove errors.

9 years agoadded mandatory lines to formal_white report layout
Kordan [Fri, 3 Feb 2012 07:24:29 +0000 (08:24 +0100)]
added mandatory lines to formal_white report layout

9 years agoMDL-26384 Tags Fixed redirect issue when editing is toggled
Ankit Agarwal [Thu, 2 Feb 2012 05:07:59 +0000 (10:37 +0530)]
MDL-26384 Tags Fixed redirect issue when editing is toggled

9 years agoMDL-30540 - BLOG - Fixing context problems for single blog entries - Thanks Aparup...
Jason Fowler [Fri, 9 Dec 2011 07:02:44 +0000 (15:02 +0800)]
MDL-30540 - BLOG - Fixing context problems for single blog entries - Thanks Aparup and Sam for the help

9 years agoMDL-29892 grade: added a check to prevent hidden courses appearing on student overvie...
Andrew Davis [Mon, 23 Jan 2012 07:07:32 +0000 (14:07 +0700)]
MDL-29892 grade: added a check to prevent hidden courses appearing on student overview reports

9 years agoMDL-31461 Plagiarism - adjust api functions to allow better support for renderers
Dan Marsden [Wed, 1 Feb 2012 07:56:52 +0000 (20:56 +1300)]
MDL-31461 Plagiarism - adjust api functions to allow better support for renderers

9 years agoMDL-31469 formslib: fix invalid for="" attributes on optional dates
Tim Hunt [Wed, 1 Feb 2012 12:17:31 +0000 (12:17 +0000)]
MDL-31469 formslib: fix invalid for="" attributes on optional dates

9 years agoMDL-31445 formslib: add a nice id and class to the wrapper div for CSS
Anthony Forth [Tue, 31 Jan 2012 17:10:51 +0000 (17:10 +0000)]
MDL-31445 formslib: add a nice id and class to the wrapper div for CSS

9 years agoMDL-31407 quiz: review all uses of global $USER
Tim Hunt [Mon, 30 Jan 2012 17:47:11 +0000 (17:47 +0000)]
MDL-31407 quiz: review all uses of global $USER

9 years agoMDL-31407 quiz: finish_attempt method should not rely on $USER
Kyle Temkin [Mon, 30 Jan 2012 17:45:49 +0000 (17:45 +0000)]
MDL-31407 quiz: finish_attempt method should not rely on $USER

9 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Thu, 2 Feb 2012 11:12:25 +0000 (12:12 +0100)]
weekly release 2.3dev

9 years agoMDL-27360 Web service tokens are displayed for deleted users
Jerome Mouneyrac [Thu, 2 Feb 2012 07:34:05 +0000 (15:34 +0800)]
MDL-27360 Web service tokens are displayed for deleted users

9 years agoMerge branch 'master_MDL-31360' of git://github.com/danmarsden/moodle
Aparup Banerjee [Thu, 2 Feb 2012 03:22:58 +0000 (11:22 +0800)]
Merge branch 'master_MDL-31360' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-29615_control_override_email2' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Wed, 1 Feb 2012 12:17:08 +0000 (13:17 +0100)]
Merge branch 'MDL-29615_control_override_email2' of git://github.com/andyjdavis/moodle

9 years agoMDL-31360 use extra param in get_in_or_equal - one less line of code...
Dan Marsden [Wed, 1 Feb 2012 10:09:49 +0000 (23:09 +1300)]
MDL-31360 use extra param in get_in_or_equal - one less line of code...

9 years agoMDL-28522 Choice : View reports now correctly shows unanswered column - thanks to...
Dan Marsden [Wed, 25 Jan 2012 07:03:11 +0000 (20:03 +1300)]
MDL-28522 Choice : View reports now correctly shows unanswered column - thanks to Marcus Boon for the patch

9 years agoMDL-29615 message: reversed the default for messagingallowemailoverride and added...
Andrew Davis [Wed, 1 Feb 2012 02:26:53 +0000 (09:26 +0700)]
MDL-29615 message: reversed the default for messagingallowemailoverride and added upgrade code so upgraded sites maintain consistent behaviour

9 years agoMerge branch 'MDL-31267' of git://github.com/epsd/moodle
Eloy Lafuente (stronk7) [Wed, 1 Feb 2012 00:03:21 +0000 (01:03 +0100)]
Merge branch 'MDL-31267' of git://github.com/epsd/moodle

9 years agoMerge branch 'wip-MDL-31160-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 23:53:16 +0000 (00:53 +0100)]
Merge branch 'wip-MDL-31160-m23' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'wip-MDL-31197-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 23:48:47 +0000 (00:48 +0100)]
Merge branch 'wip-MDL-31197-m23' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'master_MDL-31039' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 23:41:25 +0000 (00:41 +0100)]
Merge branch 'master_MDL-31039' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-31000-master-3' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 23:25:05 +0000 (00:25 +0100)]
Merge branch 'MDL-31000-master-3' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-31448_incorrect-comment' of https://github.com/ncsu-delta/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 22:57:32 +0000 (23:57 +0100)]
Merge branch 'MDL-31448_incorrect-comment' of https://github.com/ncsu-delta/moodle

9 years agoMDL-30714 theme_afterburner: better, output the information, LOL
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 22:36:35 +0000 (23:36 +0100)]
MDL-30714 theme_afterburner: better, output the information, LOL

9 years agoMDL-30714 theme_afterburner: logo link to home page
Mary Evans [Wed, 25 Jan 2012 01:20:46 +0000 (01:20 +0000)]
MDL-30714 theme_afterburner: logo link to home page

9 years agoMDL-31448 Replaced incorrect PHP comment
Glenn Ansley [Tue, 31 Jan 2012 19:39:23 +0000 (14:39 -0500)]
MDL-31448 Replaced incorrect PHP comment

9 years agoMerge branch 'MDL-31015-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 18:44:21 +0000 (19:44 +0100)]
Merge branch 'MDL-31015-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'MDL-30854' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 18:30:58 +0000 (19:30 +0100)]
Merge branch 'MDL-30854' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-30484' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 16:16:04 +0000 (17:16 +0100)]
Merge branch 'MDL-30484' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-31314' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 16:06:01 +0000 (17:06 +0100)]
Merge branch 'MDL-31314' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-30828_feedback_sort' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 31 Jan 2012 08:48:59 +0000 (16:48 +0800)]
Merge branch 'MDL-30828_feedback_sort' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-30707_forum_log' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 31 Jan 2012 08:43:28 +0000 (16:43 +0800)]
Merge branch 'MDL-30707_forum_log' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-29097_mod_update_create' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 31 Jan 2012 06:21:14 +0000 (14:21 +0800)]
Merge branch 'MDL-29097_mod_update_create' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-31426' of git://github.com/stronk7/moodle
Aparup Banerjee [Tue, 31 Jan 2012 03:51:14 +0000 (11:51 +0800)]
Merge branch 'MDL-31426' of git://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-31428' of git://github.com/stronk7/moodle
Aparup Banerjee [Tue, 31 Jan 2012 03:15:26 +0000 (11:15 +0800)]
Merge branch 'MDL-31428' of git://github.com/stronk7/moodle

9 years agoMDL-30707 mod_forum: fixed a add_to_log() call that was causing invalid URLs to be...
Andrew Davis [Thu, 29 Dec 2011 09:20:39 +0000 (16:20 +0700)]
MDL-30707 mod_forum: fixed a add_to_log() call that was causing invalid URLs to be added to the log

9 years agoMDL-30828 mod_feedback: fixed sorting when viewing responses
Andrew Davis [Wed, 28 Dec 2011 08:28:17 +0000 (15:28 +0700)]
MDL-30828 mod_feedback: fixed sorting when viewing responses

9 years agoMDL-30722 mod_forum: prevented users being auto-logged in as guest when they access...
Andrew Davis [Fri, 23 Dec 2011 05:28:08 +0000 (12:28 +0700)]
MDL-30722 mod_forum: prevented users being auto-logged in as guest when they access /mod/forum/unsubscribeall.php

9 years agoMDL-29615 message: added the ability for admins to restrict users ability to set...
Andrew Davis [Mon, 23 Jan 2012 03:27:47 +0000 (10:27 +0700)]
MDL-29615 message: added the ability for admins to restrict users ability to set where their email message notifications go

9 years agoMDL-29097 course: refactored to avoid having two seperate calls to events_trigger()
Andrew Davis [Fri, 30 Dec 2011 03:56:22 +0000 (10:56 +0700)]
MDL-29097 course: refactored to avoid having two seperate calls to events_trigger()

9 years agoMDL-31428 forum: prevent some warnings with debug enabled
Eloy Lafuente (stronk7) [Mon, 30 Jan 2012 23:22:32 +0000 (00:22 +0100)]
MDL-31428 forum: prevent some warnings with debug enabled

9 years agoMDL-31426 forum: don't show/allow any subscription to not enrolled users
Eloy Lafuente (stronk7) [Mon, 30 Jan 2012 22:20:03 +0000 (23:20 +0100)]
MDL-31426 forum: don't show/allow any subscription to not enrolled users

9 years agoMDL-30484 question engine: don't lose response files when regrading.
Tim Hunt [Mon, 16 Jan 2012 18:29:52 +0000 (18:29 +0000)]
MDL-30484 question engine: don't lose response files when regrading.

The problem was mostly that, in the past, we did not worry if
question_attempt_step.id changed during regrade (because we deleted the
old step row and inserted a new one). However, now that steps can have
associated files, we can't be that slack, becuase the step id is used as
the file itemid.

So, now, we have to update the existing rows during a regrade. We do
this by having the question engine tell the question_engine_unit_of_work
that the step has first been deleted, and then added back. Then we make
the unit-of-work spot that delete + add = update.

This also means that during regrading, we have to pass around some extra
ids so that new steps know the id of the step they are replacing.

Naturally, this requires some quite trickly logic, so I finally got
around to writing unit tests for question_engine_unit_of_work, which is
a good thing.

Along the way I also got around to renaming
question_attempt->set_number_in_usage, which got missed out when
everthing else was renamed to slot ages ago.

Finally, while working on this code, I noticed and fixed some PHPdoc
comments.

9 years agoMDL-30854 quiz/question editing: fix create calc question & add on page.
Tim Hunt [Wed, 18 Jan 2012 16:47:45 +0000 (16:47 +0000)]
MDL-30854 quiz/question editing: fix create calc question & add on page.

This was one of those innocent seeming issues where, once you start
digging, you find a mess. In this case, the code that is now in
question_wizard_form::add_hidden_fields used to exist in four different
places, in four inconsistent versions. This is now all nicely
re-factored, and that solves the problem.

Along the way, I found and fixed some wrong string references in
qtype_random, and stripped out some unnecessary &s in function
declarations.

9 years agoMDL-31314 gradebook restore: fix category.depth on restore.
Tim Hunt [Fri, 20 Jan 2012 15:53:05 +0000 (15:53 +0000)]
MDL-31314 gradebook restore: fix category.depth on restore.

Without this, restoring backups made with the OU's custom 'restore from
1.9' feature, and possibly other people's custom converstion code, does
not work properly.

Also, fix poor recordset code.

9 years agoMerge branch 'MDL-26260' of git://github.com/timhunt/moodle
Aparup Banerjee [Mon, 30 Jan 2012 08:23:54 +0000 (16:23 +0800)]
Merge branch 'MDL-26260' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-31311-Fix_iframe_titles' of git://github.com/ncsu-delta/moodle
Aparup Banerjee [Mon, 30 Jan 2012 07:52:50 +0000 (15:52 +0800)]
Merge branch 'MDL-31311-Fix_iframe_titles' of git://github.com/ncsu-delta/moodle

9 years agoMDL-30983 calendar: updated phpdocs for calendar/lib.php
Rossiani Wijaya [Fri, 13 Jan 2012 09:45:55 +0000 (17:45 +0800)]
MDL-30983 calendar: updated phpdocs for calendar/lib.php

9 years agoMerge branch 'MDL-31319' of git://github.com/mackensen/moodle
Aparup Banerjee [Mon, 30 Jan 2012 07:01:53 +0000 (15:01 +0800)]
Merge branch 'MDL-31319' of git://github.com/mackensen/moodle

9 years agoMerge branch 'MDL-31392' of git://github.com/timhunt/moodle
Aparup Banerjee [Mon, 30 Jan 2012 06:24:31 +0000 (14:24 +0800)]
Merge branch 'MDL-31392' of git://github.com/timhunt/moodle

9 years agoMDL-31015 File/URL resource 'Open' and 'Force download' options should work consistently
sam marshall [Wed, 4 Jan 2012 11:44:18 +0000 (11:44 +0000)]
MDL-31015 File/URL resource 'Open' and 'Force download' options should work consistently

9 years agoMDL-31311 Enhance unhelpful iframe title attributes
Glenn Ansley [Fri, 27 Jan 2012 15:22:59 +0000 (10:22 -0500)]
MDL-31311 Enhance unhelpful iframe title attributes

9 years agoMDL-31317 original_site_identifier_hash falls back to null during the backup conversion
David Mudrak [Thu, 26 Jan 2012 13:09:04 +0000 (14:09 +0100)]
MDL-31317 original_site_identifier_hash falls back to null during the backup conversion

Even if the site identifier is not defined in the source 1.9 backup then the
converted 2.0 version should still contain the element to prevent PHP
notices on direct assignment.

9 years agoMerge branch 'master' of git://github.com/moodle/moodle
Kordan [Fri, 27 Jan 2012 07:25:02 +0000 (08:25 +0100)]
Merge branch 'master' of git://github.com/moodle/moodle

9 years agoSCORM AICC MDL-31039 update external AICC url correctly - thanks to Albert Rhemrev...
Dan Marsden [Thu, 26 Jan 2012 08:42:06 +0000 (21:42 +1300)]
SCORM AICC MDL-31039 update external AICC url correctly - thanks to Albert Rhemrev for report/fix

9 years agoMDL-31360 Don't use get_in_or_equal if array is empty, tidy up structure of $extracap...
Dan Marsden [Wed, 25 Jan 2012 02:21:37 +0000 (15:21 +1300)]
MDL-31360 Don't use get_in_or_equal if array is empty, tidy up structure of $extracaps array

9 years agoweekly release 2.3dev (blame stronk7 for 0202 mistake)
Eloy Lafuente (stronk7) [Fri, 27 Jan 2012 01:27:25 +0000 (02:27 +0100)]
weekly release 2.3dev (blame stronk7 for 0202 mistake)

On 20120102 version was incorrectly bumped to 2012-02-02. So,
until then (< 1mo) we are going to be incrementing decimal digits
only and not date ones (first 8).

9 years agofix permissions
Eloy Lafuente (stronk7) [Fri, 27 Jan 2012 01:19:54 +0000 (02:19 +0100)]
fix permissions