Eloy Lafuente (stronk7)
a917ef63ae
Merge branch 'MDL-37465' of git://github.com/colchambers/moodle
2013-01-29 19:19:29 +01:00
Dan Poltawski
cbb26eb0ec
Merge branch 'MDL-37600' of git://github.com/timhunt/moodle
2013-01-29 16:49:58 +08:00
Dan Poltawski
0fed6554f9
Merge branch 'MDL-33105' of https://github.com/ppichet/moodle
2013-01-29 16:31:50 +08:00
Dan Poltawski
cc0ee3c4f3
Merge branch 'MDL-29691' of https://github.com/ppichet/moodle
2013-01-29 16:30:00 +08:00
Sam Hemelryk
dff72cde30
Merge branch 'MDL-32750' of git://github.com/colchambers/moodle
2013-01-28 11:57:17 +13:00
Tim Hunt
9887aaeb75
MDL-37600 qtype match: fix codechecker issues.
2013-01-25 14:07:33 +00:00
Tim Hunt
87d767343d
MDL-37600 qtype match: remove obsolete DB columns, and obey coding style.
...
Tables renamed to start qtype_match, and qtype_match_options.subquestions
and qtype_match_subquestions.code columnd dropped. Also, qtype_match_options
-> question foreign key link changed to be foreign-unique, since that is
what it should be.
2013-01-25 12:38:16 +00:00
Colin Chambers
2a22be64ee
MDL-32750 Question: make the html editor tools collapsible
2013-01-25 11:17:41 +00:00
Colin Chambers
f0a64f017c
MDL-37465 Combined feedback: Num correct responses ticked by default
2013-01-25 11:15:50 +00:00
Dan Poltawski
ec0f4373fa
Fix permissions
2013-01-25 15:57:20 +08:00
Dan Poltawski
ad3a730c3a
Merge branch 'MDL-37506' of git://github.com/timhunt/moodle
2013-01-23 08:54:32 +08:00
Dan Poltawski
c9ae6d3c27
Merge branch 'MDL-17812' of git://github.com/timhunt/moodle
2013-01-22 11:11:53 +08: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
Dan Poltawski
864ff70c74
Merge branch 'MDL-36534' of git://github.com/timhunt/moodle
2013-01-15 14:44:28 +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
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
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
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
Eloy Lafuente (stronk7)
6b9dfe731e
MDL-37032 upgrade: define all the 2.4.0 points
2012-12-11 13:11:11 +01: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
Tim Hunt
6b290a491c
MDL-36732 Cloze qtype: review marks should not depend on feedback.
...
The various review options should be independent.
2012-11-30 15:58:12 +00:00
Eloy Lafuente (stronk7)
663dbbc2e6
MDL-36933 Bump everything to 2012112900
...
(versions, requires and dependencies)
2012-11-30 03:30:09 +01:00
Tim Hunt
6e4a2acf93
MDL-36916 quiz/questions: simplify code after MDL-36638.
2012-11-29 09:28:36 +00:00
Frederic Massart
c384744304
MDL-36638 usability: Core changes for new quiz/question icons
2012-11-29 12:41:29 +08:00
Tim Hunt
5f137dcbe2
MDL-36760 formslib: fix frozen elements with [] in name.
...
This was a regression caused by MDL-30845 or, to be precise, the related
issue MDL-32785.
Form elements with names like multipier[0] require special handling,
such as is present in HTML_QuickForm_element::_prepareValue. I have
added equivalent handling to MoodleQuickForm::exportValues. I am afraid
that I could not think of a way to do this reliably without duplicating
code.
2012-11-23 10:53:14 +00:00
Dan Poltawski
91b0d0b75a
Merge branch 'MDL-36571' of git://github.com/timhunt/moodle
2012-11-20 14:59:34 +08:00
Tim Hunt
acb9f7f47d
MDL-36683 qtype match restore: better subq indentification.
...
This is very similar to what MDL-30018 did for question_answers.
2012-11-19 17:46:25 +00:00
Tim Hunt
8a7d763c77
MDL-36571 qtype multichoice: don't corrupt unicode characters.
...
It seems that \s includes non-breaking space, and the typical one-byte
representation of that is the same as some parts of multibyte unicode
characters. Therefore, you need to include the u modifer on the regular
expressions.
Also, remove any number of <br /> at the end of the answer.
Thanks to Joseph Rézeau and Jean-Michel Vedrine for working out what the
problem was, and how to fix it.
2012-11-19 17:21:00 +00:00
Dan Poltawski
0e35ba6ffc
MDL-36357 cleanup - remove double semicolons
2012-11-15 09:51:26 +08:00
Matt Petro
a538cf839e
MDL-36025 qtype calculated: Fix handling of "-0"
2012-11-02 11:07:02 -04:00
Sam Hemelryk
41b4e5ec7f
Merge branch 'MDL-36076' of git://github.com/timhunt/moodle
2012-10-30 12:59:23 +13:00
Dan Poltawski
506263cfee
Merge branch 'WIP-MDL-36033-master' of git://github.com/nadavkav/moodle
2012-10-29 14:59:45 +08:00
Tim Hunt
15dd772736
MDL-34399 questions cleanup: straighten out strange links to question objects.
2012-10-26 11:58:14 +08:00