mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity
62,280 Commits 37 Branches 536 Tags
Commit Graph

3211 Commits

Author SHA1 Message Date
Marina Glancy
9100a8f4bb Merge branch 'MDL-40441' of git://github.com/timhunt/moodle 2013-07-10 10:02:04 +10:00
Damyon Wiese
57cf73a825 Merge branch 'MDL-36479' of git://github.com/timhunt/moodle 2013-07-09 22:28:51 +08:00
Tim Hunt
475225a1c8 MDL-40441 fix obscure notice in the quiz. 
This can only happen if you have both a user with both a real attempt
and a preview, and then edit the quiz settings.

Also clean up this code a bit.
 2013-07-09 10:43:56 +01:00
Damyon Wiese
de0a6ed459 Merge branch 'MDL-40443' of git://github.com/timhunt/moodle 2013-07-09 15:15:47 +08:00
Adrian Greeve
a327f25ef1 MDL-31776 - lib: Alternate name fields 
Add support for additional name fields and flexible formating of
user names.
 2013-07-09 11:45:50 +08:00
Tim Hunt
df14e8625d MDL-40443 setType notice in quiz reports. 2013-07-04 13:08:14 +01:00
Tim Hunt
726fd6db19 MDL-40318 quiz intro comprising just an impage was not shown 
Also, ensure that we don't output an empty box if there are no access
messages.
 2013-07-04 13:07:32 +01:00
Tim Hunt
b0ac85395c MDL-36479 quiz regrade: use progress bar to prevent time-outs 2013-07-04 13:06:18 +01:00
Dan Poltawski
2504dfd61d Merge branch 'MDL-39155' of https://github.com/jacks92/moodle 2013-06-11 15:38:37 +08:00
Tim Hunt
2ed7833790 MDL-39971 each attempt builds on last broken for previews. 2013-05-31 20:24:50 +01:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Troy Lee
62af3fe42b MDL-36020 overview/report: fix quiz regrade session lock 2013-05-14 10:46:13 +08:00
Jayesh Anandani
1ecd3c304d MDL-39155 Quiz: Provide 3 image-size options on the settings page 2013-05-10 08:38:13 +05:30
Eloy Lafuente (stronk7)
cedb0aab5a MDL-39434 Bump all versions near 2.5 release 2013-05-01 18:03:29 +02:00
Sam Hemelryk
d25103c4ef Merge branch 'MDL-39422-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	mod/wiki/mod_form.php
 2013-05-01 11:15:24 +12:00
Dan Poltawski
a74cd33160 MDL-39422 mod_forms: prevent long coruse module names 
To prevent ugly DB errors.
 2013-04-30 17:41:36 +01:00
Tim Hunt
a35ce08493 MDL-39246 quiz timer: compute a more accurate stop time. 2013-04-26 11:55:18 +01:00
Dan Poltawski
68265ee2d6 Merge branch 'MDL-34403' of https://github.com/mpetrowi/moodle 2013-04-25 12:49:38 +01:00
Matt Petro
f5f3658480 MDL-34403 mod quiz: fix error during enrolment 2013-04-24 15:00:06 -04:00
Dan Poltawski
83a9917314 MDL-37514 mod_quiz: fix trailing whitespace 2013-04-22 14:20:58 +01:00
Alex Leontiev
bd166e618f MDL-37514 module.js: fix .js for auto quiz submission in preview mode 
The issue: when we attempt the quiz as teacher/admin and timer is up,
quiz is not submitted, even though "Open attempts are submitted
automatically" is set. I've changed the javascript for a timer,
responsible for submission, removing the special behaviour in case of
preview mode. Note, that when the admin/teacher is taking a quiz, the
"preview" mode is automatically switched on.

It is a bit strange, since in the javascript there was clearly no
expressed intention to really submit quiz in preview, even when timer
hits. It does not really seem like a accidental bug, rather it looks
like some misunderstanding. Worse still, it may happen that I did not
understand the intentions of previous editor and ruined some
functionality. Because of this, and the fact that this is my first bug,
I would like to ask about the peer review! Please, see my comments in
bug discussion for the testing steps.

Conflicts:
	mod/quiz/module.js
 2013-04-22 14:13:53 +01:00
Dan Poltawski
e65dfc0275 Merge branch 'MDL-39186' of git://github.com/timhunt/moodle 2013-04-22 13:05:53 +01:00
Damyon Wiese
b363d54ccd Merge branch 'MDL-39050' of git://github.com/timhunt/moodle 2013-04-22 10:25:46 +08:00
Tim Hunt
ba86e1d1ee MDL-39186 quiz password form: set param types. 2013-04-19 18:28:59 +01:00
Tim Hunt
53f8948899 MDL-39050 quiz access rules: settings.php files should work. 2013-04-19 11:50:25 +01:00
Damyon Wiese
dd3b3a81d1 Merge branch 'MDL-39167' of git://github.com/timhunt/moodle 2013-04-19 13:13:28 +08:00
Tim Hunt
d823a63db0 MDL-39167 quiz access rules: need to validate their settings. 
We were missing the hook in the form validation method. We had them
everywhere else they were needed.
 2013-04-17 14:24:38 +01:00
