Commit graph

48241 commits

Author SHA1 Message Date
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
Sam Hemelryk
115910dccd Merge branch 'MDL-27966_master' of git://github.com/stronk7/moodle 2011-06-22 17:15:10 +08:00
Sam Hemelryk
df839f28dc Merge branch 'MDL-25811_master' of git://github.com/stronk7/moodle 2011-06-22 17:06:12 +08:00
Rajesh Taneja
ba15c346b1 MDL-27956 Lesson - Fixed strings and readquestions scope 2011-06-22 09:11:32 +08:00
Eloy Lafuente (stronk7)
1e3ddd6bc4 Merge branch 's10_MDL-27341_flickr_json_error_master' of git://github.com/dongsheng/moodle 2011-06-22 03:06:14 +02:00
Eloy Lafuente (stronk7)
92f753eb99 Merge branch 'MDL-27860' of git://github.com/timhunt/moodle 2011-06-22 02:57:50 +02:00
Eloy Lafuente (stronk7)
96dc283b53 Merge branch 'MDL-27914' of git://github.com/nebgor/moodle 2011-06-22 02:52:50 +02:00
Eloy Lafuente (stronk7)
8032990022 Merge branch 'MDL-26948' of git://github.com/timhunt/moodle 2011-06-22 02:35:25 +02:00
Eloy Lafuente (stronk7)
6057bf5b05 MDL-27810 portfolio: Added ->portfolioenabled check to one more place 2011-06-22 02:10:11 +02:00
Eloy Lafuente (stronk7)
555cc4b4a0 Merge branch 'wip-MDL-27810-master' of git://github.com/samhemelryk/moodle 2011-06-22 01:56:30 +02:00
Eloy Lafuente (stronk7)
2fc832a1ae Merge branch 'MDL-27906_HEAD' of git://github.com/rwijaya/moodle 2011-06-22 01:52:57 +02:00
Eloy Lafuente (stronk7)
f5a6bf5e35 Merge branch 'master_MDL-27959' of git://github.com/danmarsden/moodle 2011-06-22 01:35:15 +02:00
David Mudrak
c1ab2b109e MDL-27970 workshop submission can't be edited after the deadline even if late submissions are allowed 2011-06-22 00:34:45 +02:00
Eloy Lafuente (stronk7)
ea1e73843b MDL-27966 timezones - updated to 2011g version + fix minor notice 2011-06-21 16:23:24 +02:00
Aparup Banerjee
38adb0def9 MDL-27914 data fixed image gallery template CSS selector for #singleimage to include img tag and set height to auto 2011-06-21 14:22:00 +08:00
Dan Marsden
b447192e8f Choice MDL-27959 invalid strings 2011-06-21 16:39:46 +12:00
Andrew Davis (andyjdavis)
7ce5df8620 MDL-27920 gradebook: export was always excluding course totals and xml export was failing 2011-06-21 11:13:34 +08:00
Sam Hemelryk
6708a1f525 MDL-27810 portfolio: Added ->portfolioenabled checks before creating portfolio buttons to avoid initialising portfolio requirements 2011-06-21 10:35:53 +08:00
Eloy Lafuente (stronk7)
beae4a6684 MDL-25811 automated backups - clean running status after 90 mins of inactivity 2011-06-21 02:41:12 +02:00
Eloy Lafuente (stronk7)
1b8655ab0f MDL-27952 quiz - fix navigation for users having 0 nodes in module nav 2011-06-21 02:38:04 +02:00
Eloy Lafuente (stronk7)
3552484b91 on-demand release 2.1beta 2011-06-21 02:31:40 +02:00
Eloy Lafuente (stronk7)
b3c1b5f1a6 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-06-21 02:30:37 +02:00
Eloy Lafuente (stronk7)
9192e9fe45 Merge branch 'master_MDL-27366' of git://github.com/danmarsden/moodle 2011-06-20 23:38:47 +02:00
Eloy Lafuente (stronk7)
5e811bb000 Merge branch 's11_MDL-27941_partipants_page_master' of github.com:dongsheng/moodle 2011-06-20 18:44:08 +02:00