mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-06 08:49:53 +01:00
Code Issues Projects Releases Wiki Activity
49,957 Commits 36 Branches 523 Tags
Commit Graph

2764 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
8ac9d33f49 Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	lib/db/upgrade.php
	report/completion/index.php
	report/progress/index.php
	version.php
 2011-11-11 03:37:55 +01:00
Eloy Lafuente (stronk7)
f3bf5eba51 Merge branch 'MDL-30145' of git://github.com/timhunt/moodle 2011-11-10 00:25:45 +01:00
Tim Hunt
9d5687893a MDL-30145 Quiz intro not displayed on the password page 2011-11-04 22:57:17 +00:00
Tim Hunt
f484a62984 MDL-30137 question engine: Ugglify the SQL to appease MS SQL server. 2011-11-04 15:02:29 +00:00
sam marshall
e4aec5bed3 MDL-26647 (6) Support showuseridentity on grader report, quiz report, SCORM report 2011-11-04 13:57:17 +00:00
Sam Hemelryk
6ab6630b87 Merge branch 'MDL-29164' of git://github.com/timhunt/moodle 2011-11-01 16:47:16 +13:00
Tim Hunt
a49e92a4e9 MDL-29164 question import, missing lang string. 
AMOS BEGIN
 MOV [noquestionsinfile,mod_quiz],[noquestionsinfile,question]
AMOS END
 2011-10-31 15:35:07 +00:00
Petr Skoda
2dc54611f2 MDL-29921 remove unmaintained qti_two export question type 
It can be easily included in official distribution again if somebody fixes it because there are no stored data, capabilities or versions. This will finally allow us to drop the outdate Smarty library form distribution package.
 2011-10-28 10:32:24 +02:00
Aparup Banerjee
a0b10b271f Merge branch 'MDL-29854_b' of git://github.com/timhunt/moodle 2011-10-26 11:23:09 +08:00
Tim Hunt
bed495578f MDL-29854 questions: display better message and more useful continue 
when an error occurs in the middle of processing responeses.
 2011-10-25 14:49:57 +01:00
Sam Hemelryk
6f59dd1a8b Merge branch 'MDL-29906' of git://github.com/timhunt/moodle 2011-10-25 12:25:28 +13:00
Tim Hunt
442a3c0b62 MDL-29906 quiz statistics report: replace use of deprectaed helpbutton. 2011-10-24 16:19:46 +01:00
Tim Hunt
987541952f MDL-29828 quiz review: fix display of overdue time. 2011-10-20 23:16:58 +01:00
Eloy Lafuente (stronk7)
92e0466957 Merge branch 'MDL-29627' of git://github.com/timhunt/moodle 2011-10-18 11:22:15 +02:00
Eloy Lafuente (stronk7)
bca8b79e2a Merge branch 'MDL-28491' of git://github.com/timhunt/moodle 2011-10-18 11:08:15 +02:00
Tim Hunt
0e2274c382 MDL-28491 fix notice because $page was undefined. 2011-10-18 08:40:02 +01:00
Tim Hunt
e4df79dd9c MDL-29627 quiz access rules: quiz edit settings was broken with no custom rules installed. 
Thanks to Apu for reporting this.
 2011-10-18 08:22:05 +01:00
Sam Hemelryk
f856216cb1 Merged branch 'MDL-28491' of git://github.com/timhunt/moodle.git with conflict resolution 2011-10-18 14:31:34 +13:00
Tim Hunt
613002ced4 MDL-29627 quiz access rules: fix two little problems found during integration. 
Missing include was breaking unit tests if they were run separately.

Missing breaks in one switch.
 2011-10-18 00:39:22 +01:00
Tim Hunt
1b796a2700 MDL-28491 diplay the quiz navigation on the summary page. 
This makes the UI more consistent as you work through the quiz. The improvement is more noticable in some themes than others.
 2011-10-17 12:06:44 +01:00
Tim Hunt
c999d841b4 MDL-29627 add quizaccess plugins to standard_plugins_list. 2011-10-13 11:13:26 +01:00
Tim Hunt
5adace99f8 MDL-29627 quiz access rules: backup and restore of data. 2011-10-13 11:13:24 +01:00
Tim Hunt
ffe162d44d MDL-29627 quiz access move strings only used in one subplugin into that plugin. 
AMOS BEGIN
 MOV [youcannotwait,mod_quiz],[youcannotwait,quizaccess_delaybetweenattempts]
 MOV [youmustwait,mod_quiz],[youmustwait,quizaccess_delaybetweenattempts]
 MOV [subnetwrong,mod_quiz],[subnetwrong,quizaccess_ipaddress]
 MOV [attemptsallowedn,mod_quiz],[attemptsallowedn,quizaccess_numattempts]
 MOV [notavailable,mod_quiz],[notavailable,quizaccess_openclosedate]
 MOV [quiznotavailable,mod_quiz],[quiznotavailable,quizaccess_openclosedate]
 MOV [passworderror,mod_quiz],[passworderror,quizaccess_password]
 MOV [requirepasswordmessage,mod_quiz],[requirepasswordmessage,quizaccess_password]
 MOV [requiresafeexambrowser,mod_quiz],[requiresafeexambrowser,quizaccess_safebrowser]
 MOV [safebrowsererror,mod_quiz],[safebrowsererror,quizaccess_safebrowser]
 MOV [safebrowsernotice,mod_quiz],[safebrowsernotice,quizaccess_safebrowser]
 MOV [popupwithjavascriptsupport,mod_quiz],[popupwithjavascriptsupport,quizaccess_securewindow]
 MOV [quiztimelimit,mod_quiz],[quiztimelimit,quizaccess_timelimit]
