moodle.git
11 years agoMerge branch 'MDL-28133' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 23:10:06 +0000 (01:10 +0200)]
Merge branch 'MDL-28133' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 22:54:35 +0000 (00:54 +0200)]
Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle

11 years agoMerge branch 'MDL-28006-convert-gradebook' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 22:09:50 +0000 (00:09 +0200)]
Merge branch 'MDL-28006-convert-gradebook' of git://github.com/mudrd8mz/moodle

11 years agoMerge branch 'MDL-28116-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 21:56:53 +0000 (23:56 +0200)]
Merge branch 'MDL-28116-master' of git://github.com/sammarshallou/moodle

11 years agoMDL-28006 restore - improved handling of gradebook 1.9 backups
David Mudrak [Thu, 30 Jun 2011 20:40:54 +0000 (22:40 +0200)]
MDL-28006 restore - improved handling of gradebook 1.9 backups

On contrary from a backup created in 2.0, the file gradebook.xml in the
converted MBZ can contain the course grade_item without the
corresponding grade_category record which is something restore_stepslib
did not expect. This patch fixes two places:

1) the gradebook restore does not use mapped itemid but calls
grade_category::fetch_course_category() to get the actual category to
link the course_item with

2) after_execute makes sure that the mapping actually exists before
trying to move the activities from the default root category

11 years agoNOBUG if we are going to reuse the functions used within the evalmath code then
Jamie Pratt [Tue, 31 May 2011 09:20:13 +0000 (16:20 +0700)]
NOBUG if we are going to reuse the functions used within the evalmath code then
the calling api should not be weird with reversed parameters etc.

11 years agoMDL-27659 "have evalmath accept numbers expressed with scientific
Jamie Pratt [Sat, 28 May 2011 13:47:34 +0000 (20:47 +0700)]
MDL-27659 "have evalmath accept numbers expressed with scientific
notation"

11 years agoNOBUG fixed some coding style deviations in unit test code. Mostly
Jamie Pratt [Sat, 28 May 2011 13:31:46 +0000 (20:31 +0700)]
NOBUG fixed some coding style deviations in unit test code. Mostly
white space changes and added scope declarations to unit test
functions.

11 years agoNOBUG move pattern for func and var names into a static var and make a function to...
jamiepratt [Thu, 14 Apr 2011 05:48:47 +0000 (12:48 +0700)]
NOBUG move pattern for func and var names into a static var and make a function to test a string to see if it is a valid func or var name.

11 years agoMDL-28116 Fix issue restoring old backups with duplicate completion rows
sam marshall [Thu, 30 Jun 2011 16:27:18 +0000 (17:27 +0100)]
MDL-28116 Fix issue restoring old backups with duplicate completion rows

11 years agoMerge branch 'MDL-28115' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 15:09:42 +0000 (17:09 +0200)]
Merge branch 'MDL-28115' of git://github.com/rwijaya/moodle

11 years agoMerge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 14:39:45 +0000 (16:39 +0200)]
Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle

11 years agoMerge branch 'MDL-28061' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 14:22:20 +0000 (16:22 +0200)]
Merge branch 'MDL-28061' of git://github.com/rwijaya/moodle

11 years agoMDL-28006 Fixed grades subpath handling
David Mudrak [Thu, 30 Jun 2011 13:17:03 +0000 (15:17 +0200)]
MDL-28006 Fixed grades subpath handling

Registering the grades subpath even if we do not process the grades yet.
This is to prevent from incorrect considering the wrapper as an empty tag.

11 years agoMDL-28061 mediaplugins filter: add aac audio node to filetypes.mm, fixed string misty...
Rossiani Wijaya [Thu, 30 Jun 2011 11:29:07 +0000 (19:29 +0800)]
MDL-28061 mediaplugins filter: add aac audio node to filetypes.mm, fixed string mistype within the admin setting page (acc -> aac) and add mediaplugin_html5audio css class to align the player/link like the rest.

11 years agoMDL-28115 lesson module: fixed undefined variable for multiple answer, disabled numbe...
Rossiani Wijaya [Thu, 30 Jun 2011 10:43:25 +0000 (18:43 +0800)]
MDL-28115 lesson module: fixed undefined variable for multiple answer, disabled numberical input text during review and fixed bug for essay answer during review process.

