Commit graph

3558 commits

Author SHA1 Message Date
Tim Hunt
4d18892676 MDL-32220 question import: files sometimes stored in the wrong context.
Sadly, this involves a small API change, but I don't believe anyone was
using the argument I had to remove (because we were sometimes passing a
wrong value, and there is not way to compute the right value at that
point in the code.)

Also sadly, the code to compute the context we are importing into is now
rather spaghetti-like, but it works.
2012-03-29 14:13:28 +01:00
Tim Hunt
04fcd1f5a8 MDL-32201 question export: use qformat_xml::write_answer in base class
Without this, images in answers were not being written to the export
file for questions using extra_answer_fields.
2012-03-29 14:12:58 +01:00
Petr Skoda
0bb48cc2a1 MDL-32250 import latest SimpleTest 1.1.0 2012-03-29 15:07:53 +02:00
Jamie Pratt
9437265e8b MDL-47494 ddmarker: NOBUG restructuring if conditions to interpret page params 2012-03-29 16:31:43 +07:00
Jamie Pratt
2de9e082ee MDL-47494 ddmarker: NOBUG fixing error in sql to fetch relevant questions 2012-03-29 15:29:06 +07:00
Jamie Pratt
b30cfa2c4f MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter 2012-03-29 14:07:44 +07:00
Jamie Pratt
af9d63a8dc MDL-47494 ddmarker: NOBUG list questions in categories in category / context selection UI 2012-03-29 14:05:57 +07:00
Davo Smith
1892a35625 MDL-32213 Question upgrade now correctly handles non-core manually-graded question types 2012-03-27 13:44:07 +01:00
Jamie Pratt
a83fc46784 MDL-47494 ddmarker: NOBUG fixing white space issue 2012-03-27 18:22:49 +07:00
Jamie Pratt
a922c16cb7 MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter 2012-03-27 18:22:09 +07:00
Jamie Pratt
e1e835e727 MDL-47494 ddmarker: NOBUG fixing coding style deviations found by code checker. 2012-03-27 18:20:14 +07:00
Jamie Pratt
2379439f63 MDL-47494 ddmarker: NOBUG change API calls that only work post 2.1
This need to be merged into master branch because we want to keep the
2.1 branch mergeable but then we will merge with 'ours' strategy,
effectively discarding changes.
2012-03-27 17:32:51 +07:00
Tim Hunt
1a2de1c7ce MDL-32177 questions: allow default questiontext in the editing form. 2012-03-23 15:36:17 +00:00
Jamie Pratt
49d7891f60 MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter 2012-03-22 09:53:48 +07:00
Jamie Pratt
5e37b1f0f7 MDL-47494 ddmarker: NOBUG further work on adminpage 2012-03-22 09:52:56 +07:00
Sam Hemelryk
ef844d0a15 Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle 2012-03-20 16:47:17 +13:00
M Kassaei
e6208ec604 MDL-32053 question: Question bank table displayed inconsistently 2012-03-20 11:00:16 +13:00
M Kassaei
d1a80dd2b2 MDL-32048 mod_quiz: Question bank select/deselect all shows strange behaviour in IE 2012-03-20 10:55:01 +13:00
Petr Skoda
e2bb3c9275 MDL-32094 some more E_STRICT fixes 2012-03-18 20:40:20 +01:00
Petr Skoda
072db71c90 MDL-32094 fix question related E_STRICT problems 2012-03-18 18:33:54 +01:00
Tim Hunt
8cb7a6d512 MDL-31594 question manual grading: did not handle comma as decimal. 2012-03-15 18:46:43 +00:00
Eloy Lafuente (stronk7)
9b89dc4f7d Merge branch 'MDL-31981' of git://github.com/timhunt/moodle 2012-03-13 18:08:40 +01:00
Eloy Lafuente (stronk7)
b20bb8454a Merge branch 'w11_MDL-31985_m23_lobsizes' of git://github.com/skodak/moodle 2012-03-13 00:15:59 +01:00
Eloy Lafuente (stronk7)
649fd88d8f MDL-31805 html2text - change tests acordingly with the new version
With the new version in place, both <th> and <a> contents are
being handled by the conversion. Accomodate existing tests to
that change.
2012-03-12 21:17:22 +01:00
Petr Skoda
bb88a54d06 MDL-31985 remove text sizes from all install.xml files 2012-03-11 15:55:37 +01:00
Tim Hunt
9eb62b33b9 MDL-31981 shortanswer qtype does not handle \* in correct response. 2012-03-09 18:54:20 +00:00
Eloy Lafuente (stronk7)
a1ef8c6d3c MDL-28364 whitespace fixes 2012-03-07 04:00:39 +01:00
Eloy Lafuente (stronk7)
12c5685a50 Merge branch 'MDL-28364' of git://github.com/jonof/moodle 2012-03-07 03:55:53 +01:00
Eloy Lafuente (stronk7)
f1fbdbea33 Merge branch 'MDL-31829' of git://github.com/timhunt/moodle 2012-03-06 21:18:04 +01:00
Petr Skoda
c3dd6b01fe MDL-27982 drop UNSIGNED attributes from all install.xml files 2012-03-06 12:01:10 +01:00
Tim Hunt
296e1e9782 MDL-31829 question engine SQL typo breaks some regrades.
Also, some MySQL-only code had not been updated.