AMOS END
 2011-10-13 11:13:22 +01:00
Tim Hunt
987c2d491e MDL-29627 quiz access refactor password check into a generic check page. 2011-10-13 11:13:20 +01:00
Tim Hunt
4344c5d5d9 MDL-29627 quiz old popup int column => new browsersecurity column. 
The new column store more meaningful string constants.
 2011-10-13 11:13:18 +01:00
Tim Hunt
0eafc98852 MDL-29627 fix code-checker issues throughout the quiz code. 2011-10-13 11:13:16 +01:00
Tim Hunt
1d9e1a3c06 MDL-29627 refactor the way the rules are constructed from the quiz. 2011-10-13 11:13:14 +01:00
Tim Hunt
d755b0f577 MDL-29627 quiz_access_manager move all output code to the renderer. 
This achieves a massive clean-up. It simplifies comples code in a number
of places. It allows some methods and functions to be moved to a more
appropriate home (for example cannot_review_message to the quiz class).
It moves more logic out of the renderer.
 2011-10-13 11:13:12 +01:00
Tim Hunt
dd70d561ef MDL-29627 quiz load access settings when a quiz is being attempted. 2011-10-13 11:13:10 +01:00
Tim Hunt
c18ba64c3e MDL-29627 load the existing settings when the quiz settings are re-edited. 2011-10-13 11:13:08 +01:00
Tim Hunt
b83c32d39f MDL-29627 quiz access plugins can add fields to mod_form and save the data. 2011-10-13 11:13:06 +01:00
Tim Hunt
ea38245cfb MDL-29627 quiz access: move the unit tests into the relevant plugins. 2011-10-13 11:13:04 +01:00
Tim Hunt
e5844040a0 MDL-29627 quiz access: fix variable names that don't match the coding style. 2011-10-13 11:13:02 +01:00
Tim Hunt
a28a5d74af MDL-29627 refactor quiz access rules into separate subplugins. 2011-10-13 11:13:00 +01:00
Sam Hemelryk
d87ef08598 Merge branch 'MDL-29447' of git://github.com/timhunt/moodle 2011-10-11 10:25:33 +13:00
Eloy Lafuente (stronk7)
202c2032fa Merge branch 'MDL-28469' of git://github.com/timhunt/moodle 2011-10-05 01:13:57 +02:00
Tim Hunt
8dd9ccf475 MDL-29447 quiz course reset does not reset the quiz_grades table. 
Thank to Jean-Michel Vedrine for working out the basic idea of the fix.
 2011-10-04 22:47:44 +01:00
Eloy Lafuente (stronk7)
c72cf85f17 Merge branch 'MDL-29511' of git://github.com/timhunt/moodle 2011-10-04 01:11:20 +02:00
Tim Hunt
e07cccfc25 MDL-28469 quiz settings pages should be pagelayout admin. 2011-10-03 16:38:34 +01:00
Tim Hunt
c3584ad683 MDL-29511 Fix problems on the quiz review questions page found while investigating this bug. 2011-09-29 21:46:39 +01:00
Tim Hunt
72bbb091a4 MDL-29570 Quiz editing page displays the wrong time in the status line sometimes. 2011-09-29 09:06:11 +01:00
Sam Hemelryk
87eca3192f Merge branch 'MDL-28424' of git://github.com/timhunt/moodle.git with changes 2011-09-27 11:24:02 +13:00
Eloy Lafuente (stronk7)
1a8ab39b3c Merge branch 'MDL-29427' of git://github.com/timhunt/moodle 2011-09-26 21:47:40 +02:00
Aparup Banerjee
94f59561ad Merge branch 'MDL-29464' of git://github.com/timhunt/moodle 2011-09-26 14:32:52 +08:00
Tim Hunt
79a46626d3 MDL-29427 quiz nav: information items should should have a state tooltip 2011-09-22 18:12:43 +01:00
Tim Hunt
572a96edb0 MDL-29428 quiz navigation panel should use 'This page' (accessibility improvement) 2011-09-22 17:56:02 +01:00
Tim Hunt
fabface827 MDL-29464 quiz add random question popup does not update sumgrades. 2011-09-21 16:39:31 +01:00
Tim Hunt
babfb615c9 MDL-28424 Reviewing a quiz in 'secure mode' gives a fatal error. 
The problem was when output was being started in relation to when the fake block was added.

Took the opportunity to clean up the quiz renderer API a bit.
 2011-09-21 16:37:21 +01:00
Eloy Lafuente (stronk7)
0e89333992 Merge branch 'MDL-26567' of git://github.com/timhunt/moodle 2011-09-21 00:10:30 +02:00
Tim Hunt
71c4154a98 MDL-26567 no grade category option on the quiz settings form. 
Also, refine the standard_grading_coursemodule_elements method to add a
help string.

AMOS BEGIN
 CPY [gradecategory,grades],[gradecategoryonmodform,grades]
AMOS END
 2011-09-20 11:10:34 +01:00