moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76866 commits 37 branches 540 tags 1.3 GiB
Commit graph

3558 commits

Author SHA1 Message Date
Tim Hunt
02643dafe7 MDL-47381 qformat: Behat tests have wrong plugin type. 2014-09-26 11:46:06 +01:00
Eloy Lafuente (stronk7)
aec2b1c2da Merge branch 'MDL-47224' of git://github.com/aolley/moodle 2014-09-24 01:26:52 +02:00
Marina Glancy
8766d1981c MDL-45336 qtype_numerical: use own strings instead of mod_quiz 
These strings have already been copied from mod_quiz to qtype_numerical but
in the qtype_numerical plugin code the translations from mod_quiz were used.
Even though the strings were already present we copy the translations.

AMOS BEGIN
 CPY [invalidnumericanswer,mod_quiz],[invalidnumericanswer,qtype_numerical]
 CPY [multiplier,mod_quiz],[qtype_numerical]
 CPY [invalidnumerictolerance,mod_quiz],[qtype_numerical]
AMOS END
 2014-09-24 01:22:59 +02:00
Marina Glancy
5a0221f7c0 MDL-45336 question: moved used string from quiz plugin 
AMOS BEGIN
 MOV [erroritemappearsmorethanoncewithdifferentweight,quiz_statistics],[erroritemappearsmorethanoncewithdifferentweight,question]
AMOS END
 2014-09-24 01:22:58 +02:00
Eloy Lafuente (stronk7)
011ff9f8fb MDL-47180 qformat_webct: whitespace cleanup 2014-09-24 00:56:40 +02:00
Eloy Lafuente (stronk7)
d50a73309b Merge branch 'MDL-47180' of git://github.com/jmvedrine/moodle 2014-09-24 00:40:40 +02:00
Jean-Michel Vedrine
129f3c5190 MDL-47180 qformat_webct: Import of calculated questions broken 2014-09-23 14:45:07 +02:00
markv
94999731ce MDL-10971 question type multianswer: Respect quiz shuffle option 2014-09-19 11:39:22 +01:00
Adam Olley
12dce419f4 MDL-47224 qtype_calculated: Calculated qtype comment on datasetitems should follow formatting rules 2014-09-19 09:33:35 +09:30
Dan Poltawski
5ce0af436d Merge branch 'MDL-46195' of git://github.com/timhunt/moodle 2014-09-15 16:07:05 +01:00
Dan Poltawski
d1c9b792b0 Merge branch 'MDL-46331' of git://github.com/timhunt/moodle 2014-09-15 11:55:16 +01:00
Dan Poltawski
6576ab01b6 Merge branch 'MDL-46810' of git://github.com/timhunt/moodle 2014-09-15 11:25:27 +01:00
Damyon Wiese
96477b0f0d Merge branch 'MDL-47167' of git://github.com/timhunt/moodle 2014-09-15 15:41:39 +08:00
Tim Hunt
f41269f31d MDL-46331 GIFT question import was breaking content inside <pre>. 
Also, adding a Behat tests to verify GIFT import works without errors
(but leaving the detailed testing for the unit tests).
 2014-09-09 22:59:04 +01:00
Tim Hunt
21ed2330cf MDL-47167 XML question format: behat tests 2014-09-09 22:57:34 +01:00
Tim Hunt
cebfc95361 MDL-46195 WebCT question import: Behat test 2014-09-09 22:55:00 +01:00
Tim Hunt
57944b7a54 MDL-46195 fix error handling. 2014-09-08 22:27:36 +01:00
Dan Poltawski
735c7ee41a Merge branch 'MDL-47122' of git://github.com/timhunt/moodle 2014-09-08 14:28:30 +01:00
Tim Hunt
16e246ac52 MDL-47122 question_engine_data_mapper: which methods are public. 
That is, which may be used from outside the question engine.
 2014-09-08 13:24:17 +01:00
Tim Hunt
0b62cc2ea5 MDL-46810 question CBM behaviours: improve the display of marks. 
Thanks to Tony Gardner-Medwin for the suggestion.
 2014-09-07 13:30:57 +01:00
Tim Hunt
a7b4c96440 MDL-46761 fix PHPdocs on question_usage_by_activity::get_total_mark 
Thanks to Tony Gardner-Medwin for spotting this.
 2014-09-07 11:37:43 +01:00
Tim Hunt
38cde336ca MDL-46195 Fix fractionsaddwrong string component in lesson & qformat_webct. 
I know. You should not refer to strings from other plugins, but

* qformat_webct is importing multichoice questions in that bit of code.
  I suppose a pedant would say that qformat_webct should declare dependencies
  on all the qtypes it relies on, but that would be silly.

* Lesson should be using the question engine, rather than doing its own thing.
 2014-09-06 20:20:58 +01:00
