moodle.git
11 years agoMerge branch 'MDL-24255' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 20 Jun 2011 07:51:59 +0000 (15:51 +0800)]
Merge branch 'MDL-24255' of git://github.com/timhunt/moodle

11 years agoMerge branch 's11_MDL-27880_get_course_participants_ws' of git://github.com/dongsheng...
Sam Hemelryk [Mon, 20 Jun 2011 06:31:23 +0000 (14:31 +0800)]
Merge branch 's11_MDL-27880_get_course_participants_ws' of git://github.com/dongsheng/moodle

11 years agoMerge branch 'MDL-27907' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 20 Jun 2011 06:10:41 +0000 (14:10 +0800)]
Merge branch 'MDL-27907' of git://github.com/timhunt/moodle

11 years agoMDL-27880
Dongsheng Cai [Mon, 20 Jun 2011 05:46:47 +0000 (13:46 +0800)]
MDL-27880
1. moodle_user_get_course_participants_by_id web service to get user details in course context
2. Fixed the proformance issues of get_users_by_id web service

11 years agoMerge branch 'MDL-27916' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 20 Jun 2011 05:45:12 +0000 (13:45 +0800)]
Merge branch 'MDL-27916' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-27927' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 20 Jun 2011 05:15:37 +0000 (13:15 +0800)]
Merge branch 'MDL-27927' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-27928' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 20 Jun 2011 05:06:10 +0000 (13:06 +0800)]
Merge branch 'MDL-27928' of git://github.com/timhunt/moodle

11 years agoMerge branch 'quiz_feedback_for_grade' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 20 Jun 2011 05:02:02 +0000 (13:02 +0800)]
Merge branch 'quiz_feedback_for_grade' of git://github.com/stronk7/moodle

11 years agoMDL-27932 quiz - fix some calls to quiz_feedback_for_grade()
Eloy Lafuente (stronk7) [Sun, 19 Jun 2011 23:46:29 +0000 (01:46 +0200)]
MDL-27932 quiz - fix some calls to quiz_feedback_for_grade()

11 years agoMerge branch 'MDL-27910' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Sun, 19 Jun 2011 23:26:03 +0000 (01:26 +0200)]
Merge branch 'MDL-27910' of git://github.com/timhunt/moodle

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

11 years agoMDL-27928 missing string in the question bank UI.
Tim Hunt [Sun, 19 Jun 2011 09:44:44 +0000 (10:44 +0100)]
MDL-27928 missing string in the question bank UI.

AMOS BEGIN
 MOV [categorymove,mod_quiz],[categorymove,question]
AMOS END

11 years agoMDL-27927 qtype_multianswer remove hard-coded string.
Tim Hunt [Sun, 19 Jun 2011 09:34:39 +0000 (10:34 +0100)]
MDL-27927 qtype_multianswer remove hard-coded string.

11 years agoMDL-27927 Fix invalid HTML in the multianswer editing form.
Tim Hunt [Sun, 19 Jun 2011 09:27:24 +0000 (10:27 +0100)]
MDL-27927 Fix invalid HTML in the multianswer editing form.

11 years agoMDL-24255 Use the proper editor element for manual grading comments.
Tim Hunt [Sat, 18 Jun 2011 19:40:02 +0000 (20:40 +0100)]
MDL-24255 Use the proper editor element for manual grading comments.

It would be nice if someone imporoved the API for using the HTML editor outside formslib.

11 years agoMDL-27916 Question state was described wrongly in adaptive and immediate feedback...
Tim Hunt [Sat, 18 Jun 2011 12:29:39 +0000 (13:29 +0100)]
MDL-27916 Question state was described wrongly in adaptive and immediate feedback behaviours.

11 years agoMDL-27907 calculated* editing form inheritance mix up.
Tim Hunt [Sat, 18 Jun 2011 11:53:32 +0000 (12:53 +0100)]
MDL-27907 calculated* editing form inheritance mix up.

Lead to duplicate fields appearing on the editing forms.

11 years agoMDL-27910 quiz stupid typo in a DB query
Tim Hunt [Sat, 18 Jun 2011 10:36:54 +0000 (11:36 +0100)]
MDL-27910 quiz stupid typo in a DB query

11 years agoMDL-27913 Stray whitespace in backup.
Tim Hunt [Fri, 17 Jun 2011 18:37:20 +0000 (19:37 +0100)]
MDL-27913 Stray whitespace in backup.

11 years agoon-demand release 2.1beta
Eloy Lafuente (stronk7) [Fri, 17 Jun 2011 17:25:39 +0000 (19:25 +0200)]
on-demand release 2.1beta

