48214 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
50d32a2baf on-demand release 2.1beta 2011-06-24 00:48:51 +02:00
Eloy Lafuente (stronk7)
2e27e2d64a Merge branch 'MDL-28012' of git://github.com/timhunt/moodle 2011-06-24 00:31:53 +02:00
Eloy Lafuente (stronk7)
89ad7c078e Merge branch 'MDL-27827_head' of git://github.com/grabs/moodle 2011-06-24 00:21:58 +02:00
Eloy Lafuente (stronk7)
4965f02087 Merge branch 's11_MDL-27999_wiki_preview_master' of github.com:dongsheng/moodle 2011-06-24 00:13:48 +02:00
Eloy Lafuente (stronk7)
06c8cef4c2 Merge branch 'wip-MDL-27962-master' of git://github.com/samhemelryk/moodle 2011-06-24 00:02:20 +02:00
Eloy Lafuente (stronk7)
fcb36b65ec Merge branch 'wip-MDL-27958-master' of git://github.com/samhemelryk/moodle 2011-06-23 23:57:55 +02:00
Eloy Lafuente (stronk7)
adecb9de9a Merge branch 'wip-MDL-27940-master' of git://github.com/samhemelryk/moodle 2011-06-23 23:54:32 +02:00
Andreas Grabs
65ee5d7dad MDL-27827 - Missing messageprovider:message language string 2011-06-23 20:33:12 +02:00
Tim Hunt
c5da295b85 MDL-28012 Quiz editing status line can display screwy dates. 2011-06-23 18:53:07 +01:00
Eloy Lafuente (stronk7)
9867711fd7 on-demand release 2.1beta 2011-06-23 18:24:57 +02:00
stabijoh
5fc36f559f MDL-27998 canvas theme - fix font sizes 2011-06-23 17:28:29 +02:00
Eloy Lafuente (stronk7)
b4bb80b7d6 weekly release 2.1beta 2011-06-23 11:25:48 +02:00
Eloy Lafuente (stronk7)
916cbea67f Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-06-23 11:24:03 +02:00
Eloy Lafuente (stronk7)
5088275347 Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle 2011-06-23 11:16:00 +02:00
Dongsheng Cai
14b2d8d865 MDL-26677 flickr repo - fix undefined index usewatermarks 2011-06-23 17:13:46 +08:00
Eloy Lafuente (stronk7)
618d2ecf48 Merge branch 'MDL-27920_grade_export' of git://github.com/andyjdavis/moodle 2011-06-23 10:15:07 +02:00
Andrew Davis (andyjdavis)
8de7c8a7ff MDL-27920 gradebook: fixes following integration review 2011-06-23 15:58:44 +08:00
Dongsheng Cai
7cacd29fac MDL-27999 mod wiki, fixed broken image in preview 2011-06-23 13:52:14 +08:00
Sam Hemelryk
8b05c5e2bd MDL-27962 Fixed typo in tablelib preventing columns from being collapsed 2011-06-23 13:33:28 +08:00
Sam Hemelryk
7313ac6c7a MDL-27958 Added missing set_context call which would cause errors for all contexts below course 2011-06-23 12:16:09 +08:00
Sam Hemelryk
d38a4849b7 MDL-27940 navigaiton: Fixed an ordering problem so that when a parent was set for a node the nodes activity was accounted for 2011-06-23 11:29:26 +08:00
Sam Hemelryk
58c724a613 Merge branch 'MDL-27169_master' of git://github.com/stronk7/moodle 2011-06-23 10:43:57 +08:00
AMOS bot
99774e998c Automatically generated installer lang files 2011-06-23 00:55:12 +00:00
Eloy Lafuente (stronk7)
5973f0b53d MDL-26677 repositories - clean one debugging var_dump() 2011-06-23 02:04:30 +02:00
Eloy Lafuente (stronk7)
39354db055 Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle 2011-06-23 02:02:24 +02:00
Eloy Lafuente (stronk7)
4c15bde8f1 Merge branch 'MDL-27948' of git://github.com/timhunt/moodle 2011-06-23 01:14:19 +02:00
Eloy Lafuente (stronk7)
daf4cf26f7 Merge branch 'MDL-27929' of git://github.com/timhunt/moodle 2011-06-23 00:51:16 +02:00
Eloy Lafuente (stronk7)
e345969ae2 Merge branch 'MDL-27937' of git://github.com/timhunt/moodle 2011-06-23 00:46:29 +02:00
Eloy Lafuente (stronk7)
e059fa90b1 Merge branch 'MDL-27973' of git://github.com/timhunt/moodle 2011-06-23 00:43:11 +02:00
Eloy Lafuente (stronk7)
4d05c972ea Merge branch 'MDL-27974' of git://github.com/timhunt/moodle 2011-06-23 00:37:13 +02:00
Eloy Lafuente (stronk7)
a2854474ce Merge branch 'MDL-27979' of git://github.com/timhunt/moodle 2011-06-23 00:34:03 +02:00
Eloy Lafuente (stronk7)
63c4530f0f Merge branch 'MDL-27991' of git://github.com/timhunt/moodle 2011-06-23 00:29:28 +02:00
Eloy Lafuente (stronk7)
aad4048bd7 Merge branch 'MDL-27196-hardcodedstrings' of git://github.com/mudrd8mz/moodle 2011-06-23 00:25:27 +02:00
Tim Hunt
da72991636 MDL-27979 Should be an edit link for each question when previewing or reviewing a quiz. 2011-06-22 21:07:40 +01:00
Tim Hunt
eb624cf7e0 MDL-27937 Calculated tolerance field should have the label Tolerance +- 2011-06-22 19:49:39 +01:00
Tim Hunt
87af936b22 MDL-27991 End test... should be Finish attempt... to be more Moodly 2011-06-22 19:24:45 +01:00
Tim Hunt
35d5f1c28d MDL-27948 The question engine should use recordsets to load attempt data
This should be good for performance (memory usage). It also avoids having to construct a meaningless, unique, first column, which is a pain on MyQSL.
2011-06-22 18:53:15 +01:00
Tim Hunt
2fa66bdf71 MDL-27929 question_attempts.minfraction should be signed! 2011-06-22 18:48:05 +01:00
Eloy Lafuente (stronk7)
a8f3f4ccf1 MDL-27169 filepicker - add explicit enctype to the js upload form. Credit goes to J Ross Nicoll, thanks! 2011-06-22 19:30:57 +02:00
David Mudrak
e4394d00c4 MDL-27196 workshop - hardcoded strings in the random allocator 2011-06-22 17:58:48 +02:00
David Mudrak
069de416af MDL-27196 workshop - hardcoded string in the number of errors strategy form 2011-06-22 17:40:40 +02:00
Tim Hunt
ef01d2c8f5 MDL-27973 hopefully fix QTI2 question export.
Well, at least fix the most obvious notices.
2011-06-22 15:56:05 +01:00
Tim Hunt
3c78184552 MDL-27974 problems with gift question import/export.
Double-escapeing in match export and not initialising combined feedback on import.