This problem only affected a small minority of question attempts, like
this:
1. Suppose you have a shortanswer question with correct answer 'Toad'
and some hints.
2. Suppose a student attempts this using the interactive behaviour and
on the first try responds 'Frog', and on the second try responds 'Toad'.
3. Then suppose the teacher edits the question to make 'Frog' correct.
4. Then, when the quiz is regraded, the question_attempt_step for the
second try will need to be deleted. That is where the buggy code was.
2012-03-01 12:33:14 +00:00
Tim Hunt
7a26403fc9 MDL-31828 attachements to essay questions do not work on Oracle. 2012-03-01 12:10:39 +00:00
Eloy Lafuente (stronk7)
4ab641eeaa MDL-30973 Files API: Whitespace fixes 2012-03-01 00:56:23 +01:00
Eloy Lafuente (stronk7)
d8c9ff403b Merge branch 's17_MDL-30973_file_docblock_master' of git://github.com/dongsheng/moodle 2012-03-01 00:25:18 +01:00
Jamie Pratt
f22414b1e5 MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter 2012-02-28 13:07:45 +07:00
Jamie Pratt
6bdb7323ae MDL-47494 ddmarker: NOBUG admin page that lists contexts and categories
and the number of questions contained in them.
2012-02-28 13:05:45 +07:00
Jonathon Fowler
7da7bfa17d MDL-28364 handle question formats that support multiple file types 2012-02-28 09:39:06 +10:00
Eloy Lafuente (stronk7)
bea0a6f5eb Merge branch 'MDL-31721' of git://github.com/timhunt/moodle 2012-02-27 22:05:56 +01:00
Tim Hunt
d44480f60f MDL-31729 questions: files for hints are not moved or deleted.
The files that belong to the question hints are neither moved when the
question is moved to another context, nor deleted when the question is
deleted.

Oops! How come no one noticed that until today.
2012-02-23 12:37:26 +00:00
Tim Hunt
d5ffb7896b MDL-31721 question editing: improve working for Show num correct
AMOS BEGIN
 CPY [shownumpartscorrect,question],[shownumpartscorrectwhenfinished,question]
AMOS END
2012-02-23 12:37:02 +00:00
Tim Hunt
876b295595 MDL-47494 gapselect: Fix incorrect foreign key declaration. 2012-02-21 22:56:51 +00:00
Dongsheng Cai
d2b7803e5a MDL-30973 Files API, check and update DocBlock 2012-02-15 12:48:57 +08:00
Tim Hunt
03337d8bab MDL-47494 ddmarker: Add extra pluginname string to appease the plugins DB 2012-02-10 16:25:23 +00:00
Tim Hunt
d8555d4a9f MDL-47494 ddmarker: Merge branch 'MOODLE_21_STABLE'
Conflicts:
	version.php
2012-02-10 16:22:23 +00:00
Tim Hunt
2a71bf53d2 MDL-47494 ddmarker: Clean up version.php and comments. 2012-02-10 16:20:14 +00:00
Tim Hunt
eeb58297a6 MDL-47494 ddimageortext: Merge branch 'MOODLE_21_STABLE'
Conflicts:
	README.txt
	lang/en/qtype_ddimageortext.php
	version.php
2012-02-10 16:00:47 +00:00
Tim Hunt
c109c9012e MDL-47494 ddimageortext: Fix version.php, and wrong qtype name in comments. 2012-02-10 15:52:42 +00:00
Michael Aherne
2af7d0d8d0 MDL-31495 Performance improvement in question engine upgrade SQL 2012-02-10 15:24:43 +00:00
Tim Hunt
90e64ecb4e MDL-47494 ddwtos: Merge branch 'MOODLE_21_STABLE'
Conflicts:
	lang/en/qtype_ddwtos.php
	version.php
2012-02-10 15:14:51 +00:00
Tim Hunt
12d0d76b90 MDL-47494 ddwtos: Update version.php 2012-02-10 15:13:02 +00:00