11 years agoMDL-27829 blocks: added a warning to the block settings page that displays when the...
Andrew Davis (andyjdavis) [Thu, 30 Jun 2011 09:35:15 +0000 (17:35 +0800)]
MDL-27829 blocks: added a warning to the block settings page that displays when the block was using a block type we dont let users select anymore

11 years agoMDL-27829 blocks: improved backwards compatibility for blocks set to display on page...
Andrew Davis (andyjdavis) [Thu, 30 Jun 2011 07:49:09 +0000 (15:49 +0800)]
MDL-27829 blocks: improved backwards compatibility for blocks set to display on page types we dont allow the user to select anymore

11 years agoMDL-28099 Fixed regression as outlined in tracker.
Jamie Pratt [Thu, 30 Jun 2011 07:34:10 +0000 (14:34 +0700)]
MDL-28099 Fixed regression as outlined in tracker.

11 years agoMDL-27829 blocks: added code to make the page type restrictions for blocks on admin...
Andrew Davis (andyjdavis) [Thu, 30 Jun 2011 07:30:34 +0000 (15:30 +0800)]
MDL-27829 blocks: added code to make the page type restrictions for blocks on admin setting pages make sense

11 years agoMerge branch 'MDL-24684_master' of git://github.com/stronk7/moodle
Sam Hemelryk [Thu, 30 Jun 2011 02:49:29 +0000 (10:49 +0800)]
Merge branch 'MDL-24684_master' of git://github.com/stronk7/moodle

11 years agoMDL-24684 backup - basic protection against time/memory limits
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 01:37:30 +0000 (03:37 +0200)]
MDL-24684 backup - basic protection against time/memory limits

11 years agoMerge branch 'MDL-28044' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 23:59:49 +0000 (01:59 +0200)]
Merge branch 'MDL-28044' of git://github.com/nebgor/moodle

11 years agoMerge branch 'MDL-15587-head' of git://github.com/grabs/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 23:54:19 +0000 (01:54 +0200)]
Merge branch 'MDL-15587-head' of git://github.com/grabs/moodle

11 years agoMerge branch 'MDL-19864_database_excel_export' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 23:16:57 +0000 (01:16 +0200)]
Merge branch 'MDL-19864_database_excel_export' of git://github.com/andyjdavis/moodle

11 years agoMerge branch 'wip-MDL-27431-master' of git://github.com/Beedell/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 23:13:34 +0000 (01:13 +0200)]
Merge branch 'wip-MDL-27431-master' of git://github.com/Beedell/moodle

11 years agoMerge branch 'master_MDL-28016' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 23:10:51 +0000 (01:10 +0200)]
Merge branch 'master_MDL-28016' of git://github.com/danmarsden/moodle

11 years agoMerge branch 'wip-MDL-25249-master-r1' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 22:55:20 +0000 (00:55 +0200)]
Merge branch 'wip-MDL-25249-master-r1' of git://github.com/samhemelryk/moodle

11 years agoMerge branch 'MDL-27149' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 22:20:43 +0000 (00:20 +0200)]
Merge branch 'MDL-27149' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-28055' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 22:02:51 +0000 (00:02 +0200)]
Merge branch 'MDL-28055' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-28108' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 22:00:12 +0000 (00:00 +0200)]
Merge branch 'MDL-28108' of git://github.com/timhunt/moodle

11 years agoMDL-27418 qtype numerical - minor whitespace fix
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 21:57:08 +0000 (23:57 +0200)]
MDL-27418 qtype numerical - minor whitespace fix

11 years agoMerge branch 'MDL-27418' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 21:51:33 +0000 (23:51 +0200)]
Merge branch 'MDL-27418' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-27430' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 21:33:01 +0000 (23:33 +0200)]
Merge branch 'MDL-27430' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-28074' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 21:09:13 +0000 (23:09 +0200)]
Merge branch 'MDL-28074' of git://github.com/timhunt/moodle

11 years agoMDL-28108 oops! I got the cut-off percentage wrong.
Tim Hunt [Wed, 29 Jun 2011 21:02:53 +0000 (22:02 +0100)]
MDL-28108 oops! I got the cut-off percentage wrong.

11 years agoMDL-28074 question preview should set context/course/cm properly.
Tim Hunt [Wed, 29 Jun 2011 13:39:16 +0000 (14:39 +0100)]
MDL-28074 question preview should set context/course/cm properly.

1. We need this so that, for example, when previewing a question from
the quiz editing page, the preview uses the filter settings, theme and
language set for that quiz and course.

