Commit graph

4184 commits

Author SHA1 Message Date
Dan Poltawski
eca95b639d Merge branch 'MDL-32375' of git://github.com/timhunt/moodle 2012-05-14 20:42:12 +08:00
Jonathon Fowler
0eefca3b66 MDL-32863 question: fix for Oracle ambiguous column error 2012-05-14 12:52:58 +10:00
Dan Poltawski
2edce32ad4 Merge branch 'MDL-32910' of git://github.com/timhunt/moodle 2012-05-14 10:10:03 +08:00
Tim Hunt
6cdef715df MDL-32375 question unit tests: fix breakage from phpunit coversion.
Three things:

1. Fixes to select expectation.

2. Fixes to match walkthrough tests (No idea how these managed to pass
under Simpletest!)

3. Fix expected values for multianswer upgrade tests.
2012-05-11 14:59:58 +01:00
Tim Hunt
1921d47b0a MDL-32910 MDL-32569 broke unit tests in third-party qtypes 2012-05-10 11:16:06 +01:00
Tim Hunt
ad3b37cf87 MDL-31814 question bank: fix possible error with sort columns. 2012-05-04 17:29:04 +01:00
Dan Poltawski
33e71140bb Merge branch 'MDL-32698_questionengine_typos' of git://github.com/davosmith/moodle 2012-05-07 12:05:43 +08:00
Davo Smith
d50e8a1bda MDL-32698 Question - Fixed typos in load_question_attempt 2012-05-01 10:17:08 +01:00
Dan Poltawski
73d595faf3 Merge branch 'MDL-32181' of https://github.com/ppichet/moodle 2012-05-01 10:30:43 +08:00
ppichet
0cba6a8d5e MDL-32181 question/calculatedmulti validate multianswers
restructuring the validation function of edit_calculatedmulti_form.php
correcting attempt
defining = new stdClass() before using them : Strict standards
2012-04-27 14:30:36 -04:00
Tim Hunt
75733895bb MDL-32613 qbank: improve print_choose_qtype_to_add_form for contrib modules. 2012-04-27 15:08:28 +01:00
Eloy Lafuente (stronk7)
d7f84a2962 Merge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle 2012-04-25 15:14:27 +02:00
Eloy Lafuente (stronk7)
d3cb25dfef Merge branch 'MDL-32322' of git://github.com/timhunt/moodle
Conflicts:
	mod/quiz/report/simpletest/testreportlib.php
	mod/quiz/report/statistics/simpletest/test_qstats.php
2012-04-25 03:02:14 +02:00
David Mudrak
7a00d4385d MDL-32471 preview thumbnails support for other component types
This commit affects mostly qtypes. Other standard components either do
not have pluginfile handler or have been already updated to the new API.
2012-04-24 14:29:44 +02:00
Petr Skoda
4ca04fb58b MDL-32569 remove remaining references to simpletest and improve events test 2012-04-21 17:08:30 +02:00
Petr Skoda
f596005b6c MDL-32569 drop migrated module tests 2012-04-21 16:58:07 +02:00
Petr Skoda
2338458ac5 MDL-32569 drop all migrated question simpletests 2012-04-21 16:43:34 +02:00
Tim Hunt
ac4d91575a MDL-32322 quiz reports: name improvement attempt_report -> attempts_report. 2012-04-20 10:07:22 +01:00
ppichet
c9340ac145 MDL-32358 : numerical question: validation messages errors
The selected unit parameter is added answer paramter when renderer call
 $question->get_validation_error() so that it mimics the
is_complete_response(array $response) structure.
2012-04-15 22:11:10 -04:00
Sam Hemelryk
3211569a6a Revert "MDL-30843 and MDL-30842 - accessibility compliance: Add <label> for form input text and select tag"
This reverts commit f9f281b8fe.
2012-04-11 17:18:58 +12:00
Dan Poltawski
7a1ed64587 Merge branch 'w15_MDL-32323_m23_phpunit3' of git://github.com/skodak/moodle 2012-04-11 09:32:58 +08:00
Dan Poltawski
4a59665b9f Merge branch 'MDL-32217' of git://github.com/ppichet/moodle 2012-04-11 09:27:29 +08:00
Petr Skoda
a4d53e4b26 MDL-32323 make base test case classes abstract to prevent empty testcase warnings, fix property access 2012-04-10 18:51:34 +02:00
Jamie Pratt
6396b9342f MDL-47494 ddmarker: Merge branch 'wip_readme_2_1' into wip_readme 2012-04-10 20:29:06 +07:00
Jamie Pratt
aee03a6b74 MDL-47494 ddmarker: NOBUG added instructions to README about converting imagetarget qs
and renamed README.txt to README.md
2012-04-10 20:28:00 +07:00
Petr Skoda
603bd00112 MDL-32323 convert question tests
1/ type/match/tests/walkthrough_test.php - tests are failing randomly, looks like some weird randomisation is going on there - see TODOs