11 years agoMerge branch 'MDL-27869' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 17 Jun 2011 16:32:00 +0000 (18:32 +0200)]
Merge branch 'MDL-27869' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-27490' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 17 Jun 2011 15:24:51 +0000 (17:24 +0200)]
Merge branch 'MDL-27490' of git://github.com/timhunt/moodle

11 years agoMDL-27490 Implement a manage question behaviours admin page
Tim Hunt [Wed, 15 Jun 2011 19:18:33 +0000 (20:18 +0100)]
MDL-27490 Implement a manage question behaviours admin page

While doing this, I found various bugs in the manages question types admin page, and so fixed them, and updated the code
there to use $OUTPUT and html_writer.

AMOS BEGIN
 MOV [cannotdeletemissingqtype,admin],[cannotdeletemissingqtype,question]
 MOV [cannotdeleteqtypeinuse,admin],[cannotdeleteqtypeinuse,question]
 MOV [cannotdeleteqtypeneeded,admin],[cannotdeleteqtypeneeded,question]
 MOV [deleteqtypeareyousure,admin],[deleteqtypeareyousure,question]
 MOV [deleteqtypeareyousuremessage,admin],[deleteqtypeareyousuremessage,question]
 MOV [deletingqtype,admin],[deletingqtype,question]
 MOV [numquestions,admin],[numquestions,question]
 MOV [numquestionsandhidden,admin],[numquestionsandhidden,question]
 MOV [qtypedeletefiles,admin],[qtypedeletefiles,question]
 MOV [uninstallqtype,admin],[uninstallqtype,question]
AMOS END

11 years agoMerge branch 'MDL-27868' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 17 Jun 2011 14:45:30 +0000 (16:45 +0200)]
Merge branch 'MDL-27868' of git://github.com/timhunt/moodle

11 years agoMDL-27868 Hints (and some other things) lost when re-editing calculated* questions.
Tim Hunt [Wed, 15 Jun 2011 16:12:32 +0000 (17:12 +0100)]
MDL-27868 Hints (and some other things) lost when re-editing calculated* questions.

11 years agoMDL-27902 quiz reviewquestion.php page needs to be converted to use the renderer.
Tim Hunt [Fri, 17 Jun 2011 14:27:41 +0000 (15:27 +0100)]
MDL-27902 quiz reviewquestion.php page needs to be converted to use the renderer.

11 years agoMerge branch 'MDL-27887' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 17 Jun 2011 14:16:58 +0000 (16:16 +0200)]
Merge branch 'MDL-27887' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-27877' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 17 Jun 2011 13:32:10 +0000 (15:32 +0200)]
Merge branch 'MDL-27877' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-27878' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 17 Jun 2011 13:30:16 +0000 (15:30 +0200)]
Merge branch 'MDL-27878' of git://github.com/timhunt/moodle

11 years agoMDL-27898 fix question/engine/simpletest/testdatalib.php unit tests.
Tim Hunt [Fri, 17 Jun 2011 10:28:05 +0000 (11:28 +0100)]
MDL-27898 fix question/engine/simpletest/testdatalib.php unit tests.

Now that MDL-27897 is fixed.

11 years agoMDL-27897 moodle_database::get_in_or_equal must not use a static variable.
Tim Hunt [Fri, 17 Jun 2011 10:25:44 +0000 (11:25 +0100)]
MDL-27897 moodle_database::get_in_or_equal must not use a static variable.

It makes unit testing impossible. Switch to a field.

11 years agoon-demand release 2.1beta
Eloy Lafuente (stronk7) [Fri, 17 Jun 2011 09:18:33 +0000 (11:18 +0200)]
on-demand release 2.1beta

11 years agoMDL-27500 editor - updated plugin version references, thirdparty version reference...
Aparup Banerjee [Fri, 17 Jun 2011 08:52:57 +0000 (16:52 +0800)]
MDL-27500 editor - updated plugin version references, thirdparty version reference and tinymce upgrade readme

11 years agoMDL-27500 HTML Editor - bump version
Eloy Lafuente (stronk7) [Thu, 16 Jun 2011 23:11:34 +0000 (01:11 +0200)]
MDL-27500 HTML Editor - bump version

11 years agoMDL-27500 HTML Editor - deleted 3.3.9.2 build
Eloy Lafuente (stronk7) [Thu, 16 Jun 2011 23:10:15 +0000 (01:10 +0200)]
MDL-27500 HTML Editor - deleted 3.3.9.2 build

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

11 years agoMDL-27887 In developer debug, use uncompressed TinyMCE code.
Tim Hunt [Thu, 16 Jun 2011 15:49:05 +0000 (16:49 +0100)]
MDL-27887 In developer debug, use uncompressed TinyMCE code.