Also remove a lot of redundant breaks.
2011-06-22 15:26:34 +01:00
Eloy Lafuente (stronk7)
d2a5e2278c Merge branch 'wip-mdl-26281-master' of git://github.com/rajeshtaneja/moodle 2011-06-22 14:27:46 +02:00
Eloy Lafuente (stronk7)
f96147c291 Merge branch 'wip-mdl-27956-master' of git://github.com/rajeshtaneja/moodle 2011-06-22 14:21:01 +02:00
Eloy Lafuente (stronk7)
fc57ca6a54 Merge branch 'MDL-27969-randomallocator' of git://github.com/mudrd8mz/moodle 2011-06-22 14:15:52 +02:00
Eloy Lafuente (stronk7)
01acbc42e1 Merge branch 'MDL-27073_multilang-custommenu' of git://github.com/mudrd8mz/moodle 2011-06-22 14:11:18 +02:00
David Mudrak
9153248d22 MDL-27969 workshop - prevent PHP notices in the random allocator
When generating the output of the allocation results, the names of
reviewers and authors are obtained based on the current state of assigned
roles and the 'musthavesubmission' setting. Therefore, when we want to
display information about a re-used allocation, the name of the author
or the name of the author may not be available.

In case of reviewers, we first try to reload the list including the
users without own submission. If it does not help, we just display the
id of the user instead of the name. In case of authors, we just display
the id the user. I can't see much point of eventual fetching the user
record from the database just to populate the list that almost no-one
reads anyway.
2011-06-22 12:03:56 +02:00
Sam Hemelryk
a0977339b0 Merge branch 'MDL-27952' of git://github.com/stronk7/moodle 2011-06-22 17:20:49 +08:00
Rajesh Taneja
92c93432bd MDL-26281 Lesson - Fixed short answer with apostrophe and other html formats 2011-06-22 17:17:55 +08:00