Commit Graph

3817 Commits

Author SHA1 Message Date
Dan Poltawski 97d3e09cd8 Merge branch 'MDL-37599' of git://github.com/timhunt/moodle 2013-01-22 11:40:04 +08:00
Dan Poltawski c9ae6d3c27 Merge branch 'MDL-17812' of git://github.com/timhunt/moodle 2013-01-22 11:11:53 +08:00
Tim Hunt b5d09003bb MDL-37599 question import: add missing string.
AMOS BEGIN
 MOV [matcherror,question],[invalidgrade,question]
AMOS END
2013-01-21 12:07:47 +00:00
ppichet c2ba17858c MDL-33105 flexible apply_units() function
Allow use of thousands separator as long as the decimal separator
is used in the number.
2013-01-19 15:36:31 -05:00
ppichet 1649a4f7ea MDL-29691 Improve numerical format in multianswer
Allow the use of , as decsep in multianswer numerical subquestions
2013-01-18 21:48:56 -05:00
Tim Hunt b4cb095798 MDL-17812 shortanswer qtype: rename DB stuff to match coding guidelines.
We should be leading by example in Moodle core.
2013-01-18 15:53:35 +00:00
Tim Hunt fbfa572d70 MDL-28512 qtype essay: clean up garbage qtype_essay_options rows. 2013-01-18 12:20:10 +00:00
Tim Hunt 19835d4aff MDL-28512 qtype essay: clean up properly when a question is deleted. 2013-01-18 11:27:53 +00:00
Tim Hunt 03cefcc91b MDL-37506 question code: incorrect preg_quote uses.
For preg_quote to work reliably, you must pass the delimiter you are
using for your regular expression. In many places we were failing to do
that.
2013-01-18 11:18:54 +00:00
Dan Poltawski b630c53591 Merge branch 'MDL-37374' of git://github.com/timhunt/moodle 2013-01-17 10:22:55 +08:00
Tim Hunt a8e577debb MDL-37374 questions: fix property_exists calls. 2013-01-16 11:13:53 +00:00
Eloy Lafuente (stronk7) 563bcc2322 Merge branch 'MDL-31726' of git://github.com/colchambers/moodle 2013-01-15 21:44:38 +01:00
Tim Hunt 61ba43b0b3 MDL-47494 gapselect: Fix incorrect preg_quote usage. 2013-01-15 14:52:01 +00:00
Tim Hunt d5515e1df3 MDL-47494 ddwtos: Fix incorrect preg_quote usage. 2013-01-15 14:49:52 +00:00
Tim Hunt c0d7468e42 MDL-47494 ddmarker: Fix incorrect preg_quote usage. 2013-01-15 14:48:47 +00:00
Tim Hunt 7a6539401f MDL-47494 ddimageortext: Fix incorrect preg_quote without delimiter. 2013-01-15 14:47:36 +00:00
Dan Poltawski a9081ce630 MDL-37313 question: fix trailing whitespace 2013-01-15 16:36:14 +08:00
Dan Poltawski 12576d356a Merge branch 'MDL-37313' of git://github.com/jmvedrine/moodle 2013-01-15 16:35:17 +08:00
Dan Poltawski 864ff70c74 Merge branch 'MDL-36534' of git://github.com/timhunt/moodle 2013-01-15 14:44:28 +08:00
Dan Poltawski 76a32e1a6f Merge branch 'MDL-37374' of git://github.com/timhunt/moodle 2013-01-15 12:59:33 +08:00
Dan Poltawski 01dcd9d770 Merge branch 'MDL-35793' of git://github.com/timhunt/moodle 2013-01-15 12:56:51 +08:00
Tim Hunt 5574862063 MDL-36534 question editing: clean up lang strings.
There were a number of lang strings in suboptimal places.
This commit fixes that, and also removed some unused strings.

AMOS BEGIN
 MOV [addmorechoiceblanks,qtype_multichoice],[addmorechoiceblanks,question]
 MOV [youmustenteramultiplierhere,qtype_calculated],[youmustenteramultiplierhere,qtype_numerical]
AMOS END
2013-01-14 14:52:49 +00:00
Colin Chambers c4b2600d4b MDL-36534 Quiz: Group question type unit fields 2013-01-14 14:37:37 +00:00
Jean-Michel Vedrine 52158a41e4 MDL-37313 Sample files with images for XML import 2013-01-11 19:54:06 +01:00
Jean-Michel Vedrine 2387d1cde5 MDL-37313 Moodle XML import format should use draft file areas, not arrays 2013-01-11 19:54:06 +01:00
Tim Hunt 016a651578 MDL-37431 question preview: cron performance problem.
This query was performing badly. The solution seems to be to add a
redundant JOIN and WHERE to the subquery.

