Aparup Banerjee [Thu, 16 Jun 2011 08:27:56 +0000 (16:27 +0800)]
Backup - mod lesson conversion: apply jumpto fix only to matching question types.
Aparup Banerjee [Thu, 16 Jun 2011 06:29:06 +0000 (14:29 +0800)]
MDL-27819 Backup - fixed extra answers/jump data.
- fixed unset causing missing property
- fixed answers empty notice, allowed for page with no answers.
Eloy Lafuente (stronk7) [Thu, 16 Jun 2011 08:38:49 +0000 (10:38 +0200)]
Merge branch 'wip-MDL-24355-master' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 22:43:58 +0000 (00:43 +0200)]
MDL-27171 take rid of 2 wrong strings moved to forum/lang/xx/forum.php
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 16:18:26 +0000 (18:18 +0200)]
Merge branch 'MDL-27797_fixup' of git://github.com/timhunt/moodle
Tim Hunt [Wed, 15 Jun 2011 11:27:45 +0000 (12:27 +0100)]
MDL-27797 supplimental. Fix two minor issues found by Sam H during testing.
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 12:37:23 +0000 (14:37 +0200)]
Merge branch 'MDL-27865' of git://github.com/timhunt/moodle
Tim Hunt [Wed, 15 Jun 2011 11:20:26 +0000 (12:20 +0100)]
MDL-27865 fix editing of calculated* questions.
Aparup Banerjee [Wed, 15 Jun 2011 07:41:38 +0000 (15:41 +0800)]
MDL-27819 Backup - mod_lesson conversion: optimized page buffering from all pages to 3 pages
Aparup Banerjee [Mon, 13 Jun 2011 08:17:24 +0000 (16:17 +0800)]
MDL-27819 backup - added nextpageid and prevpageid elements to lesson moodle1 backup conversion to 2.x
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 09:59:52 +0000 (11:59 +0200)]
Merge branch 'MDL-27820' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 09:25:09 +0000 (11:25 +0200)]
Merge branch 'wip-mdl-27863-master' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 09:01:41 +0000 (11:01 +0200)]
MDL-27820 backup - fix backup of ratings
Rajesh Taneja [Wed, 15 Jun 2011 05:34:28 +0000 (13:34 +0800)]
MDL-27863 moodlelib - fixed testcase faliure in MDL-27577
Andrew Davis (andyjdavis) [Tue, 7 Jun 2011 08:18:09 +0000 (16:18 +0800)]
MDL-24355 tag: minor clean up of tags changes
Sam Hemelryk [Wed, 20 Apr 2011 04:20:55 +0000 (12:20 +0800)]
MDL-24355 Fixed up deletion of tag correlations when deleting tags
Sam Hemelryk [Wed, 20 Apr 2011 04:04:02 +0000 (12:04 +0800)]
MDL-24355 Added code to delete any tag correlations that wern't just identified
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 00:04:50 +0000 (02:04 +0200)]
Merge branch 'MDL-27852' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 00:00:23 +0000 (02:00 +0200)]
Merge branch 'MDL-27797' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 23:30:59 +0000 (01:30 +0200)]
Merge branch 'MDL-27639_wip' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 23:18:05 +0000 (01:18 +0200)]
Merge branch 'master_MDL-27858' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 22:48:56 +0000 (00:48 +0200)]
Merge branch 'MDL-27848_for_master' of git://github.com/kordan/moodle
Dan Marsden [Tue, 14 Jun 2011 22:31:52 +0000 (10:31 +1200)]
SCORM MDL-27858 - fix typo
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 20:38:27 +0000 (22:38 +0200)]
Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle
Tim Hunt [Tue, 14 Jun 2011 16:36:11 +0000 (17:36 +0100)]
MDL-27854 qformat_xml fix import/export of essay questions to include the new options.
Tim Hunt [Tue, 14 Jun 2011 16:06:55 +0000 (17:06 +0100)]
MDL-27797 fix all the codechecker issues in format_xml
After this change, I can still export my test course with one of each question type, and all the unit tests still pass.
Tim Hunt [Tue, 14 Jun 2011 15:34:14 +0000 (16:34 +0100)]
MDL-27797 fix bugs with Moodle XML export.
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 15:01:20 +0000 (17:01 +0200)]
MDL-27759 fix whitespace
Tim Hunt [Tue, 14 Jun 2011 14:59:25 +0000 (15:59 +0100)]
MDL-27852 local_qeupgradehelper convertquiz.php script was broken.
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 14:57:36 +0000 (16:57 +0200)]
Merge branch 'wip-mdl-27759-integration-master' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 14:43:07 +0000 (16:43 +0200)]
Merge branch 'MDL-25461-lang-install-link' of git://github.com/mudrd8mz/moodle
Tim Hunt [Tue, 14 Jun 2011 14:17:50 +0000 (15:17 +0100)]
MDL-27849 fix qtype_multianswer attempt data restore (2.1 -> 2.1).
Also, refactor calculatedmulti restore to avoid duplication.
David Mudrak [Tue, 14 Jun 2011 11:55:27 +0000 (13:55 +0200)]
MDL-27708 Fixed the version of language packs to install in 2.1
David Mudrak [Tue, 14 Jun 2011 11:44:12 +0000 (13:44 +0200)]
MDL-25461 Installing a language pack is recorded in moodle.org statistics
This patch fixes the URLs for fetching data from download.moodle.org so
that the requests are recorded in statistics collector download.php.
Note that we do not record fetching languages.md5 as we want to
record the real .zip downloads only.
Tim Hunt [Tue, 14 Jun 2011 11:07:58 +0000 (12:07 +0100)]
MDL-27585 implement restore of qtype_calculatedmulti 2.1 attempt data
Tim Hunt [Tue, 14 Jun 2011 10:57:37 +0000 (11:57 +0100)]
MDL-27639 restore of attempt data from 2.0 - first attempt.
This is now at the stage where it mostly appears to work, at lease on
one backup file.
Tim Hunt [Mon, 13 Jun 2011 17:31:43 +0000 (18:31 +0100)]
MDL-27639 add two missing language strings.
Without these strings, important information for debugging is not displayed.
Tim Hunt [Mon, 13 Jun 2011 17:28:59 +0000 (18:28 +0100)]
MDL-27839 supply default qtype_essay_options if they are not present in the XML.
Tim Hunt [Thu, 9 Jun 2011 18:57:20 +0000 (19:57 +0100)]
MDL-27787 Fix restore of matching quetsions backed up from Moodle 2.0.
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 10:41:51 +0000 (12:41 +0200)]
MDL-27844 files support added to get_users_by_id()
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 10:32:47 +0000 (12:32 +0200)]
Merge branch 'wip-MDL-27825-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 10:11:54 +0000 (12:11 +0200)]
Merge branch 'MDL-27525' of git://github.com/rwijaya/moodle
Kordan [Tue, 14 Jun 2011 09:04:39 +0000 (11:04 +0200)]
MDL-27835_for_master fix
Sam Hemelryk [Tue, 14 Jun 2011 07:48:10 +0000 (15:48 +0800)]
MDL-27825 Improved check of themedesignermode to prevent errors if it isn't set
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 06:55:06 +0000 (08:55 +0200)]
MDL-27552 whitespace fixes
Rajesh Taneja [Tue, 14 Jun 2011 02:45:03 +0000 (10:45 +0800)]
MDL-27759 Fixed conflicts for integration
Rajesh Taneja [Thu, 9 Jun 2011 03:29:43 +0000 (11:29 +0800)]
MDL-27759 user webservice - added new PARAM for timezone PARAM_TIMEZONE, to validate timezone input in webservice while deling with user information
Sam Hemelryk [Tue, 14 Jun 2011 01:52:39 +0000 (09:52 +0800)]
Merge branch 'MDL-27834' of git://github.com/kordan/moodle
Sam Hemelryk [Tue, 14 Jun 2011 01:47:52 +0000 (09:47 +0800)]
Merge branch 'MDL-27286_master' of git://github.com/stronk7/moodle
Sam Hemelryk [Tue, 14 Jun 2011 01:43:24 +0000 (09:43 +0800)]
Merge branch 's11_MDL-27497_upload_master' of github.com:dongsheng/moodle
Sam Hemelryk [Tue, 14 Jun 2011 01:32:44 +0000 (09:32 +0800)]
Merged branch 's11_MDL-27552_token_master' of git@github.com:dongsheng/moodle.git with changes
Eloy Lafuente (stronk7) [Mon, 13 Jun 2011 22:33:16 +0000 (00:33 +0200)]
MDL-27822 rename new methods
Tim Hunt [Fri, 10 Jun 2011 16:15:04 +0000 (17:15 +0100)]
MDL-27822 old module version should be available in restore_activity_structure_step::define_structure()
Eloy Lafuente (stronk7) [Mon, 13 Jun 2011 17:52:49 +0000 (19:52 +0200)]
Merge branch 'MDL-27065-workshop-categories' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 13 Jun 2011 16:52:39 +0000 (18:52 +0200)]
MDL-27286 recent files repo - fix for oracle and cleanup
Kordan [Mon, 13 Jun 2011 12:49:26 +0000 (14:49 +0200)]
MDL-27834 fix
Eloy Lafuente (stronk7) [Mon, 13 Jun 2011 10:21:48 +0000 (12:21 +0200)]
whitespace fixes
Dongsheng Cai [Mon, 13 Jun 2011 09:41:56 +0000 (17:41 +0800)]
MDL-27552 get webservice token by providing username and password
David Mudrak [Mon, 13 Jun 2011 09:11:31 +0000 (11:11 +0200)]
MDL-27811 Fixed incorrect qtype_essay conversion
Sam Hemelryk [Mon, 13 Jun 2011 08:54:52 +0000 (16:54 +0800)]
Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes
Eloy Lafuente (stronk7) [Mon, 13 Jun 2011 08:12:03 +0000 (10:12 +0200)]
Merge branch 'MDL-27789-qe2plugins' of git://github.com/mudrd8mz/moodle
Dongsheng Cai [Mon, 13 Jun 2011 08:06:18 +0000 (16:06 +0800)]
MDL-27497, using webservice token to upload files
Aparup Banerjee [Thu, 9 Jun 2011 06:50:01 +0000 (14:50 +0800)]
MDL-27446 Backup - added answers 'jumpto' conversion to moodle1 converter for
lesson
Sam Hemelryk [Mon, 13 Jun 2011 07:49:24 +0000 (15:49 +0800)]
Merge branch 'master_MDL-272522' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 13 Jun 2011 07:32:44 +0000 (15:32 +0800)]
Merge branch 'MDL-26147-workshop-ignore-deadlines' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 13 Jun 2011 07:06:19 +0000 (15:06 +0800)]
Merged branch 'MDL-26960' of git://git.luns.net.uk/moodle with changes
Sam Hemelryk [Mon, 13 Jun 2011 06:53:37 +0000 (14:53 +0800)]
Merge branch 'master_MDL-27404' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 13 Jun 2011 06:11:58 +0000 (14:11 +0800)]
Merge branch 'MDL-26774-wip' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 13 Jun 2011 06:04:28 +0000 (14:04 +0800)]
Merge branch 'MDL-27399' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 13 Jun 2011 03:22:51 +0000 (11:22 +0800)]
Merge branch 'MDL-20538' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 13 Jun 2011 03:17:59 +0000 (11:17 +0800)]
Merge branch 'MDL-27757-HEAD' of git://github.com/srynot4sale/moodle
Sam Hemelryk [Mon, 13 Jun 2011 03:13:29 +0000 (11:13 +0800)]
Merge branch 'MDL-27783' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 13 Jun 2011 02:54:24 +0000 (10:54 +0800)]
Merged branch 'MDL-27781' of git://github.com/mouneyrac/moodle.git with changes
Rossiani Wijaya [Mon, 13 Jun 2011 02:54:07 +0000 (10:54 +0800)]
MDL-27525 mod_wiki: Fixed typing error for the variable and assign the value contextid to use mod context id
Sam Hemelryk [Mon, 13 Jun 2011 02:39:32 +0000 (10:39 +0800)]
Merge branch 'MDL-27792-plugin-subsystem' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 13 Jun 2011 02:33:39 +0000 (10:33 +0800)]
Merged branch 'MDL-27801' of git://github.com/kordan/moodle.git with changes
Dan Marsden [Sun, 12 Jun 2011 23:31:48 +0000 (11:31 +1200)]
MDL-27404 SCORM fix for IE 6 - thanks to Howard Miller
Dan Marsden [Sun, 12 Jun 2011 23:00:43 +0000 (11:00 +1200)]
MDL-27522 SCORM tidy up commit
Ankit Kumar Agarwal [Mon, 16 May 2011 03:03:58 +0000 (08:33 +0530)]
MDL-27522 SCORM - seperate user report from main report page to allow better re-use in preparation for MDL-27256
David Mudrak [Fri, 10 Jun 2011 16:59:20 +0000 (18:59 +0200)]
MDL-26147 workshop - added capability to ignore time restrictions
David Mudrak [Fri, 10 Jun 2011 14:48:09 +0000 (16:48 +0200)]
MDL-27065 workshop grades categories can be defined in mod_form
Because the Workshop module creates two grade items in the gradebook, we
can't use standard modedit features to set the corresponding category in
the gradebook (it supports single grade item only).
The patch also cleans the mod_form.php so that it does not use the
global $COURSE (just because I do not like this global variable).
And for the record - QuickForms must die.
David Mudrak [Fri, 10 Jun 2011 07:01:41 +0000 (09:01 +0200)]
MDL-22414 Exclude unsupported modules from the course contents
Andrew Davis (andyjdavis) [Fri, 10 Jun 2011 05:52:53 +0000 (13:52 +0800)]
MDL-26105 blocks: added use of user friendly block settings to messaging
Marina Glancy [Fri, 10 Jun 2011 04:55:12 +0000 (12:55 +0800)]
MDL-26430 fixed appearance of one html form within another
Aaron Barnes [Fri, 10 Jun 2011 01:53:58 +0000 (13:53 +1200)]
MDL-27757 lib/completionlib.php: Load "enablecompletion" property if required
kordan [Thu, 9 Jun 2011 19:47:09 +0000 (21:47 +0200)]
fix MDL-27801
Tim Hunt [Thu, 9 Jun 2011 18:27:36 +0000 (19:27 +0100)]
MDL-20538 get rid of badly name-spaced constants from lib/questionlib.php.
Unfortunately, they are used all over the import/export code, so I cannot eliminate them completely. However, I was able to move them out of the core library.
David Mudrak [Thu, 9 Jun 2011 14:16:44 +0000 (16:16 +0200)]
MDL-27792 Fixed missing core subsystem
Dan Poltawski [Sat, 28 May 2011 07:46:47 +0000 (08:46 +0100)]
messaging: MDL-26960 Check correct users permissions
When on message profile page, the incorrect capability was checked
David Mudrak [Thu, 9 Jun 2011 12:29:27 +0000 (14:29 +0200)]
MDL-27789 The new question plugins reported as standard ones
David Mudrak [Thu, 9 Jun 2011 11:04:49 +0000 (13:04 +0200)]
MDL-22414 Merge branch 'master' into backup-convert
Conflicts:
theme/base/style/core.css
David Mudrak [Thu, 9 Jun 2011 09:38:15 +0000 (11:38 +0200)]
MDL-22414 Removing obj_to_readable helper
Andrew Davis (andyjdavis) [Thu, 9 Jun 2011 09:03:27 +0000 (17:03 +0800)]
MDL-26105 blocks: fixed some php errors and made a help string better
Jerome Mouneyrac [Thu, 9 Jun 2011 08:50:14 +0000 (16:50 +0800)]
MDL-27783 enabled status of a built-in service should never been updated on upgrade. It is only used during the installation. If a dev really needs to change the status, he can do it in lib/db/upgrade.php
Jerome Mouneyrac [Thu, 9 Jun 2011 07:19:58 +0000 (15:19 +0800)]
MDL-27399 Add all the new mobile ws functions to the built-in mobile service
Jerome Mouneyrac [Thu, 9 Jun 2011 07:08:03 +0000 (15:08 +0800)]
MDL-27781 remove Undefined property: stdClass:: during installation with cli script
Sam Hemelryk [Tue, 3 May 2011 08:29:05 +0000 (16:29 +0800)]
MDL-26105 block setting, improvement, replace switch-case with get_core_subsystems + get_plugin_types
Dongsheng Cai [Thu, 28 Apr 2011 03:20:30 +0000 (11:20 +0800)]
MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
MOV [page-blog-index, pagetype], [page-blog-index, blog]
MOV [page-blog-x, pagetype], [page-blog-x, blog]
MOV [page-tag-x, pagetype], [page-tag-x, tag]
MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
Eloy Lafuente (stronk7) [Thu, 9 Jun 2011 01:41:42 +0000 (03:41 +0200)]
weekly release 2.1dev
David Mudrak [Thu, 9 Jun 2011 00:41:27 +0000 (02:41 +0200)]
MDL-22414 Fixed the order of course modules in the restored course
During the restore, the section's sequence field is ignored and the
order of modules is controlled by the order of the <contents> activity
elements. This patch makes sure that the modules are listed in that
section in the right order.
Also, the patch removes the obsolete stash sectionidslist which was
introduced when the method get_stash_itemids() had not existed yet.