Tim Hunt
4040e2dd11 MDL-47122 use insert_records to improve question engine performance. 2014-09-04 23:15:27 +01:00
Marina Glancy
b7e662bb13 Merge branch 'MDL-46916' of git://github.com/timhunt/moodle 2014-08-25 16:49:52 +08:00
Colin Chambers
96fc865427 MDL-46895 qtype_calculated_find_formula_errors not defined causes Calculated question type test to fail 2014-08-22 13:55:44 +01:00
Tim Hunt
6d99e71847 MDL-46916 behat: improve question state test. 2014-08-21 14:16:31 +01:00
Marina Glancy
6ee21ea1d0 Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle 2014-08-19 16:57:05 +08:00
Damyon Wiese
d32bc7d655 MDL-18014 Atto autosave: Atto requires $PAGE->url be set or debugging is triggered 
2 quiz tests are creating forms with text editors manually - they need to ensure a valid
$PAGE->url is set so they don't trigger debugging warnings from $PAGE->url magic method
called by Atto.
 2014-08-19 16:02:14 +08:00
Marina Glancy
430529bde8 Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle 2014-08-19 13:50:44 +08:00
Marina Glancy
efc815848d Merge branch 'wip-MDL-46791-master' of git://github.com/satrun77/moodle 2014-08-19 10:47:55 +08:00
Tim Hunt
f276267d93 MDL-44894 question editing: fix validation with odd permissions 
For users with edit permissions, but not add permissions, it was
impossible to save the editing form. The validation assuemd this value
was present, but it was not. Other code checks this field too, so I
added it rather than changing the validation and all the other uses.
 2014-08-14 11:25:18 +01:00
Damyon Wiese
8593521f4c MDL-18014 Atto autosave: Fix coding style issues 2014-08-14 12:42:46 +08:00
Damyon Wiese
2ba6706d12 MDL-18014 Atto: Autosave text every N seconds. 2014-08-14 12:41:55 +08:00
Mohamed Alsharaf
6d0361ff25 MDL-46791 question: fixed incorrect 5th param for tag_set() 2014-08-13 13:57:12 +12:00
Marina Glancy
3cef86a42b Merge branch 'MDL-46308' of git://github.com/timhunt/moodle 2014-08-12 16:02:41 +08:00
Tim Hunt
013fa7a444 MDL-46308 qformat_xml: fix import of broken calculated questions. 
Questions like this should not exist, of course. But they do, so we
should avoid generating errors in this case.
 2014-08-08 17:58:44 +01:00
Tim Hunt
aa4dcee761 MDL-46681 qtype_multichoice: disabled unused options 
For questions set to 'One answer only', the 'Clear incorrect responses'
and 'Show the number of correct responses' hint options make not sense,
and are not used. Hence we disableIf them.
 2014-08-07 14:20:06 +01:00
Eric Merrill
84f74ccff6 MDL-46386 question Whitelist the Atto editor from return blocking 
Prevent the question engine from blocking return/enter key presses
from being sent to the Atto editor.
 2014-07-21 09:08:01 -04:00
Ankit Agarwal
82b3260eab MDL-46148 qtype_calculated: low-level defence against bad formulas 
This catches things like:
 * Malicious equations coming from backup files.
 * Malicious equations in old questions in the database.
 2014-07-10 17:55:11 +08:00
Damyon Wiese
539a25ff03 MDL-46148 questions: Added missing allow_commit for transaction 2014-07-10 11:35:47 +08:00
Tim Hunt
5c6c172033 MDL-46148 qtype_calculatedsimple: fix notice 
... when adding a dataset with a formula error.
 2014-07-09 13:47:48 +01:00
Tim Hunt
66de66fe6a MDL-46148 qtype_calculated: fix validation when importing. 
In order to do this in a sane way, I cleaned up a lot of old mess,
inclduing:

1. Previously, qtype_calcuated used ->answeres when importing, and
->answer when saving the form. This was crazy, so I fixed it, and
stripped out the code that made the alternative variable name work.

2. Similarly, it could handle ->answer being either an array, such as
you would get form the HTML editor, or a simple string, which is what
you get form the form. I simplified that too.

3. Finally, I made import use a transaction around saving each
question, so we don't get half questions in the database when an error
occurs.
 2014-07-09 13:35:09 +01:00
Tim Hunt
770d3ce426 MDL-46148 qtype_calculated: removed unused method. 2014-07-09 12:56:18 +01:00
Sam Hemelryk
95d294368f Merge branch 'MDL-46212' of git://github.com/timhunt/moodle 
Conflicts:
	question/type/calculated/question.php
 2014-07-08 11:43:09 +12:00
Tim Hunt
88ec9f308d MDL-46148 qtype_calculated: validate formulas everywhere. 2014-07-07 14:33:34 +01:00
Tim Hunt
155bc75472 MDL-46148 qtype_calculated: function to validate equations in text. 2014-07-07 14:33:29 +01:00
Tim Hunt
29005a5418 MDL-46148 qtype_calculated: Remove unused function. 2014-07-07 14:33:24 +01:00
Tim Hunt
44f726a7b1 MDL-46148 qtype_calculated: unit tests + fixes for validation 2014-07-07 14:33:20 +01:00
Tim Hunt
f4fe3968a2 MDL-46212 questions: add {} whenver vars are put into "" strings 
Having had one subtle bug cased be this, I decided to do a search and
fix all of these.
 2014-07-03 14:02:39 +01:00
Tim Hunt
0e30442ca8 MDL-46212 question editing: extra answer fields notice. 
It turns out that PHP does not interpret "$field[$key]" the way we were
expecting.
 2014-07-03 13:56:11 +01:00