10416 Commits

Author SHA1 Message Date
Petr Skoda
d83bad412a MDL-26119 fixing regression caused by previous merge in PULL-294
We can not use empty() on function directly, the PHP docs were incorrect.
2011-02-15 15:06:24 +01:00
Eloy Lafuente (stronk7)
418b3b6e98 MDL-26414 gloosary - fix wrong init introduced by MDL-26371 2011-02-15 10:53:23 +01:00
Petr Skoda
64529cb6d2 Merge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle 2011-02-15 10:39:54 +01:00
Aparup Banerjee
fb473042ae glossary MDL-22970 changed fieldname so that MSSQL does not complain about same fieldnames
something should be done about this in the driver
2011-02-15 09:33:25 +01:00
andyjdavis
3a00a167c6 message MDL-26119 fixed up the logged URL 2011-02-15 14:24:13 +08:00
Eloy Lafuente (stronk7)
46388c9cf9 Merge branch 'MDL-26369' of git://github.com/timhunt/moodle 2011-02-15 00:58:01 +01:00
Aparup Banerjee
fe1776b9f2 MDL-22970 glossary - perf. improvements in recent activity 2011-02-15 00:33:13 +01:00
Petr Skoda
5d41c24d9f Merge branch 'MDL-26312-workshop-upgrade' of git://github.com/mudrd8mz/moodle 2011-02-14 21:45:57 +01:00
David Mudrak
0c3c0de198 MDL-26312 Workshop: unset temporary arrays in upgrade code
Spotted by Petr Skoda during the code review.
2011-02-14 21:38:50 +01:00
Petr Skoda
9ceaf7b5a0 Merge branch 'm20_MDL-26212_resizefix' of git://github.com/danmarsden/moodle 2011-02-14 21:37:37 +01:00
Petr Skoda
cbbc272542 Merge branch 'MDL-26371_distinct_text' of git://github.com/stronk7/moodle 2011-02-14 21:19:35 +01:00
Petr Skoda
995b6ff605 Merge branch 'MDL-26229_restore_attempts_wip' of git://github.com/stronk7/moodle 2011-02-14 21:02:49 +01:00
Petr Skoda
a60a943696 Merge branch 'MDL-25553_lesson_jumpto_wip' of git://github.com/stronk7/moodle 2011-02-14 20:39:31 +01:00
Eloy Lafuente (stronk7)
89bf60cdbc Merge branch 'MDL-26338' of git://github.com/timhunt/moodle 2011-02-14 19:57:38 +01:00
Tim Hunt
9b40c540ee MDL-20636 Responses report mostly working. 2011-02-14 17:57:47 +00:00
Tim Hunt
cf3b65686a MDL-20636 Finished conversion of the manual grading report. 2011-02-14 17:57:44 +00:00
Eloy Lafuente (stronk7)
76b7e2d1d6 Merge branch 'w07_MDL-26389_20_profile' of git://github.com/skodak/moodle 2011-02-14 15:58:26 +01:00
Petr Skoda
81b58cc227 MDL-26389 improve profile and search engine privacy 2011-02-14 15:42:26 +01:00
David Mudrak
f593111b67 MDL-26312 Workshop: data integrity check to detect eventual course_modules corruption
Because of a bug in Workshop upgrade code, multiple workshop course_modules can
potentially point to a single workshop instance. The chance is pretty low as in most cases,
the upgrade failed. But under certain circumstances, workshop could be upgraded with
this data integrity issue. We want to detect it now and let the admin know.
2011-02-14 10:11:42 +01:00
Petr Skoda
cbe4cbc268 Merge branch 'MDL-26353-database-import-help' of git://github.com/mudrd8mz/moodle 2011-02-14 09:20:53 +01:00
Dan Marsden
71550f6fa1 MDL-26212 - fix scorm player size on resize of browser window - bump scorm version as JS is changed. Kudos to Piers for patch 2011-02-14 14:50:43 +13:00
Tim Hunt
adaad5f224 MDL-20636 Fix install 2011-02-13 07:34:32 +00:00
Eloy Lafuente (stronk7)
e07c51c481 MDL-26371 sql - avoid distinct + text in lesson essay & report 2011-02-12 17:34:03 +01:00
Eloy Lafuente (stronk7)
b37d06c2ed MDL-26371 sql - avoid distinct + text in glossary search 2011-02-12 17:05:32 +01:00
Petr Skoda
b1d5d0155b MDL-26271 fix borked sql parameters in forum_search_posts and add missing modinfo field
This is the perfect example why there must not be duplicate parameter names in SQL queries.
2011-02-12 10:11:27 +01:00
Eloy Lafuente (stronk7)
bd9e662953 MDL-25553 lesson restore - add missing jumpto remapping. Credit goes to Mike Churchward 2011-02-12 04:02:10 +01:00
Eloy Lafuente (stronk7)
7cff4927be MDL-26229 backup & restore - fix quiz & lesson conflicts 2011-02-12 03:03:26 +01:00
Tim Hunt
a8a8ec51fc MDL-20636 Fix bug with starting an attempt. Now uses exceptions, so should not check return values. 2011-02-12 00:40:43 +00:00
David Mudrak
dd8ab1fb4a MDL-26353 Database activity module: display help icon with the new help strings
This commit makes the new strings added by Helen used at the Import
entries page. Note that the syntax of the strings had to be fixed as
there must not be leading whitespace before the asterisk in Markdown format.