11 years agoMerge branch 'pagelib_single' of git://github.com/marxjohnson/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 19:00:06 +0000 (21:00 +0200)]
Merge branch 'pagelib_single' of git://github.com/marxjohnson/moodle

11 years agoMerge branch 'MDL-28028' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 18:58:27 +0000 (20:58 +0200)]
Merge branch 'MDL-28028' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-28035' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 18:47:16 +0000 (20:47 +0200)]
Merge branch 'MDL-28035' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-28037' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 18:44:49 +0000 (20:44 +0200)]
Merge branch 'MDL-28037' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-28087_friendly_jabber' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 18:11:17 +0000 (20:11 +0200)]
Merge branch 'MDL-28087_friendly_jabber' of git://github.com/andyjdavis/moodle

11 years agoMerge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 18:00:49 +0000 (20:00 +0200)]
Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle

Conflicts:
lib/db/services.php
version.php

11 years agoMerge branch 's11_MDL-27976_get_users_by_courseid_master' of github.com:dongsheng...
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 17:50:39 +0000 (19:50 +0200)]
Merge branch 's11_MDL-27976_get_users_by_courseid_master' of github.com:dongsheng/moodle

11 years agoMerge branch 'wip-MDL-27988-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 16:12:18 +0000 (18:12 +0200)]
Merge branch 'wip-MDL-27988-master' of git://github.com/samhemelryk/moodle

11 years agoMDL-27418 qtype numerical correct grading of 'right value, wrong unit' reponses.
Tim Hunt [Wed, 29 Jun 2011 14:41:56 +0000 (15:41 +0100)]
MDL-27418 qtype numerical correct grading of 'right value, wrong unit' reponses.

Probably easiest to explain by example: If the right answer is 1.23 m with alternate
unit 100 cm = 1m then the completely right answers are 1.23 m and 123 cm.
Right answer, wrong unit responses include 1.23, 1.23 frogs and 1.23 cm.
123 m is not considered to have the correct numerical value.

We may well re-consider the way this works in a future version of Moodle.

Unit grading was not implemented before Moodle 2.0. In Moodle 2.0, the unit grading
was more permissive than here, for example 123 m would have been graded correctly in
2.0. However, I'm not sure I follow the rationale for that.

11 years agoMerge branch 'MDL-27955_HEAD' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 13:42:26 +0000 (15:42 +0200)]
Merge branch 'MDL-27955_HEAD' of git://github.com/rwijaya/moodle

11 years agoMerge branch 'MDL-27812_front_page_blocks' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 13:29:14 +0000 (15:29 +0200)]
Merge branch 'MDL-27812_front_page_blocks' of git://github.com/andyjdavis/moodle

11 years agoMerge branch 'wip-mdl-27964-master' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 13:07:07 +0000 (15:07 +0200)]
Merge branch 'wip-mdl-27964-master' of git://github.com/rajeshtaneja/moodle

11 years agoMerge branch 'MDL-28072_coursereport_undefined_function' of git://github.com/andyjdav...
Eloy Lafuente (stronk7) [Wed, 29 Jun 2011 13:01:50 +0000 (15:01 +0200)]
Merge branch 'MDL-28072_coursereport_undefined_function' of git://github.com/andyjdavis/moodle

11 years agoMDL-28099 fixes issue with filepicker and element names with index not passing
Jamie Pratt [Wed, 29 Jun 2011 11:39:15 +0000 (18:39 +0700)]
MDL-28099 fixes issue with filepicker and element names with index not passing
value for draftitemid.

11 years agoMDL-27955 lesson module: fixed error for reviewing lesson and update string to contin...
Rossiani Wijaya [Wed, 29 Jun 2011 10:18:52 +0000 (18:18 +0800)]
MDL-27955 lesson module: fixed error for reviewing lesson and update string to continue or finish reviewing

11 years agoMerge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Wed, 29 Jun 2011 09:04:13 +0000 (17:04 +0800)]
Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle

11 years agoSCORM MDL-28016 - fix redirect call to use proper moodle_url
Dan Marsden [Wed, 29 Jun 2011 08:31:19 +0000 (20:31 +1200)]
SCORM MDL-28016 - fix redirect call to use proper moodle_url

