Commit graph

3045 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
be13d37a02 Merge branch 'MDL-28074' of git://github.com/timhunt/moodle 2011-06-29 23:09:13 +02:00
Tim Hunt
56a4ae4673 MDL-28074 question preview should set context/course/cm properly.
1. We need this so that, for example, when previewing a question from
the quiz editing page, the preview uses the filter settings, theme and
language set for that quiz and course.
2011-06-29 21:25:56 +01:00
Eloy Lafuente (stronk7)
fae9cd077c Merge branch 'MDL-28037' of git://github.com/timhunt/moodle 2011-06-29 20:44:49 +02:00
Sam Hemelryk
f86e19b1ee Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-06-29 17:04:13 +08:00
Tim Hunt
8818c826ea MDL-28055 quiz_upgrade_very_old_question_sessions bit does not work because of missing includes. 2011-06-28 10:57:50 +01:00
Tim Hunt
50de6ad083 MDL-28037 Make restoring quiz_attempts more robust.
Don't assume that 0 is unique (even temporarily).
2011-06-27 18:27:12 +01:00
Sam Hemelryk
35d4d85dc4 Merge branch 'unsigned_fixes' of git://github.com/stronk7/moodle 2011-06-27 15:45:41 +08:00
Andrew Davis (andyjdavis)
b38e2e28a1 MDL-27829 blocks: altered the algorithm used to find plugin page types 2011-06-27 12:27:41 +08:00
Eloy Lafuente (stronk7)
8b95f430b5 MDL-28036 quiz - add some missing (reports) lang strings 2011-06-26 18:22:23 +02:00
Eloy Lafuente (stronk7)
a0628c68de MDL-28032 database - fix some sign inconsistencies 2011-06-26 13:12:42 +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)
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
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
87af936b22 MDL-27991 End test... should be Finish attempt... to be more Moodly 2011-06-22 19:24:45 +01: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
Sam Hemelryk
a0977339b0 Merge branch 'MDL-27952' of git://github.com/stronk7/moodle 2011-06-22 17:20:49 +08:00
Rajesh Taneja
ba15c346b1 MDL-27956 Lesson - Fixed strings and readquestions scope 2011-06-22 09:11:32 +08: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)
8032990022 Merge branch 'MDL-26948' of git://github.com/timhunt/moodle 2011-06-22 02:35:25 +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)
aed0dbe70a Merge branch 'MDL-27942' of git://github.com/timhunt/moodle 2011-06-20 17:05:54 +02:00
Eloy Lafuente (stronk7)
ee37607188 Merge branch 'MDL-27925' of git://github.com/timhunt/moodle 2011-06-20 11:56:34 +02:00
Tim Hunt
e28bbd8919 MDL-27942 Use picture not displayed during quiz attempts. 2011-06-20 10:26:01 +01:00
Sam Hemelryk
8ffaf7b4dd Merge branch 'MDL-27928' of git://github.com/timhunt/moodle 2011-06-20 13:06:10 +08:00
Sam Hemelryk
3fc7c06b99 Merge branch 'quiz_feedback_for_grade' of git://github.com/stronk7/moodle 2011-06-20 13:02:02 +08:00
Eloy Lafuente (stronk7)
1b327dec8a MDL-27932 quiz - fix some calls to quiz_feedback_for_grade() 2011-06-20 01:46:29 +02:00
Eloy Lafuente (stronk7)
f2113d66cd Merge branch 'MDL-27910' of git://github.com/timhunt/moodle 2011-06-20 01:26:03 +02:00
Eloy Lafuente (stronk7)
b9412668c4 Merge branch 'MDL-27902' of git://github.com/timhunt/moodle 2011-06-20 01:21:18 +02:00
Tim Hunt
460797abbd MDL-27928 missing string in the question bank UI.
AMOS BEGIN
 MOV [categorymove,mod_quiz],[categorymove,question]
AMOS END
2011-06-19 10:44:44 +01:00
Tim Hunt
3461dbad9e MDL-27860 count quiz attempts properly when checking if a new attempt is allowed. 2011-06-18 18:23:49 +01:00
Tim Hunt
bc502c166c MDL-27908 quiz settings menu, make the order more logical. 2011-06-18 16:27:21 +01:00
Tim Hunt
e50a5813b7 MDL-27910 quiz stupid typo in a DB query 2011-06-18 11:37:08 +01:00
Tim Hunt
83f93ec41f MDL-26948 quiz navigation fake block should have an id to allow styling. 2011-06-17 17:26:28 +01:00
Tim Hunt
3a5da40b4c MDL-27902 quiz reviewquestion.php page needs to be converted to use the renderer. 2011-06-17 15:27:41 +01:00
Tim Hunt
08c458d10f MDL-27877 question engine progress bars not working. 2011-06-16 18:55:10 +01: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)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02: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
Sam Hemelryk
46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
Tim Hunt
55190d7e2c MDL-20538 get rid of badly name-spaced constants from lib/questionlib.php.
Unfortunately, they are used all over the import/export code, so I cannot eliminate them completely. However, I was able to move them out of the core library.
2011-06-09 19:27:36 +01:00
David Mudrak
b61cf3ff8a MDL-22414 Merge branch 'master' into backup-convert
Conflicts:
	theme/base/style/core.css
2011-06-09 13:04:49 +02:00
Dongsheng Cai
b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
Tim Hunt
810c5b9e5a MDL-27770 unnecessary upgrade step copied into quiz upgrade script. 2011-06-08 17:48:43 +01:00
Tim Hunt
47678d60f8 MDL-27747 quiz_statistics fix edit question icons. #737 2011-06-07 16:46:30 +01:00
Tim Hunt
0f1c59c552 MDL-27747 quiz locallib remove unnecessary try/catch. #475
delegated_transaction just does the right thing. Thanks to Justin Wyllie for spotting this.
2011-06-07 16:27:49 +01:00
Tim Hunt
adf7fe2148 MDL-27747 Missing information and errors on the quiz view page. #720 2011-06-07 16:05:17 +01:00
Tim Hunt
f57d75bdf8 MDL-27747 quiz review, time taken and overtime were formatted incorrectly #598 2011-06-07 15:33:31 +01:00
Tim Hunt
97cdc1de72 MDL-27747 quiz summary, add a CSS class to the table rows based on question state.
The standard themes do not use this for anything, but it makes it easier for themers to do cool stuff.
Also improve the API for getting the question state class.
2011-06-07 15:11:04 +01:00
Tim Hunt
c9272e87f9 MDL-27747 quiz End test... link was not working. #387
I don't know why this was ever changed from class to id. That was done in commit a1eb3a4466.
2011-06-07 14:29:11 +01:00