2/ type/multianswer/tests/upgradelibnewqe_test.php contains invalid expected value - see TODO
2012-04-10 15:27:11 +02:00
Dan Poltawski
f4bd3cd6c9 Merge branch 'MDL-32347' of git://github.com/timhunt/moodle 2012-04-10 11:34:12 +08:00
Dan Poltawski
2d74d8a612 Merge branch 'MDL-32318' of git://github.com/timhunt/moodle 2012-04-10 10:26:49 +08:00
Sam Hemelryk
5bfeb5ffd3 Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle 2012-04-10 12:34:37 +12:00
Jamie Pratt
19f5c30c25 MDL-47494 ddmarker: Merge branch 'wip_imagetargetupgrader_2_1' into wip_imagetargetupgrader 2012-04-08 19:29:10 +07:00
Jamie Pratt
ac4abff022 MDL-47494 ddmarker: NOBUG couple of small fixes 2012-04-08 19:28:06 +07:00
Jamie Pratt
4a1582ab7c MDL-47494 ddmarker: Merge branch 'wip_imagetargetupgrader_2_1' into wip_imagetargetupgrader 2012-04-08 18:17:55 +07:00
Jamie Pratt
73f356a4ee MDL-47494 ddmarker: NOBUG converted question conversion code to use a renderer 2012-04-08 18:16:38 +07:00
Jamie Pratt
2578a29ac2 MDL-47494 ddmarker: Merge branch 'wip_imagetargetupgrader_2_1' into wip_imagetargetupgrader 2012-04-07 14:37:29 +07:00
Jamie Pratt
b409f1990e MDL-47494 ddmarker: NOBUG fixing and updating tags in phpdoc comments 2012-04-07 14:34:58 +07:00
Jamie Pratt
6a3b599366 MDL-47494 ddmarker: NOBUG added progress bar for question conversion during upgrade 2012-04-07 14:24:25 +07:00
Jamie Pratt
34ec5ad14d MDL-47494 ddmarker: NOBUG made string for label into a constant so it is easy to change 2012-04-07 14:23:18 +07:00
ppichet
57239949ac MDL-32217 Setting options->unitgradingtype 2012-04-06 11:02:13 -04:00
Tim Hunt
a031b0f334 MDL-32347 questions: API improvement for the benefit of strict syntax. 2012-04-05 17:26:44 +01:00
Tim Hunt
b9832f2b87 MDL-32318 question preview: fix php stric syntax error
Also, cheating, and committing a whitespace fix in the same commit.

Conflicts:

	question/engine/questionusage.php
2012-04-05 16:42:23 +01:00
Tim Hunt
344d774ecd MDL-47494 gapselect: Fix PHP strict errors. 2012-04-05 13:42:25 +01:00
Tim Hunt
81d1cac12b MDL-47494 ddimageortext: Fix PHP strict errors. 2012-04-05 13:40:12 +01:00
Tim Hunt
5b8460a374 MDL-47494 ddwtos: Fix PHP strict errors. 2012-04-05 13:35:37 +01:00
Jamie Pratt
86529cb3ab MDL-47494 ddmarker: NOBUG refactoring so that automatic and manual conversion code is shared 2012-04-04 14:42:40 +07:00
Dan Poltawski
86cfd9966a MDL-32220 question import: readquestions arguments change
Removed the context parameter for blackboard and blackboard_six formats.

This parameter was removed in 4d188926
2012-04-04 14:46:54 +08:00
Jamie Pratt
d544fb24ce MDL-47494 ddmarker: NOBUG added script to do upgrade automatically during 2.1 site upgrade 2012-04-04 12:58:02 +07:00
Eloy Lafuente (stronk7)
959a709ebe Merge branch 'MDL-32240' of git://github.com/timhunt/moodle 2012-04-04 00:10:37 +02:00
Eloy Lafuente (stronk7)
46ed2f8b7f Merge branch 'w14_MDL-32251_m23_strict3' of git://github.com/skodak/moodle 2012-04-03 21:17:58 +02:00
Dan Poltawski
1d40f283ce Merge branch 'MDL-32220' of git://github.com/timhunt/moodle 2012-04-03 11:09:31 +08:00
Jamie Pratt
4b47ad4623 MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter 2012-04-02 18:59:10 +07:00