11 years agoMDL-27976 webservice moodle_user_get_users_by_courseid webservice
Dongsheng Cai [Wed, 29 Jun 2011 07:41:31 +0000 (15:41 +0800)]
MDL-27976 webservice moodle_user_get_users_by_courseid webservice

11 years agoMDL-27988 backup grade: Calculated grade items calculation references now corrected...
Sam Hemelryk [Wed, 29 Jun 2011 07:26:48 +0000 (15:26 +0800)]
MDL-27988 backup grade: Calculated grade items calculation references now corrected and idnumber restore improved

11 years agoMDL-25249 calendar: Fixed regression in set.php
Sam Hemelryk [Wed, 29 Jun 2011 07:08:27 +0000 (15:08 +0800)]
MDL-25249 calendar: Fixed regression in set.php

11 years agoMDL-28006 code cleanup - there is nothing to do for grade_settings
David Mudrak [Wed, 29 Jun 2011 07:08:25 +0000 (09:08 +0200)]
MDL-28006 code cleanup - there is nothing to do for grade_settings

11 years agoMDL-28006 moodle1 converter supports outcomes
David Mudrak [Wed, 29 Jun 2011 06:55:43 +0000 (08:55 +0200)]
MDL-28006 moodle1 converter supports outcomes

11 years agoMDL-25249 Tidied up calendar variable passing and removed session abuse
Sam Hemelryk [Wed, 29 Jun 2011 06:50:38 +0000 (14:50 +0800)]
MDL-25249 Tidied up calendar variable passing and removed session abuse

11 years agoMDL-27418 add unit tests for the problem case identified by Pierre.
Tim Hunt [Wed, 29 Jun 2011 05:55:45 +0000 (06:55 +0100)]
MDL-27418 add unit tests for the problem case identified by Pierre.

11 years agoMDL-27964 lesson - Quick fix added for importing question files in lesson module
Rajesh Taneja [Thu, 23 Jun 2011 06:24:55 +0000 (14:24 +0800)]
MDL-27964 lesson - Quick fix added for importing question files in lesson module

11 years agoMDL-28072 coursereport: added a missing require_once()
Andrew Davis (andyjdavis) [Wed, 29 Jun 2011 04:59:44 +0000 (12:59 +0800)]
MDL-28072 coursereport: added a missing require_once()

11 years agoMDL-28087 assignment: made the jabber notification of assignment grading better
Andrew Davis (andyjdavis) [Wed, 29 Jun 2011 03:29:11 +0000 (11:29 +0800)]
MDL-28087 assignment: made the jabber notification of assignment grading better

11 years agoMDL-27936, send_message webservice should respect contact settings, improve readabili...
Dongsheng Cai [Wed, 29 Jun 2011 03:26:16 +0000 (11:26 +0800)]
MDL-27936, send_message webservice should respect contact settings, improve readability, rename it to moodle_message_send_instantmessages

11 years agoMDL-28044 general - updated print_error() link to point to new versioned docs link.
Aparup Banerjee [Tue, 28 Jun 2011 10:53:04 +0000 (18:53 +0800)]
MDL-28044 general - updated print_error() link to point to new versioned docs link.

11 years agoMDL-19864 database: temporarily commenting out the excel export option as its broken...
Andrew Davis (andyjdavis) [Wed, 29 Jun 2011 02:35:31 +0000 (10:35 +0800)]
MDL-19864 database: temporarily commenting out the excel export option as its broken and cannot be quickly fixed. Use Open Office option for the time being.

11 years agoMDL-28006 moodle1 converter supports grade letters
David Mudrak [Tue, 28 Jun 2011 22:55:29 +0000 (00:55 +0200)]
MDL-28006 moodle1 converter supports grade letters

11 years agoMDL-28006 moodle1 converter supports grade categories and non-module grade items
David Mudrak [Tue, 28 Jun 2011 22:09:09 +0000 (00:09 +0200)]
MDL-28006 moodle1 converter supports grade categories and non-module grade items

11 years agoMDL-28006 moodle1 converter supports activity module grade items
David Mudrak [Tue, 28 Jun 2011 19:31:18 +0000 (21:31 +0200)]
MDL-28006 moodle1 converter supports activity module grade items

11 years agoMDL-28006 moodle1 converter provides new get_stash_or_default() method
David Mudrak [Tue, 28 Jun 2011 18:10:06 +0000 (20:10 +0200)]
MDL-28006 moodle1 converter provides new get_stash_or_default() method