I renamed the table aliases in the subquery to avoid name collisions
elsewhere. I am afraid that makes the diff rather unhelpful. The
    AND subq_qu.component = :qubacomponent2
line is new. The other lines have just had subq_ added.
2013-01-11 13:18:21 +00:00
Tim Hunt 8d54191d7a MDL-37374 questions: use property_exists rather than isset
$a->field = null; isset($a->field) returns false, which is typical PHP.
I also improve the error handling a bit.
2013-01-11 13:15:51 +00:00
Colin Chambers 086cced749 MDL-31726 Pre-fill question type combined feedback 2013-01-10 15:57:36 +00:00
Sam Hemelryk f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
Conflicts:
	user/view.php
2013-01-09 09:34:22 +13:00
Jean-Michel Vedrine d55399a098 MDL-28183 fix for problem during integration
Conflicts:
	question/type/multianswer/question.php
2013-01-08 12:03:48 +01:00
Dan Poltawski 4c345a1ed4 Merge branch 'MDL-36955' of git://github.com/jmvedrine/moodle 2013-01-08 12:20:54 +08:00
Dan Poltawski 9519d41142 MDL-28183 - fix trailing whitespace 2013-01-08 12:18:49 +08:00
Dan Poltawski b5b418b2a7 Merge branch 'MDL-28183' of git://github.com/jmvedrine/moodle 2013-01-08 12:17:51 +08:00
Eloy Lafuente (stronk7) 3cb7609bd6 Merge branch 'MDL-35792' of git://github.com/timhunt/moodle 2013-01-07 22:35:06 +01:00
Dan Poltawski bfa2b0382f Merge branch 'MDLmaster-MDL-37157-2' of https://github.com/OdyX/moodle 2013-01-07 13:59:52 +08:00
Jean-Michel Vedrine c2f056a925 MDL-36955 Multianswer grading penalties do not address subparts 2012-12-30 11:59:34 +01:00
Jean-Michel Vedrine e9af609176 MDL-28183 add num parts correct and clear wrong to multianswer 2012-12-30 11:55:21 +01:00
Tim Hunt bf7b7f45d1 MDL-37068 qformat_learnwise: fix UTF8 and other issues. 2012-12-22 17:38:52 +00:00
Tim Hunt 4125ded139 MDL-35793 question preview: config for the display options.
The settings control the display options used when a user
first previews a question in the question bank. Once a
user has previewed some questions, these are stored as user
preferences.

It may not seem worth making this configurable, but acutally
it is important when training new users to get them started
off using the right opitions.
2012-12-22 17:38:37 +00:00
Thanh Le 599cc731e3 MDL-35792 question preview: way to update options without restarting.
It is useful, and possible, to update the display options without
restarting the question. You now only have to restart if you are
changing the maximum mark or the behaviour.
2012-12-22 17:38:30 +00:00
Tim Hunt 9645fe83ff MDL-32245 question bank: update URL after moving question between categories.
Also, improve the URL when you go to edit the questions in a category.
2012-12-20 12:12:22 +13:00
Didier Raboud 5a449045c2 MDL-37157: Normalize short answers before comparison
This ensures that ambiguous Unicode representations can be compared sanely.
Also add some tests to ensure it keeps working.

Thanks to Tim Hunt for the syntax check.
2012-12-18 18:44:15 +01:00
Tim Hunt e4ca11842b MDL-32245 question bank: fix coding style in categories.php 2012-12-15 10:41:00 +00:00
Thanh Le 87bee3bcfa MDL-32245 question bank: fix moving categories between contexts. 2012-12-15 10:40:59 +00:00
Eloy Lafuente (stronk7) 6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Dan Poltawski cba50c0088 Merge branch 'MDL-36243' of git://github.com/jmvedrine/moodle 2012-12-11 16:24:10 +08:00
Dan Poltawski 5d44e45264 Merge branch 'MDL-36025-negative-zero' of git://github.com/mpetrowi/moodle 2012-12-11 11:06:28 +08:00
Sam Hemelryk 9a8b79864a Merge branch 'MDL-36916' of git://github.com/timhunt/moodle 2012-12-11 15:42:13 +13:00
Sam Hemelryk 711e0ad9b7 Merge branch 'MDL-36942' of git://github.com/timhunt/moodle 2012-12-11 15:04:22 +13:00
Dan Poltawski 69e0b225c1 Merge branch 'MDL-36732' of git://github.com/timhunt/moodle 2012-12-10 15:17:46 +08:00