mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-15 21:36:58 +01:00
Code Issues Projects Releases Wiki Activity
58,320 Commits 36 Branches 523 Tags
Commit Graph

2253 Commits

Author SHA1 Message Date
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
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
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
Dan Poltawski
2e6aff57e5 Merge branch 'MDL-35404' of git://github.com/timhunt/moodle 2012-12-10 11:36:38 +08:00
Jean-Michel Vedrine
7980a381cc MDL-36243 question->questiontext and question->generalfeedback should always be strings 2012-12-08 14:09:26 +01:00
Tim Hunt
7e252acff1 MDL-36942 xml question import: don't add spaces. 
They are not necessary anyway, there is a \n character at the end of
each line.

Thanks to Richard Lobb for fining the problem and how to fix it.
 2012-11-30 15:59:11 +00: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
Tim Hunt
7c86af621e MDL-35404 question export: make it work with slasharguments off. 
Thanks to Brian King for working out the problem and how to fix it. I am
just committing his patch.
 2012-11-30 11:48:26 +00:00
Dan Poltawski
054124a3ed MDL-36887 quiz: reorder upgrade.txt's 2012-11-30 11:41:01 +08: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
Dan Poltawski
513c64c303 Merge branch 'MDL-36806' of git://github.com/timhunt/moodle 2012-11-27 13:26:38 +08:00
Tim Hunt
97f1137a61 MDL-36806 question files: fix unnecessary require_login call. 
quiz_question_pluginfile later does the correct check. Doing this
other check first means you get an error about changing $PAGE->context.
 2012-11-23 15:54:58 +00: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
Dan Poltawski
56eaaecfa2 Merge branch 'MDL-32865' of git://github.com/jmvedrine/moodle 2012-11-20 12:05:36 +08:00
Eloy Lafuente (stronk7)
9e3f733f8a Merge branch 'MDL-36683' of git://github.com/timhunt/moodle 2012-11-20 01:33:39 +01: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
Jean-Michel Vedrine
bedbfd6dfa MDL-32865 Backwards compatibility, deal with the old image tag 2012-11-17 16:38:03 +01:00
Jean-Michel Vedrine
7c86628de6 MDL-32865 CLOZE Questions imported from another course end up with broken image links 2012-11-17 16:38:02 +01:00
Frederic Massart
06b7ed0a45 MDL-36415 usability: Use new up/down and ordering icons 2012-11-16 12:47:09 +08:00
Dan Poltawski
0e35ba6ffc MDL-36357 cleanup - remove double semicolons 2012-11-15 09:51:26 +08:00
Dan Poltawski
f7febae6d0 Merge branch 'MDL-36422-master' of git://github.com/FMCorz/moodle 2012-11-08 11:07:43 +08:00
Frederic Massart
eec4107bdd MDL-36422 question: Fixed malformed HTML in manual marking 2012-11-08 10:20:22 +08:00
Sam Hemelryk
f3c306f4e0 MDL-21625 question: Fixed phpdocs 2012-11-05 16:29:28 +13:00
Sam Hemelryk
544c455357 Merge branch 'MDL-21625_b' of git://github.com/rwijaya/moodle 2012-11-05 16:27:43 +13: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