11 years agoMDLQA-1147 Fixed a typo in the exception class name
David Mudrak [Thu, 23 Jun 2011 11:38:15 +0000 (13:38 +0200)]
MDLQA-1147 Fixed a typo in the exception class name

Thanks Steve Turley for spotting and reporting this during the QA.

11 years agoMerge branch 'MDL-27990_assignment_notifications' of git://github.com/andyjdavis...
Eloy Lafuente (stronk7) [Tue, 28 Jun 2011 20:14:54 +0000 (22:14 +0200)]
Merge branch 'MDL-27990_assignment_notifications' of git://github.com/andyjdavis/moodle

11 years agoMDL-27418 add validation to stop students intering a thosands sep.
Tim Hunt [Tue, 28 Jun 2011 17:26:34 +0000 (18:26 +0100)]
MDL-27418 add validation to stop students intering a thosands sep.

If it might be confused by a decimal point from another locale.

11 years agoMDL-27418 qtype numeric go back to the very permissive number parsing from Moodle...
Tim Hunt [Tue, 28 Jun 2011 17:12:35 +0000 (18:12 +0100)]
MDL-27418 qtype numeric go back to the very permissive number parsing from Moodle 2.0.

I hope my unit tests are good enough to make this change safe.

11 years agoMDL-27418 qtype_numeric correct output of numbers in locales that use , for decimal...
Tim Hunt [Tue, 28 Jun 2011 16:37:09 +0000 (17:37 +0100)]
MDL-27418 qtype_numeric correct output of numbers in locales that use , for decimal point.

11 years agoMDL-27418 correct validation of numerical answers in qtype numeric.
Tim Hunt [Tue, 28 Jun 2011 16:36:24 +0000 (17:36 +0100)]
MDL-27418 correct validation of numerical answers in qtype numeric.

This mostly affects locales that use , as decimal point.

11 years agoMDL-27418 fix typo
Tim Hunt [Tue, 28 Jun 2011 16:34:24 +0000 (17:34 +0100)]
MDL-27418 fix typo

I really should refactor to eliminate this duplicated code.

11 years agoMDL-27430 qtype numerical put multiple-choice units back to radio buttons
Tim Hunt [Tue, 28 Jun 2011 15:33:01 +0000 (16:33 +0100)]
MDL-27430 qtype numerical put multiple-choice units back to radio buttons

It seems that people want to be able to use <sup> and <sub> here, which
makes sense, so we need to keep radio buttons for questions upgraded
from 2.0. The dropdown menu, however, is also nice, so keep that option
too for new questions.

11 years agoMDL-27431 adjust help icon alt to be same as title for accessibility
John Beedell [Tue, 21 Jun 2011 16:21:48 +0000 (17:21 +0100)]
MDL-27431 adjust help icon alt to be same as title for accessibility

11 years agoMDL-27812 blocks: fixed the ability to add a block and have it display on all pages
Andrew Davis (andyjdavis) [Tue, 28 Jun 2011 10:50:03 +0000 (18:50 +0800)]
MDL-27812 blocks: fixed the ability to add a block and have it display on all pages

11 years agoMDL-28055 quiz_upgrade_very_old_question_sessions bit does not work because of missin...
Tim Hunt [Tue, 28 Jun 2011 09:57:50 +0000 (10:57 +0100)]
MDL-28055 quiz_upgrade_very_old_question_sessions bit does not work because of missing includes.

11 years agoMerge branch 'MDL-28023_assignment_jabber' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 28 Jun 2011 09:04:55 +0000 (17:04 +0800)]
Merge branch 'MDL-28023_assignment_jabber' of git://github.com/andyjdavis/moodle

11 years agoMDL-27964 lesson - Old file picker is replaced with new filepicker, currently all...
Rajesh Taneja [Thu, 23 Jun 2011 02:12:18 +0000 (10:12 +0800)]
MDL-27964 lesson - Old file picker is replaced with new filepicker, currently all imported questions will be saved in /temp/questionimport/ where questionbank files are saved.

11 years agoMDL-27990 assignment: removed a redundant retrieval of a user preference
Andrew Davis (andyjdavis) [Tue, 28 Jun 2011 03:08:59 +0000 (11:08 +0800)]
MDL-27990 assignment: removed a redundant retrieval of a user preference

