Aparup Banerjee
914bfea245
MDL-27819 Backup - fixed extra answers/jump data.
...
- fixed unset causing missing property
- fixed answers empty notice, allowed for page with no answers.
2011-06-16 10:52:45 +02:00
Eloy Lafuente (stronk7)
5c5f71172a
Merge branch 'wip-MDL-24355-master' of git://github.com/andyjdavis/moodle
2011-06-16 10:38:49 +02:00
Eloy Lafuente (stronk7)
a31a6ce32d
MDL-27171 take rid of 2 wrong strings moved to forum/lang/xx/forum.php
2011-06-16 00:43:58 +02:00
Eloy Lafuente (stronk7)
192026f6e5
Merge branch 'MDL-27797_fixup' of git://github.com/timhunt/moodle
2011-06-15 18:18:26 +02:00
Tim Hunt
1f1c60c6a7
MDL-27797 supplimental. Fix two minor issues found by Sam H during testing.
2011-06-15 15:38:46 +01:00
Eloy Lafuente (stronk7)
3420de9f97
Merge branch 'MDL-27865' of git://github.com/timhunt/moodle
2011-06-15 14:37:23 +02:00
Tim Hunt
e6d7658337
MDL-27865 fix editing of calculated* questions.
2011-06-15 12:20:26 +01:00
Aparup Banerjee
6df63e4f9b
MDL-27819 Backup - mod_lesson conversion: optimized page buffering from all pages to 3 pages
2011-06-15 12:09:33 +02:00
Aparup Banerjee
496a576aa9
MDL-27819 backup - added nextpageid and prevpageid elements to lesson moodle1 backup conversion to 2.x
2011-06-15 12:09:24 +02:00
Eloy Lafuente (stronk7)
84a5f2d26e
Merge branch 'MDL-27820' of git://github.com/stronk7/moodle
2011-06-15 11:59:52 +02:00
Eloy Lafuente (stronk7)
07c4c12b80
Merge branch 'wip-mdl-27863-master' of git://github.com/rajeshtaneja/moodle
2011-06-15 11:25:09 +02:00
Eloy Lafuente (stronk7)
5edac71d16
MDL-27820 backup - fix backup of ratings
2011-06-15 11:01:41 +02:00
Rajesh Taneja
42ab2b70a4
MDL-27863 moodlelib - fixed testcase faliure in MDL-27577
2011-06-15 16:34:52 +08:00
Andrew Davis (andyjdavis)
638cf6157a
MDL-24355 tag: minor clean up of tags changes
2011-06-15 14:25:38 +08:00
Sam Hemelryk
e2a64d832e
MDL-24355 Fixed up deletion of tag correlations when deleting tags
2011-06-15 08:36:17 +08:00
Sam Hemelryk
2650c54734
MDL-24355 Added code to delete any tag correlations that wern't just identified
2011-06-15 08:36:17 +08:00
Eloy Lafuente (stronk7)
17073fb53a
Merge branch 'MDL-27852' of git://github.com/timhunt/moodle
2011-06-15 02:04:50 +02:00
Eloy Lafuente (stronk7)
31c7fbafa6
Merge branch 'MDL-27797' of git://github.com/timhunt/moodle
2011-06-15 02:00:23 +02:00
Eloy Lafuente (stronk7)
a16e137f21
Merge branch 'MDL-27639_wip' of git://github.com/timhunt/moodle
2011-06-15 01:30:59 +02:00
Eloy Lafuente (stronk7)
5800c0fde1
Merge branch 'master_MDL-27858' of git://github.com/danmarsden/moodle
2011-06-15 01:18:05 +02:00
Eloy Lafuente (stronk7)
d55ecccb9b
Merge branch 'MDL-27848_for_master' of git://github.com/kordan/moodle
2011-06-15 00:48:56 +02:00
Dan Marsden
bdea587be2
SCORM MDL-27858 - fix typo
2011-06-15 10:31:52 +12:00
Eloy Lafuente (stronk7)
ee1235e7af
Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle
2011-06-14 22:38:27 +02:00
Tim Hunt
8a5d05eea8
MDL-27854 qformat_xml fix import/export of essay questions to include the new options.
2011-06-14 17:36:11 +01:00
Tim Hunt
79e25fb456
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.
2011-06-14 17:06:55 +01:00
Tim Hunt
67b8b40cfa
MDL-27797 fix bugs with Moodle XML export.
2011-06-14 16:34:14 +01:00
Eloy Lafuente (stronk7)
4a9e5fbe91
MDL-27759 fix whitespace
2011-06-14 17:01:20 +02:00
Tim Hunt
ba5a29f528
MDL-27852 local_qeupgradehelper convertquiz.php script was broken.
2011-06-14 15:59:25 +01:00
Eloy Lafuente (stronk7)
90333a972e
Merge branch 'wip-mdl-27759-integration-master' of git://github.com/rajeshtaneja/moodle
2011-06-14 16:57:36 +02:00
Eloy Lafuente (stronk7)
b0635db229
Merge branch 'MDL-25461-lang-install-link' of git://github.com/mudrd8mz/moodle
2011-06-14 16:43:07 +02:00
Tim Hunt
98a3898efc
MDL-27849 fix qtype_multianswer attempt data restore (2.1 -> 2.1).
...
Also, refactor calculatedmulti restore to avoid duplication.
2011-06-14 15:17:50 +01:00
David Mudrak
07ec4f650b
MDL-27708 Fixed the version of language packs to install in 2.1
2011-06-14 13:55:27 +02:00
David Mudrak
da84821329
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.
2011-06-14 13:49:09 +02:00
Tim Hunt
5b64e32645
MDL-27585 implement restore of qtype_calculatedmulti 2.1 attempt data
2011-06-14 12:11:23 +01:00
Tim Hunt
18ab06bac5
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.
2011-06-14 12:11:19 +01:00
Tim Hunt
b8882c1334
MDL-27639 add two missing language strings.
...
Without these strings, important information for debugging is not displayed.
2011-06-14 12:10:27 +01:00
Tim Hunt
cee74600fa
MDL-27839 supply default qtype_essay_options if they are not present in the XML.
2011-06-14 12:10:25 +01:00
Tim Hunt
d7ad6ac4ef
MDL-27787 Fix restore of matching quetsions backed up from Moodle 2.0.
2011-06-14 12:10:23 +01:00
Eloy Lafuente (stronk7)
7a5f3a3cc7
MDL-27844 files support added to get_users_by_id()
2011-06-14 12:41:51 +02:00
Eloy Lafuente (stronk7)
260dd13064
Merge branch 'wip-MDL-27825-master' of git://github.com/samhemelryk/moodle
2011-06-14 12:32:47 +02:00
Eloy Lafuente (stronk7)
e298ec5162
Merge branch 'MDL-27525' of git://github.com/rwijaya/moodle
2011-06-14 12:11:54 +02:00
Kordan
db3b8953ce
MDL-27835_for_master fix
2011-06-14 11:04:39 +02:00
Sam Hemelryk
e625feaf0b
MDL-27825 Improved check of themedesignermode to prevent errors if it isn't set
2011-06-14 15:48:10 +08:00
Eloy Lafuente (stronk7)
9b9d7a6039
MDL-27552 whitespace fixes
2011-06-14 08:55:06 +02:00
Rajesh Taneja
b4e29077d3
MDL-27759 Fixed conflicts for integration
2011-06-14 10:45:03 +08:00
Rajesh Taneja
ccc77f9152
MDL-27759 user webservice - added new PARAM for timezone PARAM_TIMEZONE, to validate timezone input in webservice while deling with user information
2011-06-14 10:15:00 +08:00
Sam Hemelryk
0e36d0cdf5
Merge branch 'MDL-27834' of git://github.com/kordan/moodle
2011-06-14 09:52:39 +08:00
Sam Hemelryk
f74415b926
Merge branch 'MDL-27286_master' of git://github.com/stronk7/moodle
2011-06-14 09:47:52 +08:00
Sam Hemelryk
650142bb9b
Merge branch 's11_MDL-27497_upload_master' of github.com:dongsheng/moodle
2011-06-14 09:43:24 +08:00
Sam Hemelryk
d8f85b6e8b
Merged branch 's11_MDL-27552_token_master' of git@github.com:dongsheng/moodle.git with changes
2011-06-14 09:32:44 +08:00