11 years agoMDL-27869 Fix images in numerical and calculated questions.
Tim Hunt [Wed, 15 Jun 2011 15:02:05 +0000 (16:02 +0100)]
MDL-27869 Fix images in numerical and calculated questions.

Also fix an embarassing TODO in multianswer quetsions.

11 years agoMDL-27878 make progress bars fail explicity if you forget to call create().
Tim Hunt [Thu, 16 Jun 2011 08:23:43 +0000 (09:23 +0100)]
MDL-27878 make progress bars fail explicity if you forget to call create().

11 years agoMDL-27877 question engine progress bars not working.
Tim Hunt [Thu, 16 Jun 2011 08:21:53 +0000 (09:21 +0100)]
MDL-27877 question engine progress bars not working.

11 years agoweekly release 2.1beta
Eloy Lafuente (stronk7) [Thu, 16 Jun 2011 17:08:04 +0000 (19:08 +0200)]
weekly release 2.1beta

11 years agofix permissions
Eloy Lafuente (stronk7) [Thu, 16 Jun 2011 17:06:07 +0000 (19:06 +0200)]
fix permissions

11 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 16 Jun 2011 17:03:16 +0000 (19:03 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

11 years agoMDL-26105 blocks: made the block settings help icons work
Andrew Davis (andyjdavis) [Thu, 16 Jun 2011 09:07:30 +0000 (17:07 +0800)]
MDL-26105 blocks: made the block settings help icons work

11 years agoMDL-26105 blocks: readded the my moodle page's page type list generator function
Andrew Davis (andyjdavis) [Thu, 16 Jun 2011 08:40:01 +0000 (16:40 +0800)]
MDL-26105 blocks: readded the my moodle page's page type list generator function

11 years agoBackup - mod lesson conversion: apply jumpto fix only to matching question types.
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.

11 years agoMDL-27819 Backup - fixed extra answers/jump data.
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.

11 years agoMerge branch 'wip-MDL-24355-master' of git://github.com/andyjdavis/moodle
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

11 years agoMDL-27171 take rid of 2 wrong strings moved to forum/lang/xx/forum.php
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

11 years agoMerge branch 'MDL-27797_fixup' of git://github.com/timhunt/moodle
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

11 years agoMDL-27797 supplimental. Fix two minor issues found by Sam H during testing.
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.

11 years agoMerge branch 'MDL-27865' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 12:37:23 +0000 (14:37 +0200)]
Merge branch 'MDL-27865' of git://github.com/timhunt/moodle

11 years agoMDL-27865 fix editing of calculated* questions.
Tim Hunt [Wed, 15 Jun 2011 11:20:26 +0000 (12:20 +0100)]
MDL-27865 fix editing of calculated* questions.

11 years agoMDL-27819 Backup - mod_lesson conversion: optimized page buffering from all pages...
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

11 years agoMDL-27819 backup - added nextpageid and prevpageid elements to lesson moodle1 backup...
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

11 years agoMerge branch 'MDL-27820' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 09:59:52 +0000 (11:59 +0200)]
Merge branch 'MDL-27820' of git://github.com/stronk7/moodle

11 years agoMerge branch 'wip-mdl-27863-master' of git://github.com/rajeshtaneja/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

11 years agoMDL-27820 backup - fix backup of ratings
Eloy Lafuente (stronk7) [Wed, 15 Jun 2011 09:01:41 +0000 (11:01 +0200)]
MDL-27820 backup - fix backup of ratings

11 years agoMDL-27863 moodlelib - fixed testcase faliure in MDL-27577
Rajesh Taneja [Wed, 15 Jun 2011 05:34:28 +0000 (13:34 +0800)]
MDL-27863 moodlelib - fixed testcase faliure in MDL-27577

11 years agoMDL-24355 tag: minor clean up of tags changes
Andrew Davis (andyjdavis) [Tue, 7 Jun 2011 08:18:09 +0000 (16:18 +0800)]
MDL-24355 tag: minor clean up of tags changes

11 years agoMDL-24355 Fixed up deletion of tag correlations when deleting tags
Sam Hemelryk [Wed, 20 Apr 2011 04:20:55 +0000 (12:20 +0800)]
MDL-24355 Fixed up deletion of tag correlations when deleting tags

11 years agoMDL-24355 Added code to delete any tag correlations that wern't just identified
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

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

11 years agoMerge branch 'MDL-27797' 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

11 years agoMerge branch 'MDL-27639_wip' 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

11 years agoMerge branch 'master_MDL-27858' of git://github.com/danmarsden/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

11 years agoMerge branch 'MDL-27848_for_master' of git://github.com/kordan/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