11 years agoMerge branch 's11_MDL-27866_pix_url_master' of git://github.com/dongsheng/moodle
Sam Hemelryk [Tue, 28 Jun 2011 02:16:57 +0000 (10:16 +0800)]
Merge branch 's11_MDL-27866_pix_url_master' of git://github.com/dongsheng/moodle

11 years agoMDL-27955 lesson module: fixed error for reviewing lesson and update string to contin...
Rossiani Wijaya [Wed, 22 Jun 2011 09:33:34 +0000 (17:33 +0800)]
MDL-27955 lesson module: fixed error for reviewing lesson and update string to continue or finish reviewing

11 years agoMerge branch 'MDL-28014_head' of git://github.com/grabs/moodle
Sam Hemelryk [Tue, 28 Jun 2011 02:12:39 +0000 (10:12 +0800)]
Merge branch 'MDL-28014_head' of git://github.com/grabs/moodle

11 years agoMDL-28037 Make restoring quiz_attempts more robust.
Tim Hunt [Mon, 27 Jun 2011 17:11:47 +0000 (18:11 +0100)]
MDL-28037 Make restoring quiz_attempts more robust.

Don't assume that 0 is unique (even temporarily).

11 years agoMDL-28028 prevent orphaned question_attempt data from breaking upgrade.
Tim Hunt [Mon, 27 Jun 2011 16:27:40 +0000 (17:27 +0100)]
MDL-28028 prevent orphaned question_attempt data from breaking upgrade.

11 years agoMDL-28035 problems with upgrade/restore of ataptive quizzes from 2.0
Tim Hunt [Mon, 27 Jun 2011 16:02:32 +0000 (17:02 +0100)]
MDL-28035 problems with upgrade/restore of ataptive quizzes from 2.0

There were two main problems:

1. The unit tests for upgrading adaptive quiz attempts had slighly the
wrong $expectedqa, and so matching that the upgrade was doing the wrong
thing in certain situations. The main issue was that it was setting
-_try = 1 on the first step, which broke the penalty calculation when
the quiz was regraded. There were also some other subtleties with
incrementing -_try that were not right before.

2. It was possible in 2.0 and earlier for two question_states to get the
same seq_number, and restoring 2.0 backups was rashly assuming that that
was unique.

11 years agoon-demand release 2.1beta
Eloy Lafuente (stronk7) [Mon, 27 Jun 2011 15:32:54 +0000 (17:32 +0200)]
on-demand release 2.1beta

11 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jun 2011 15:31:42 +0000 (17:31 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

11 years agoMerge branch 'MDL-28033' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jun 2011 15:12:40 +0000 (17:12 +0200)]
Merge branch 'MDL-28033' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-28049' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jun 2011 13:56:03 +0000 (15:56 +0200)]
Merge branch 'MDL-28049' of git://github.com/timhunt/moodle

11 years agoMDL-28021 Completion system can create inconsistent database rows
sam marshall [Fri, 24 Jun 2011 13:02:04 +0000 (14:02 +0100)]
MDL-28021 Completion system can create inconsistent database rows

This change includes:

(1) update deletes older versions of inconsistent rows
(2) update drops one index and replaces it with a new unique index
(3) fixed to ensure that when it decides whether to insert or update
    it uses current database state and not cached info
(4) unit tests updated to test #3

Conflicts:

lib/db/upgrade.php
version.php

11 years agoMDL-28049 conditional include so xml question format can work for both lesson and...
Tim Hunt [Mon, 27 Jun 2011 12:59:57 +0000 (13:59 +0100)]
MDL-28049 conditional include so xml question format can work for both lesson and 3rd party qtypes.

This is a regression caused by MDL-27956.

11 years agoMDL-28033 Fatal error upgrading form 1.9 to 2.1 due to missing include.
Tim Hunt [Mon, 27 Jun 2011 12:43:11 +0000 (13:43 +0100)]
MDL-28033 Fatal error upgrading form 1.9 to 2.1 due to missing include.

11 years agoMerge branch 'unsigned_fixes' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jun 2011 12:06:13 +0000 (14:06 +0200)]
Merge branch 'unsigned_fixes' of git://github.com/stronk7/moodle

11 years agoMDL-28032 database - finally question->defaultmark goes signed. Changing prev commit.
Eloy Lafuente (stronk7) [Mon, 27 Jun 2011 09:37:34 +0000 (11:37 +0200)]
MDL-28032 database - finally question->defaultmark goes signed. Changing prev commit.