Dan Poltawski
342b1901ac Merge branch 'MDL-39029' of git://github.com/jacks92/moodle 2013-04-16 13:30:10 +01:00
Dan Poltawski
e5e5097081 NOBUG - reduce whitespace errors a little 2013-04-15 13:29:14 +01:00
Damyon Wiese
986adc066c MDL-39092 Yuilib - remove more -coverage.js files 
Also slight tweak to the readme for someone who does not know shifter.
 2013-04-15 09:02:11 +08:00
Dan Poltawski
47df95c362 Merge branch 'MDL-39054' of git://github.com/jacks92/moodle 2013-04-12 11:08:28 +08:00
Jayesh Anandani
6b7a020b23 MDL-39029 quiz password: autofocus feature added 2013-04-11 17:26:58 +05:30
Jayesh Anandani
620233b8fb MDL-39054 quiz statistics: move hard-coded text to lang file 2013-04-11 16:41:43 +05:30
Damyon Wiese
f8ddbd24d7 Merge branch 'MDL-38935' of git://github.com/timhunt/moodle 2013-04-10 11:17:31 +08:00
Tim Hunt
a6f849cbe6 MDL-38935 quiz autosave: save HTML editor contents. 
Also, ignore changes in scrollpos.
 2013-04-08 10:29:58 +01:00
Tim Lock
be47011d3c MDL-35868: quiz: Use correct attemptnumber when a last attempt exists. 2013-04-08 11:09:04 +08:00
Tim Hunt
e3485c5f75 MDL-38538 quiz autosave: fix JavaScript errors. 
1. Make cancelling the delay more robust.
2. Ignore changes in flag state. They are already saved using AJAX.
3. Typo that caused an error when there was no TinyMCE on the page.
 2013-04-04 12:32:54 +01:00
Tim Hunt
aa81e35847 MDL-38209 quiz css: fix minor regression. 2013-04-04 11:17:39 +01:00
Dan Poltawski
626403eb73 Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle 2013-04-03 20:22:03 +08:00
Tim Hunt
000fbcf2bd MDL-38538 quiz autosave: fix language string. 
This feature does not actually provide spiritual salvation.
 2013-04-03 11:23:41 +01:00
Aparup Banerjee
7a2a430aa5 Merge branch 'MDL-38809' of git://github.com/timhunt/moodle 2013-04-03 16:32:42 +08:00
Tim Hunt
0561fdf167 MDL-38809 quiz manual grading: delete expensive unnecssary code. 2013-03-30 17:25:52 +00:00
Tim Hunt
595708884a MDL-38538 quiz auto-save front end. 
1. There is a new admin setting to control whether this feature is
enabled. The admin can set the auto-save frequency to 1, 2 or 5 minutes,
or disable it.

2. When autosave is enabled, there is code in the quiz that monitors the
main quiz form, and does an ajax save call at the given frequency when
changes are being made by the student.

3. The ajax saves go to a new script that calls the question engine to
do the work.

4. To avoid simultaneous autosave + submit and finish, the auto-save
system shuts down shortly before time expires in a timed quiz.
 2013-03-28 16:57:24 +00:00
Eloy Lafuente (stronk7)
cf140de945 Merge branch 'MDL-38557' of git://github.com/timhunt/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-03-26 23:38:07 +01:00
Eloy Lafuente (stronk7)
b741fac308 Merge branch 'MDL-38651' of git://github.com/timhunt/moodle 2013-03-26 23:27:16 +01:00
Eloy Lafuente (stronk7)
d89eed6fca Merge branch 'MDL-38647' of git://github.com/timhunt/moodle 2013-03-26 23:22:25 +01:00
Petr Škoda
689096bc26 MDL-38654 do not test $CFG->gdversion 
GD PHP extension is now required. Add-ons need to remove $CFG->gdversion tests. The worst case regression is that add-on will think GD is not available.
 2013-03-22 16:57:55 +01:00
Tim Hunt
a7a031a4e4 MDL-38651 quiz settings: fix layout of review options. 2013-03-22 15:30:48 +00:00
Tim Hunt
2515be0e80 MDL-38647 quiz review question issues 
1. Page URL should contain 'step=0' if necessary, but not 'step='.
2. Review specific step was not using the right display options.
 2013-03-22 11:16:02 +00:00
Tim Hunt
7dbde4ed3b MDL-38557 quiz install.php code should actually be in reports. 
I think it is worth moving this code to its correct home in master.
 2013-03-22 10:36:15 +00:00