mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-17 06:00:05 +01:00
Code Issues Projects Releases Wiki Activity
50,240 Commits 36 Branches 527 Tags
Commit Graph

11339 Commits

Author SHA1 Message Date
Sam Hemelryk
e6369d951c Merge branch 'MDL-29569' of git://github.com/rwijaya/moodle 2011-10-26 10:44:41 +13:00
Stephen Bourget
d31a1ad808 MDL-29368 Assignment: Fixed a fatal error caused by a missing include 2011-10-25 19:19:02 +02: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
Rossiani Wijaya
b43251b846 MDL-29569: lesson_mod: in matching type questions, fixed and set default value for scoring and fixed jump page setting when response text is set to empty 2011-10-25 12:22:02 +08:00
Sam Hemelryk
d040ea8893 Merge branch 'wip-MDL-29231-master' of git://github.com/phalacee/moodle 2011-10-25 15:19:45 +13:00
Sam Hemelryk
6f59dd1a8b Merge branch 'MDL-29906' of git://github.com/timhunt/moodle 2011-10-25 12:25:28 +13:00
David Mudrak
01609c9ad9 Merge remote branch 'origin/master' into rubric 
Conflicts:
	lib/db/upgrade.php
	version.php
 2011-10-24 22:13:01 +02:00
Tim Hunt
442a3c0b62 MDL-29906 quiz statistics report: replace use of deprectaed helpbutton. 2011-10-24 16:19:46 +01:00
Aparup Banerjee
0e03740fc8 Merge branch 'MDL-29542' of git://github.com/rwijaya/moodle 2011-10-24 17:05:17 +08:00
Aparup Banerjee
64fcc674f9 Merge branch 'MDL-29828' of git://github.com/timhunt/moodle 2011-10-24 16:39:17 +08:00
Aparup Banerjee
5117a3d789 Merge branch 'MDL-29619-master' of git://github.com/ankitagarwal/moodle 2011-10-24 14:21:39 +08:00
Marina Glancy
fc05f22204 MDL-29483: allow the grading instance to exist without itemid until submitting (submission in assignment might not yet existed) 2011-10-24 13:36:51 +08:00
Aparup Banerjee
b077de82f9 Merge branch 'MDL-29646-master' of git://github.com/ankitagarwal/moodle 2011-10-24 13:26:28 +08:00
Andreas Grabs
7e4b0986c8 MDL-29806 - When a Feedback activity is restore the "Site after submit" URL is not updated and shows "$@PAGEVIEWBYID*15463@$" 2011-10-21 23:08:59 +02:00
Ankit Kumar Agarwal
8077c81f47 MDL-29619 Validate urls before generating output 2011-10-21 14:00:38 +05:30
Marina Glancy
9e2eca0fde MDL-29483, MDL-29482 advanced grading in assignment, rubrics editor 
- advanced grading plugins now return the grade in the specified range
- prohibited quick grading when advanced grading method is used
- fixed bug in processing description in rubric editor
- some improvements to rubric editor JS
 2011-10-21 13:58:52 +08:00
Rossiani Wijaya
05db3cc7e5 MDL-29542 lesson module: changing qtype param type to INT 2011-10-21 12:38:29 +08:00
Tim Hunt
987541952f MDL-29828 quiz review: fix display of overdue time. 2011-10-20 23:16:58 +01:00
Marina Glancy
36937f0264 MDL-29483: advanced grading methods support on assignment module, grading form element, rubrics 
- gradingform API now has not only controller class but also instance class with functions and data related to the particular grading instance
- assignment grading form and grading form element deal with elements of gradingform_instance class instead of gradingform_controller
- implemented the class gradingform_rubric_instance
- added more phpdocs
 2011-10-20 12:15:51 +08:00
Ankit Kumar Agarwal
e5e6c961c4 MDL-29464 Scorm Fixing regressions on userreport.php 2011-10-20 08:14:41 +05:30
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
Eloy Lafuente (stronk7)
065d6d80a2 Merge branch 'MDL-29627' of git://github.com/timhunt/moodle 2011-10-18 01:44:58 +02: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
Eloy Lafuente (stronk7)
22ca3e49e0 NOBUG - whitespace fixes (MDL-19488, MDL-27242, MDL-29435) 2011-10-17 10:19:59 +02:00
Sam Hemelryk
f35c45006a MDL-19488 mod_feedback: Coding style improvement 2011-10-17 11:12:33 +13:00
Sam Hemelryk
629aa44873 Merge branch 'MDL-19488_master_wip' of git://github.com/grabs/moodle 2011-10-17 11:07:25 +13:00
Eloy Lafuente (stronk7)
140af2a0f0 MDL-29191 wiki - avoid one more username leak 2011-10-16 19:03:19 +02:00
Sun Zhigang
6b3e5ab959 MDL-29191 - Show creator's fullname instead of username 2011-10-16 18:52:35 +02:00
Stephen Bourget
e4784b616a MDL-29698 Assignment: Fix broken logentry 2011-10-16 18:26:38 +02:00
David Mudrak
7ece4a0798 Merge branch 'rubric' of github.com:mudrd8mz/moodle into rubric 2011-10-13 22:45:30 +02:00
David Mudrak
20c207ab21 Merge branch 'master' into rubric 
Conflicts:
	lib/db/upgrade.php
 2011-10-13 22:42:47 +02: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