11 years agoSCORM MDL-27858 - fix typo
Dan Marsden [Tue, 14 Jun 2011 22:31:52 +0000 (10:31 +1200)]
SCORM MDL-27858 - fix typo

11 years agoMerge branch 'backup-convert' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 20:38:27 +0000 (22:38 +0200)]
Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle

11 years agoMDL-27854 qformat_xml fix import/export of essay questions to include the new options.
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.

11 years agoAutomatically generated installer lang files
AMOS bot [Tue, 14 Jun 2011 16:25:54 +0000 (18:25 +0200)]
Automatically generated installer lang files

11 years agoMDL-27797 fix all the codechecker issues in format_xml
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.

11 years agoMDL-27797 fix bugs with Moodle XML export.
Tim Hunt [Tue, 14 Jun 2011 15:34:14 +0000 (16:34 +0100)]
MDL-27797 fix bugs with Moodle XML export.

11 years agoMDL-27759 fix whitespace
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 15:01:20 +0000 (17:01 +0200)]
MDL-27759 fix whitespace

11 years agoMDL-27852 local_qeupgradehelper convertquiz.php script was broken.
Tim Hunt [Tue, 14 Jun 2011 14:59:25 +0000 (15:59 +0100)]
MDL-27852 local_qeupgradehelper convertquiz.php script was broken.

11 years agoMerge branch 'wip-mdl-27759-integration-master' of git://github.com/rajeshtaneja...
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

11 years agoMerge branch 'MDL-25461-lang-install-link' of git://github.com/mudrd8mz/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

11 years agoMDL-27849 fix qtype_multianswer attempt data restore (2.1 -> 2.1).
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.

11 years agoMDL-27708 Fixed the version of language packs to install in 2.1
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

11 years agoMDL-25461 Installing a language pack is recorded in moodle.org statistics
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.

11 years agoMDL-27585 implement restore of qtype_calculatedmulti 2.1 attempt data
Tim Hunt [Tue, 14 Jun 2011 11:07:58 +0000 (12:07 +0100)]
MDL-27585 implement restore of qtype_calculatedmulti 2.1 attempt data

11 years agoMDL-27639 restore of attempt data from 2.0 - first attempt.
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.

11 years agoMDL-27639 add two missing language strings.
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.

11 years agoMDL-27839 supply default qtype_essay_options if they are not present in the XML.
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.

11 years agoMDL-27787 Fix restore of matching quetsions backed up from Moodle 2.0.
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.

11 years agoMDL-27844 files support added to get_users_by_id()
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 10:41:51 +0000 (12:41 +0200)]
MDL-27844 files support added to get_users_by_id()

11 years agoMerge branch 'wip-MDL-27825-master' of git://github.com/samhemelryk/moodle
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

11 years agoMerge branch 'MDL-27525' of git://github.com/rwijaya/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

11 years agoMDL-27835_for_master fix
Kordan [Tue, 14 Jun 2011 09:04:39 +0000 (11:04 +0200)]
MDL-27835_for_master fix

11 years agoMDL-27825 Improved check of themedesignermode to prevent errors if it isn't set
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

11 years agoMDL-27552 whitespace fixes
Eloy Lafuente (stronk7) [Tue, 14 Jun 2011 06:55:06 +0000 (08:55 +0200)]
MDL-27552 whitespace fixes

11 years agoMDL-27759 Fixed conflicts for integration
Rajesh Taneja [Tue, 14 Jun 2011 02:45:03 +0000 (10:45 +0800)]
MDL-27759 Fixed conflicts for integration

11 years agoMDL-27759 user webservice - added new PARAM for timezone PARAM_TIMEZONE, to validate...
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

11 years agoMerge branch 'MDL-27834' of git://github.com/kordan/moodle
Sam Hemelryk [Tue, 14 Jun 2011 01:52:39 +0000 (09:52 +0800)]
Merge branch 'MDL-27834' of git://github.com/kordan/moodle

11 years agoMerge branch 'MDL-27286_master' of git://github.com/stronk7/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

11 years agoMerge branch 's11_MDL-27497_upload_master' of github.com:dongsheng/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

11 years agoMerged branch 's11_MDL-27552_token_master' of git@github.com:dongsheng/moodle.git...
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

11 years agoMDL-27822 rename new methods
Eloy Lafuente (stronk7) [Mon, 13 Jun 2011 22:33:16 +0000 (00:33 +0200)]
MDL-27822 rename new methods

11 years agoMDL-27822 old module version should be available in restore_activity_structure_step...
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()

11 years agoMerge branch 'MDL-27065-workshop-categories' of git://github.com/mudrd8mz/moodle
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