Sam Hemelryk [Sun, 20 Nov 2011 23:01:45 +0000 (12:01 +1300)]
Merge branch 'MDL-30309' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 20 Nov 2011 22:53:45 +0000 (11:53 +1300)]
Merge branch 'MDL-30319' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 20 Nov 2011 22:48:47 +0000 (11:48 +1300)]
Merge branch 'w46_MDL-30327_m22_blockconfig' of git://github.com/skodak/moodle
Sam Hemelryk [Sun, 20 Nov 2011 22:30:17 +0000 (11:30 +1300)]
MDL-30359 theme_base Fixed regression with course completion icons
Sam Hemelryk [Sun, 20 Nov 2011 21:28:32 +0000 (10:28 +1300)]
Merge branch 'MDL-30359' of git://github.com/lazydaisy/moodle
Petr Skoda [Sat, 19 Nov 2011 15:56:11 +0000 (16:56 +0100)]
MDL-30327 standardise block deletion process
Mary Evans [Sat, 19 Nov 2011 00:04:41 +0000 (00:04 +0000)]
MDL-30359 Fixes for dir-rtl in theme_base CSS
Eloy Lafuente (stronk7) [Fri, 18 Nov 2011 16:28:53 +0000 (17:28 +0100)]
Merge branch 'MDL-29591-master-2' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Fri, 18 Nov 2011 16:19:59 +0000 (17:19 +0100)]
MDL-20534 lti: B14 - tiny bit, but savepoint tests require that
Eloy Lafuente (stronk7) [Fri, 18 Nov 2011 15:05:22 +0000 (16:05 +0100)]
MDL-20534 lti: B14 - whitespace and comment fixes
Andrew Robert Nicols [Fri, 30 Sep 2011 13:54:24 +0000 (14:54 +0100)]
MDL-29591 Check for permission before overwriting course idnumber when restoring
Eloy Lafuente (stronk7) [Fri, 18 Nov 2011 12:40:16 +0000 (13:40 +0100)]
Merge branch 'MDL-30290' of git://github.com/scriby/moodle
Aparup Banerjee [Fri, 18 Nov 2011 07:34:18 +0000 (15:34 +0800)]
Merge branch 'MDL-30279-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Fri, 18 Nov 2011 00:20:35 +0000 (01:20 +0100)]
on-demand release 2.2beta
Eloy Lafuente (stronk7) [Fri, 18 Nov 2011 00:17:52 +0000 (01:17 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 17 Nov 2011 19:10:02 +0000 (20:10 +0100)]
MDL-29350 Prevent memory/time problems if there are zillions of combinations
Eloy Lafuente (stronk7) [Thu, 17 Nov 2011 16:15:00 +0000 (17:15 +0100)]
Merge branch 'MDL-29350-master-2' of git://git.luns.net.uk/moodle
Chris Scribner [Wed, 16 Nov 2011 16:54:38 +0000 (11:54 -0500)]
MDL-20534 lti: B14 - Implementing "show description on course page"
Mary Evans [Thu, 17 Nov 2011 13:51:30 +0000 (13:51 +0000)]
MDL-30319 changed lang $string Light to Light/Blue in theme_mymobile
Eloy Lafuente (stronk7) [Thu, 17 Nov 2011 09:53:56 +0000 (10:53 +0100)]
Merge branch 'MDL-30182' of git://github.com/timhunt/moodle
Tim Hunt [Thu, 17 Nov 2011 08:02:20 +0000 (08:02 +0000)]
MDL-30182 fix missing include. Sorry.
Charles Fulton [Wed, 16 Nov 2011 12:25:47 +0000 (04:25 -0800)]
MDL-30279 show full date and time for all wiki revisions
Sam Hemelryk [Thu, 17 Nov 2011 01:53:38 +0000 (14:53 +1300)]
Merge branch 'MDL-24577-master-1' of git://git.luns.net.uk/moodle
AMOS bot [Thu, 17 Nov 2011 00:55:25 +0000 (00:55 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Thu, 17 Nov 2011 00:22:22 +0000 (01:22 +0100)]
Merge branch 'MDL-29743' of git://github.com/timhunt/moodle
Sam Hemelryk [Thu, 17 Nov 2011 00:11:46 +0000 (13:11 +1300)]
Merge branch 'MDL-29893-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:45:00 +0000 (00:45 +0100)]
Merge branch 'MDL-30069' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:33:54 +0000 (00:33 +0100)]
Merge branch 'MDL-30122' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:29:18 +0000 (00:29 +0100)]
Merge branch 'MDL-30167' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:18:25 +0000 (00:18 +0100)]
Merge branch 'MDL-30182' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:11:29 +0000 (00:11 +0100)]
Merge branch 'MDL-30186' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:08:18 +0000 (00:08 +0100)]
Merge branch 'MDL-30199' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:05:45 +0000 (00:05 +0100)]
Merge branch 'MDL-30266-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:02:02 +0000 (00:02 +0100)]
Merge branch 'MDL-30209' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:00:12 +0000 (00:00 +0100)]
Merge branch 'MDL-30300' of git://github.com/timhunt/moodle
Nadav Kavalerchik [Wed, 16 Nov 2011 22:28:07 +0000 (11:28 +1300)]
MDL-27516 Several CSS fixes for right to left languages
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 21:51:51 +0000 (22:51 +0100)]
Merge branch 'MDL-30274-master-1' of git://git.luns.net.uk/moodle
Mary Evans [Wed, 16 Nov 2011 21:15:24 +0000 (21:15 +0000)]
MDL-30309 FIX typo in CSS in theme_anomaly
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 20:29:25 +0000 (21:29 +0100)]
Merge branch 'MDL-30275-master' of git://github.com/sammarshallou/moodle
Tim Hunt [Wed, 16 Nov 2011 11:07:35 +0000 (11:07 +0000)]
MDL-30300 qbehaviours: convert to the new is_compatible_question API.
Tim Hunt [Wed, 16 Nov 2011 10:52:19 +0000 (10:52 +0000)]
MDL-30300 question behaviours: improve q compatibility API.
Ankit Kumar Agarwal [Thu, 10 Nov 2011 08:16:43 +0000 (13:46 +0530)]
MDL-29893 Fixing issues with password generation function
Ankit Kumar Agarwal [Wed, 16 Nov 2011 04:17:00 +0000 (09:47 +0530)]
MDL-30279 SCORM Fixing sql errors during cron
AMOS bot [Wed, 16 Nov 2011 00:55:51 +0000 (00:55 +0000)]
Automatically generated installer lang files
sam marshall [Tue, 15 Nov 2011 15:24:08 +0000 (15:24 +0000)]
MDL-30275 Assignment activity description not displayed on course page
Andrew Robert Nicols [Tue, 15 Nov 2011 15:16:47 +0000 (15:16 +0000)]
MDL-30274 Correct typo of loginpage variable
sam marshall [Tue, 15 Nov 2011 10:27:10 +0000 (10:27 +0000)]
MDL-30266 completionlib fix unit test breakage (regression)
Tim Hunt [Wed, 9 Nov 2011 13:56:03 +0000 (13:56 +0000)]
MDL-30182 quiz grade.php should support userid param.
Tim Hunt [Thu, 10 Nov 2011 12:51:24 +0000 (12:51 +0000)]
MDL-30209 quiz refers to wrong rendere method in two places.
Thanks to Dan Marsden for working out the fix.
Tim Hunt [Wed, 9 Nov 2011 12:51:01 +0000 (12:51 +0000)]
MDL-30199 qtype numerical etc. Don't require tolerance for answer *.
Tim Hunt [Tue, 8 Nov 2011 15:57:18 +0000 (15:57 +0000)]
MDL-30186 qtype editing forms should use advcheckbox.
Tim Hunt [Mon, 7 Nov 2011 12:36:19 +0000 (12:36 +0000)]
MDL-30167 qtype_numerical: notice when required unit is not in the answer.
Tim Hunt [Tue, 8 Nov 2011 16:53:15 +0000 (16:53 +0000)]
MDL-30185 question engine reporting: add redundant where to query for perf.
Without this, MySQL fails to cope.
Tim Hunt [Tue, 8 Nov 2011 15:12:58 +0000 (15:12 +0000)]
MDL-30069 Question type icons missing in lots of places.
Henning Bostelmann [Tue, 13 Sep 2011 00:11:19 +0000 (01:11 +0100)]
MDL-29350 Prevent duplication of groupings when copying activities
This patch also includes a database upgrade to correct data produced as a
result of this bug.
Tim Hunt [Wed, 9 Nov 2011 11:45:02 +0000 (11:45 +0000)]
MDL-29743 quiz: Finish attempt link didn't save responses in some brosers.
Thanks to Brandon Browning for identifying the problem. It is quite subtle why this typo would have this effect. You need to look at the implementation of the preventDefault method in lib/yui/3.4.1/build/event-base/event-base.js.
Eloy Lafuente (stronk7) [Tue, 15 Nov 2011 10:04:15 +0000 (11:04 +0100)]
Moodle release 2.2beta
Eloy Lafuente (stronk7) [Tue, 15 Nov 2011 09:58:09 +0000 (10:58 +0100)]
Fix permissions
Eloy Lafuente (stronk7) [Tue, 15 Nov 2011 09:54:40 +0000 (10:54 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
AMOS bot [Tue, 15 Nov 2011 00:55:17 +0000 (00:55 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 22:35:12 +0000 (23:35 +0100)]
MDL-29956 ims-cc - whitespace cleanup
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 20:16:24 +0000 (21:16 +0100)]
MDL-29956 ims-cc - disabling export and cleaning some unused code
This commits cleans some code (settings and dependencies)
and one file included previous by error.
Also it disables all the IMS-CC export feature by default, being
possible to enable it under demand by setting (@ config.php):
$CFG->enablebackupconverters = true;
Darko Miletic [Sun, 6 Nov 2011 17:39:00 +0000 (14:39 -0300)]
Updated text conversion to read and store safe xml strings.
Mark Nielsen [Wed, 26 Oct 2011 17:38:36 +0000 (10:38 -0700)]
MDL-29956: Common Cartridge should handle HTML content more natively (r17188, r17210:17265)
Also implemented support for LTI icon during import.
Mark Nielsen [Wed, 26 Oct 2011 17:33:49 +0000 (10:33 -0700)]
MDL-29956: Implement export of Quiz activity (r16977, r17032)
Mark Nielsen [Wed, 26 Oct 2011 17:14:54 +0000 (10:14 -0700)]
MDL-29956: Implement common cartridge export (r16882)
David Mudrak [Mon, 14 Nov 2011 20:09:52 +0000 (21:09 +0100)]
MDL-29793 Advanced grading - do not execute the restore step if the grading.xml is missing
David Mudrak [Mon, 14 Nov 2011 20:08:06 +0000 (21:08 +0100)]
MDL-29793 Advanced grading backup - fixed the recently renamed DB field
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 11:45:48 +0000 (12:45 +0100)]
MDL-27622 theme_mymobile: add it to core themes
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 11:37:43 +0000 (12:37 +0100)]
Merge branch 'lti' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 11:35:52 +0000 (12:35 +0100)]
MDL-20534 lti: bump version and requires to current before integration, yay!
Sam Hemelryk [Mon, 14 Nov 2011 09:01:05 +0000 (22:01 +1300)]
Merged MDL-29108 Advanced grading
David Mudrak [Mon, 14 Nov 2011 08:20:16 +0000 (00:20 -0800)]
Merge pull request #25 from marinaglancy/wip-nov14-rubric
Dan Marsden [Mon, 14 Nov 2011 08:03:47 +0000 (21:03 +1300)]
MDL-27036 AICC HACP handling - add missing check for correct user with has_capability.
Marina Glancy [Mon, 14 Nov 2011 06:53:14 +0000 (14:53 +0800)]
MDL-29108: added comments, declared functions visibility, renamed variables; also fixed MDL-30240
Marina Glancy [Mon, 14 Nov 2011 06:48:28 +0000 (14:48 +0800)]
MDL-30241: fixing Javascript to work in IE as well
Sam Hemelryk [Mon, 14 Nov 2011 04:49:47 +0000 (17:49 +1300)]
Merge branch 'MDL-28670' of git://github.com/nebgor/moodle
Aparup Banerjee [Mon, 14 Nov 2011 03:25:36 +0000 (11:25 +0800)]
MDL-28670 webservice : (review) changes improving performance
Sam Hemelryk [Sun, 13 Nov 2011 23:10:17 +0000 (12:10 +1300)]
Merge branch 'wip-MDL-30010' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:35:13 +0000 (19:35 +0100)]
Merge branch 'MDL-30026' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:23:53 +0000 (19:23 +0100)]
MDL-30026 improve session lock - stronger detection for oracle
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:06:44 +0000 (19:06 +0100)]
MDL-30026 improve session lock - mssql workaround for bug with scalar returned values
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:05:57 +0000 (19:05 +0100)]
MDL-30026 improve session lock - unit tests & minor comment fixup
AMOS bot [Sun, 13 Nov 2011 14:14:31 +0000 (15:14 +0100)]
Automatically generated installer lang files
David Mudrak [Sun, 13 Nov 2011 13:07:33 +0000 (14:07 +0100)]
MDL-29108 Advanced grading - renaming DB field forminstanceid to instanceid
As a response to Sam's review (7.4)
David Mudrak [Sun, 13 Nov 2011 13:01:57 +0000 (14:01 +0100)]
MDL-29108 Advanced grading - renaming DB fields formid to definitionid
As a response to Sam's review (7.1 and 7.3)
David Mudrak [Sun, 13 Nov 2011 12:50:00 +0000 (13:50 +0100)]
MDL-29108 Remove all associated grading areas when the context is being deleted
AMOS bot [Sun, 13 Nov 2011 00:55:17 +0000 (00:55 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 19:22:41 +0000 (20:22 +0100)]
MDL-27622 theme_mymobile: whitespace fixes
Chris Scribner [Fri, 11 Nov 2011 18:54:54 +0000 (13:54 -0500)]
MDL-20534 lti: A8. Removing locallib.php require from lib.php
Chris Scribner [Fri, 11 Nov 2011 18:47:53 +0000 (13:47 -0500)]
MDL-20534 lti: Updating call to lti_add_instance with 2nd argument.
Chris Scribner [Fri, 11 Nov 2011 18:40:59 +0000 (13:40 -0500)]
MDL-20534 lti: Fixing some language in lti's index.php
Chris Scribner [Fri, 11 Nov 2011 18:34:24 +0000 (13:34 -0500)]
MDL-20534 lti: Getting rid of references to "Basic" LTI in language file
Chris Scribner [Fri, 11 Nov 2011 18:31:09 +0000 (13:31 -0500)]
MDL-20534 lti: A9. Fixing issues with the course tool popup not disappearing.
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 14:47:33 +0000 (15:47 +0100)]
Merge branch 'MDL-30057' of git://github.com/stronk7/moodle
Darko Miletic [Tue, 13 Sep 2011 16:02:17 +0000 (13:02 -0300)]
Added Moodle 1.9 -> Moodle 2 converter
David Mudrak [Fri, 11 Nov 2011 13:16:17 +0000 (14:16 +0100)]
MDL-29108 Orphaned areas are excluded from search results
If for any reason the referenced context does not exist any more, the
forms defined in relevant areas are considered removed (even if their
records still exist in the database).
David Mudrak [Fri, 11 Nov 2011 12:59:04 +0000 (13:59 +0100)]
MDL-29483 The capability to manage grading forms can be overridden at the Assignment module level
David Mudrak [Fri, 11 Nov 2011 12:58:45 +0000 (13:58 +0100)]
MDL-29108 Do not display grading method selector for non-privileged users
The patch checks the required capability before it displays the grading
method selectors in the modform.
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 11:54:11 +0000 (12:54 +0100)]
Merge branch 'MDL-29945' of git://github.com/timhunt/moodle