Also as requested by Helen, the wording or export/import links is
improved now.

As a bonus for free, the patch fixes incorrect API usage of get_record()
and friends.
2011-02-12 00:02:20 +01:00
Helen Foster
76179aac08 MDL-26353 Database activity module new help string 2011-02-11 23:09:02 +01:00
Tim Hunt
2709ee45d3 MDL-20636 Working on converting the reports, starting with the manual grading report. Very much a work-in-progress.
Also, some random bug-fixing.
2011-02-11 18:47:08 +00:00
Tim Hunt
a13d4fbd20 MDL-20636 Fix lots of minor quiz editing glitches. 2011-02-11 17:36:30 +00:00
Tim Hunt
fd214b596d MDL-20636 Preserve scroll position when doing action on the quiz edit page. 2011-02-11 17:36:02 +00:00
Tim Hunt
2e5ce83f11 MDL-26369 fix notice caused by the fix for MDL-26098. 2011-02-11 14:15:43 +00:00
David Mudrak
d0fb170520 MDL-26312 Workshop: fixed upgrade of module instances from 1.9 to 2.0
The patch changes workshop_upgrade_module_instances() so that it
processes old workshop records ordered by their id and it keeps the
instances id by using import_record() instead of insert_record().
Thanks to this, there is no mapping of workshop ids needed so the
function workshop_upgrade_workshop_id_mappings() is dropped and all
callers use plain workshop record.
2011-02-11 07:43:04 +01:00
Tim Hunt
f9b0500f7f MDL-20636 Quiz editing now works, as does the random question type.
However, all this needs more testing.

Also, a bit of a purge of training whitespace and global .
2011-02-10 20:50:18 +00:00
Tim Hunt
1493619923 MDL-20636 Review option defaults in the admin settings. 2011-02-10 18:35:42 +00:00
Tim Hunt
dc3826eed7 MDL-26338 fix mixed types in quiz reports SQL. This was breaking Oracle 2011-02-09 20:48:21 +00:00
Tim Hunt
56e82d993d MDL-20636 Images in questions now work in quiz attempts. 2011-02-09 20:33:51 +00:00
Tim Hunt
7ee80cab53 MDL-20636 Manual comment popup comment.php now works. 2011-02-09 20:29:59 +00:00
Tim Hunt
729c372b1b MDL-20636 Quiz index and reviewquestion pages work. 2011-02-09 20:18:28 +00:00
Tim Hunt
b2607ccc19 MDL-20636 Now the quiz review page works. 2011-02-09 20:18:24 +00:00
Tim Hunt
167f1562f8 MDL-20636 Merge and fix quiz unit tests. 2011-02-09 20:18:21 +00:00
Tim Hunt
8f37f7fb7a MDL-20636 It is now possible to submit a page of the quiz, and view the summary page. 2011-02-09 20:18:18 +00:00
Tim Hunt
a1eb3a4466 MDL-20636 It is now possible to start a quiz attempt.
This includes merging the CSS.
2011-02-09 20:18:15 +00:00
Tim Hunt
7c5bd5bfab MDL-20636 Working towards being able to attempt a quiz. 2011-02-09 20:18:12 +00:00
Tim Hunt
48f1784a16 MDL-20636 Quiz view page now works. 2011-02-09 20:18:09 +00:00
Tim Hunt
f255782339 MDL-20636 You can now create a quiz, and edit the settings.
Little else works, but this is just the first step.
2011-02-09 20:18:06 +00:00
Tim Hunt
25302dee78 MDL-20636 Started work converting the quiz. 2011-02-09 20:18:03 +00:00
Eloy Lafuente (stronk7)
cd03ecce8e Merge branch 'MDL-24870_rss_error' of git://github.com/andyjdavis/moodle 2011-02-08 10:21:55 +01:00