mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 12:34:28 +01:00
Code Issues Projects Releases Wiki Activity
59,037 Commits 36 Branches 523 Tags
Commit Graph

2297 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
a35a7644b9 Merge branch 'MDL-37847' of git://github.com/timhunt/moodle 2013-02-04 22:54:50 +01:00
Tim Hunt
c0d12fc1cd MDL-37847 plain text essays were screwing up HTML special chars. 
This was incorrect use of PARAM_CLEANHTML for these inputs.

This fix also adds some unit tests to try to verify that this does not
break again in future.
 2013-02-04 12:54:10 +00:00
Dan Poltawski
58e22287a6 Merge branch 'MDL-37422' of git://github.com/colchambers/moodle 2013-02-04 16:02:57 +08:00
Colin Chambers
6dbc346095 MDL-37422 Quiz: Group fields related to 'Settings for multiple tries.' 2013-02-01 14:30:27 +00:00
Tim Hunt
a74d924c25 MDL-37746 qtype_shortanser: avoid normalizer_normalize dangers. 
When an error occurs, normalizer_normalize just silently returns null,
which is dangerous. Here, we wrap it in a safe helper function.
 2013-01-31 11:35:07 +00:00
Dan Poltawski
8d81f4f4cc Revert "MDL-33105 flexible apply_units() function" 
This reverts commit c2ba17858c1994d9654a5ca64cb9fb22780654c1.
 2013-01-31 10:17:16 +08:00
Petr Škoda
7a18f49c60 MDL-37726 remove PREVIOUS/NEXT from all install.xml files 
YAY!
 2013-01-29 22:34:46 +01:00
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
f9a71cb033 Merge branch 'MDL-37172' of git://github.com/jmvedrine/moodle 2013-01-28 17:29:24 +13:00
Sam Hemelryk
dff72cde30 Merge branch 'MDL-32750' of git://github.com/colchambers/moodle 2013-01-28 11:57:17 +13:00
Jean-Michel Vedrine
a5d7862b58 MDL-37172 Hardcoded strings in some question imports formats 
AMOS BEGIN
MOV [unknownorunhandledtype,qformat_blackboard_six],[unknownorunhandledtype,question]
AMOS END
 2013-01-25 22:31:06 +01: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
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
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