48091 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
3c158ff95e Merge branch 'MDL-27868' of git://github.com/timhunt/moodle 2011-06-17 16:45:30 +02:00
Tim Hunt
5cf69d7ff5 MDL-27868 Hints (and some other things) lost when re-editing calculated* questions. 2011-06-17 15:42:03 +01:00
Eloy Lafuente (stronk7)
ff30976ad5 Merge branch 'MDL-27887' of git://github.com/timhunt/moodle 2011-06-17 16:16:58 +02:00
Eloy Lafuente (stronk7)
5df6b3c87e Merge branch 'MDL-27877' of git://github.com/timhunt/moodle 2011-06-17 15:32:10 +02:00
Eloy Lafuente (stronk7)
5017d4dc7d Merge branch 'MDL-27878' of git://github.com/timhunt/moodle 2011-06-17 15:30:16 +02:00
Tim Hunt
5f79a9bcb6 MDL-27898 fix question/engine/simpletest/testdatalib.php unit tests.
Now that MDL-27897 is fixed.
2011-06-17 11:28:05 +01:00
Tim Hunt
cfcf9bb4e3 MDL-27897 moodle_database::get_in_or_equal must not use a static variable.
It makes unit testing impossible. Switch to a field.
2011-06-17 11:26:51 +01:00
Eloy Lafuente (stronk7)
d037c6bc3c on-demand release 2.1beta 2011-06-17 11:18:33 +02:00
Aparup Banerjee
cec76330fe MDL-27500 editor - updated plugin version references, thirdparty version reference and tinymce upgrade readme 2011-06-17 16:52:57 +08:00
Eloy Lafuente (stronk7)
16fd82d8ef MDL-27500 HTML Editor - bump version 2011-06-17 01:11:34 +02:00
Eloy Lafuente (stronk7)
33865a7812 MDL-27500 HTML Editor - deleted 3.3.9.2 build 2011-06-17 01:10:15 +02:00
Eloy Lafuente (stronk7)
7035b80ad9 Merge branch 'MDL-27500' of git://github.com/nebgor/moodle 2011-06-17 01:06:07 +02:00
Tim Hunt
a8c8641802 MDL-27887 In developer debug, use uncompressed TinyMCE code. 2011-06-16 18:59:41 +01:00
Tim Hunt
6481b28fe5 MDL-27878 make progress bars fail explicity if you forget to call create(). 2011-06-16 18:55:29 +01:00
Tim Hunt
08c458d10f MDL-27877 question engine progress bars not working. 2011-06-16 18:55:10 +01:00
Eloy Lafuente (stronk7)
c3f85e22d9 weekly release 2.1beta 2011-06-16 19:08:04 +02:00
Eloy Lafuente (stronk7)
28e23ea737 fix permissions 2011-06-16 19:06:07 +02:00
Eloy Lafuente (stronk7)
868ca72707 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-06-16 19:03:16 +02:00
Andrew Davis (andyjdavis)
0f63f2714f MDL-26105 blocks: made the block settings help icons work 2011-06-16 12:05:53 +02:00
Andrew Davis (andyjdavis)
84a1bea972 MDL-26105 blocks: readded the my moodle page's page type list generator function 2011-06-16 12:05:48 +02:00
Aparup Banerjee
da4772a276 Backup - mod lesson conversion: apply jumpto fix only to matching question types. 2011-06-16 10:52:55 +02:00
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
AMOS bot
037b313215 Automatically generated installer lang files 2011-06-14 18:25:54 +02: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