Commit graph

3583 commits

Author SHA1 Message Date
Sam Hemelryk
c0dfd035c4 Merge branch 'wip_MDL-40077' of https://github.com/jamiepratt/moodle 2013-08-13 10:49:12 +12:00
Sam Hemelryk
90fb4f39fd Merge branch 'MDL-41100-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2013-08-13 09:37:02 +12:00
Sam Hemelryk
761b48df59 Merge branch 'MDL-40996' of git://github.com/timhunt/moodle 2013-08-13 09:08:15 +12:00
Tim Hunt
e2b388c1a4 MDL-39507 questions: fix pluginfile URLs before format_text.
This commit build's on Jean-Michel's work, tidying up a few lose ends.
2013-08-12 10:32:02 +01:00
Jamie Pratt
3652dddda8 MDL-40077 quiz stats : Test stats as expected for csv file responses 2013-08-10 11:17:47 +07:00
Frederic Massart
d0cac8b51b MDL-41100 libraries: Deprecating get_plugin_list_with_file 2013-08-09 11:59:48 +08:00
Tim Hunt
370ee378f3 MDL-40996 quiz show user pic should also show name.
This was a regression introduced by MDL-20636 two years ago!
2013-08-08 10:24:46 +01:00
Tim Hunt
3987312883 MDL-31487 fix FEATURE_CONTROLS_GRADE_VISIBILITY for quiz.
This is a followup to MDL-18301. That fix missed the following points:

1. On the edit categories and items screens, all items had an eye-con to
control the visibility, even if the visibility was controlled by the
module.

2. Changing the visibility of a grade category change the visibility of
all items within it, even if the visibility was controlled by the
module.

3. The quiz ingored $cm->visible when controlling whether its grade item
was visible.
2013-08-08 10:03:47 +01:00
Petr Škoda
2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Tim Hunt
68d2f6a008 MDL-35053 questions: question files outside an attempt.
Now update all the places that display files outside attempts to use the
new API.
2013-07-26 13:10:11 +01:00
Dan Poltawski
d96fcecc86 Merge branch 'MDL-20609' of git://github.com/timhunt/moodle 2013-07-23 16:44:32 +08:00
Jamie Pratt
e39a2faa58 MDL-40729 check marks and grades from quiz attempts
compare to marks in csv file.
2013-07-23 16:04:13 +08:00
Jamie Pratt
da6bb0c506 MDL-40076 Build entire quiz attempts by supplying attempt
data for each question in the quiz, pulling responses
from a csv file.
2013-07-23 15:59:53 +08:00
Jamie Pratt
c2b051c7aa MDL-40542 need to be able to select variant
in unit tests
2013-07-23 15:11:56 +08:00
Jamie Pratt
c2f2e7f008 MDL-40541 need to be able to select random q
in unit tests
2013-07-23 15:08:32 +08:00
Jamie Pratt
388f047345 MDL-40543 convert from simulated responses
to post data
2013-07-23 15:00:02 +08:00
Tim Hunt
8dbcbe2101 MDL-20609 quiz tables: improve layout for long cell contents.
By allowing more wrapping.
2013-07-19 11:47:14 +01:00
Eloy Lafuente (stronk7)
dbdfd37709 Merge branch 'wip_MDL-40074' of https://github.com/jamiepratt/moodle 2013-07-18 20:22:47 +02:00
Petr Škoda
059e08ed92 MDL-40220 use new core_component::get_plugin_list_with_class() 2013-07-16 22:37:15 +02:00
Petr Škoda
bd3b3bba9f MDL-40220 use new core_component::get_plugin_list() 2013-07-16 22:36:11 +02:00
Jamie Pratt
2baf8e8a0b MDL-40074 quiz attempt walk through test 2013-07-14 16:45:26 +07:00
Jamie Pratt
1cd7c92ece MDL-40074 refactoring of quiz code
to reuse code fro quiz attempt walk through
2013-07-14 16:28:39 +07:00
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