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

2348 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
cf20e809aa Merge branch 'MDL-38582' of git://github.com/timhunt/moodle 2013-03-26 16:03:37 +01:00
Damyon Wiese
96a9273343 Merge branch 'MDL-38528' of git://github.com/timhunt/moodle 2013-03-26 14:57:04 +08:00
Jonathon Fowler
8bcefa699d MDL-38390 qformat_blackboard_six: use pool title as category name 
If the category title is empty, generate a sequentially-numbered
title to use instead.
 2013-03-23 17:35:16 +10:00
Tim Hunt
ba203de1d3 MDL-38582 testing: Let any component have a data generator. 
Plus a simple core_question generator to test the concept.
 2013-03-22 10:28:24 +00:00
Tim Hunt
d6b8e1923a MDL-38528 qtype_calc* dataset forms: disable short-forms for now. 
At the moment using short-forms no these forms really does not work. In
future is may be possible to do a complete overhaul, but for now, just
disabling short-forms is a simple fix.
 2013-03-22 10:28:03 +00:00
Eloy Lafuente (stronk7)
8b994ec0b9 Merge branch 'MDL-38490' of git://github.com/timhunt/moodle 2013-03-20 00:43:09 +01:00
Eloy Lafuente (stronk7)
65b5f400b8 Merge branch 'MDL-38395' of git://github.com/timhunt/moodle 2013-03-19 23:06:06 +01:00
Eloy Lafuente (stronk7)
989b9ab6fb Merge branch 'MDL-38363' of git://github.com/timhunt/moodle 2013-03-19 21:02:48 +01:00
Eloy Lafuente (stronk7)
28a5cd942d Merge branch 'MDL-38355' of git://github.com/timhunt/moodle 2013-03-19 21:00:21 +01:00
Eloy Lafuente (stronk7)
49ac0c5d6a Merge branch 'MDL-38388' of git://github.com/jonof/moodle 2013-03-19 18:47:39 +01:00
Eloy Lafuente (stronk7)
b81d5eab90 Merge branch 'MDL-38542' of git://github.com/timhunt/moodle 2013-03-19 16:48:37 +01:00
Eloy Lafuente (stronk7)
1e1815bead Merge branch 'MDL-38444' of https://github.com/ppichet/moodle 2013-03-19 16:33:28 +01:00
Tim Hunt
1736fe3f74 MDL-38542 shortanswer qtype: was broken for responses of '0'. 
This was a regression caused by MDL-37157 & MDL-37746.
 2013-03-19 13:40:51 +00:00
Eloy Lafuente (stronk7)
70ca006538 Merge branch 'MDL-38397' of git://github.com/timhunt/moodle 2013-03-19 12:28:01 +01:00
Damyon Wiese
864ce820c4 MDL-38005 formslib: Removing additional duplicate headers in calculated question form. 2013-03-18 14:11:09 +08:00
Damyon Wiese
7c211f565a Merge branch 'MDL-38005-master' of git://github.com/FMCorz/moodle 2013-03-18 13:45:41 +08:00
ppichet
e605209ad6 MDL-38444 Saving datasets from edit_calculatedsimple_form.php 
Bypassing the 3 steps savequestion() of calculated.
 2013-03-16 23:36:44 -04:00
Tim Hunt
c52bcbf65f MDL-38363 qtype_calculated. Fix warnings. 2013-03-15 11:22:38 +00:00
Tim Hunt
8009810ed4 MDL-38395 question categories: wrong URLs after editing. 
The problem was that array1 + array2 takes the values from
array1 when a key appears in both places.

While working on this area, I updated it to use html_writer.
 2013-03-15 08:12:39 +00:00
Frederic Massart
807cf3d0ae MDL-38005 form: Headers have a proper name 2013-03-15 11:06:25 +08:00
Jonathon Fowler
e5ca31fa4d MDL-38388 qformat_blackboard_six: fix question image import 
This works on the expectation that the returned array from readdata()
is opaque and will be fed directly into readquestions() since
filebase is different per file and needs to be set up appropriately
before each parse.
 2013-03-15 09:08:57 +10:00
Tim Hunt
c81175f532 MDL-38355 qtype_multianswer: input boxes too big in Russian. 
... and any other language where the characters take multiple
bytes in UTF-8.

This fix was worked out by Dušan Ristić. I am just committing it.
 2013-03-14 22:24:37 +00:00
Tim Hunt
1aecaa3d79 MDL-38397 question editing: only validate default mark if present. 
Most qtypes have that field, but not all. multianswer is an example in core.
Also some contrib qtypes.
 2013-03-14 22:11:49 +00:00
Tim Hunt
2443f3d21d MDL-38490 question preview, variant is attempt (not display) option 2013-03-14 17:21:16 +00:00
Jean-Michel Vedrine
3f28674535 MDL-33424 Images missing when restoring a 1.9 backup 2013-03-09 13:51:34 +01:00
Eloy Lafuente (stronk7)
69d0129389 Merge branch 'MDL-38311' of git://github.com/timhunt/moodle 2013-03-06 10:36:24 +01:00
Tim Hunt
770e4a467f MDL-38311 question manual grading: comment fixes. 2013-03-06 09:27:11 +00:00
Eloy Lafuente (stronk7)
6026f23559 MDL-38311 Add missing comment format. 2013-03-06 02:02:45 +01:00
Eloy Lafuente (stronk7)
9f4da038c8 Merge branch 'MDL-38311' of git://github.com/timhunt/moodle 2013-03-06 01:22:32 +01:00
Eloy Lafuente (stronk7)
af733564f4 Merge branch 'MDL-38119' of git://github.com/timhunt/moodle 2013-03-05 16:45:01 +01:00
Tim Hunt
53b8e25626 MDL-38311 questions: manual grading API should accept commentformat 
Comment format (FORMAT_...) was correctly being processed when the
manual grading happened as the result of a form submission. It was only
when done using the question_usage or question_attempt API method that
there was no way to specify the format. (Although I think the only place
this API as used was in the unit tests.)

Note that question_attempt::manual_grade API had to change, but I don't
think that is a real API change. Calling code should be using
question_usage::question_attempt, which is backwards compatible.

Note that now, if you don't pass format, then no error is generated, but
a developer debugging message is generated.
 2013-03-05 11:51:47 +00:00
Aparup Banerjee
810fb772c3 Merge branch 'MDL-38240' of git://github.com/timhunt/moodle 2013-03-05 16:00:49 +08:00
Damyon Wiese
915b7aca62 Merge branch 'MDL-38279' of git://github.com/timhunt/moodle 2013-03-05 15:22:38 +08:00
Damyon Wiese
ffb95d5fdc Merge branch 'MDL-38241' of git://github.com/timhunt/moodle 2013-03-05 14:13:42 +08:00
Damyon Wiese
6fbf382cd4 Merge branch 'MDL-38280' of git://github.com/timhunt/moodle 2013-03-05 14:10:00 +08:00
Sam Hemelryk
44cfa89576 Merge branch 'MDL-38094' of git://github.com/timhunt/moodle 2013-03-05 16:57:50 +13:00
Eloy Lafuente (stronk7)
adc4aca475 Merge branch 'MDL-37897' of git://github.com/jmvedrine/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-03-05 00:56:24 +01:00
Tim Hunt
8407a5498b MDL-38280 manual graded behaviour: unit test for when not answered. 
If the student does not submit an answer, the questoin goes to state
gaveup, rather than requiresgrading.
 2013-03-01 17:04:04 +00:00
Tim Hunt
00cefd925a MDL-38279 questions: must have default mark positive. 2013-03-01 15:21:09 +00:00
Andrew Robert Nicols
5251450372 MDL-31390 Convert set_source_sql with order clauses to set_source_table 2013-03-01 11:29:01 +00:00
Tim Hunt
baa6159bb9 MDL-38241 qtype_match: should say Blanks for 3 more questions. 
Currently it says Blanks for 3 more choices, like multichoice, which is
confusing.

AMOS BEGIN
 MOV [addmoreqblanks,qtype_match],[blanksforxmorequestions,qtype_match]
AMOS END
 2013-02-28 18:34:43 +00:00
Tim Hunt
f7ce33c287 MDL-38240 question forms: penalty should not be reqired. 
It is a selecte menu, so you have to select a value, and anyway, 0 is a
valid value.

Once this is not a required field, the 'Multiple tries' section of the
form will collapse by default.
 2013-02-28 18:34:25 +00:00
Tim Hunt
e01cf1fa68 MDL-37847 / MDL-38119 question engine: document API change. 2013-02-28 18:33:07 +00:00
Tim Hunt
c3c65f417a MDL-38094 question forms: remove spare repeat element blanks. 
Once the question has been created, only so as many blanks as are
required by the current question. Adding a new answer / choice / unit /
etc. is a rare operation, so it is OK if it takes another mouse click.
It is better to keep the form shorter in the common case.
 2013-02-28 18:32:48 +00:00
Jean-Michel Vedrine
4f315786e8 MDL-37897 Remove useless Blackboard question import format 2013-02-28 17:46:29 +01:00
Eloy Lafuente (stronk7)
d2761b3aad Merge branch 'MDL-37967' of git://github.com/jmvedrine/moodle 2013-02-20 00:32:19 +01:00
Dan Poltawski
fdd91adabb Merge branch 'MDL-38051' of git://github.com/jmvedrine/moodle 2013-02-19 11:23:39 +08:00
Jean-Michel Vedrine
ded5cddb32 MDL-37967 Improve XML question import format handling of duplicated files 2013-02-18 07:38:22 +01:00
Jean-Michel Vedrine
7bae3a12fd MDL-38051 Annihilate all the CRLFs present in some questions/fixtures... 2013-02-15 18:26:38 +01:00
Jean-Michel Vedrine
0e178dc939 MDL-37934 Blackboard_six question import fails in some cases 
Import fails if the same image is used several times
in the same field of the same question
 2013-02-14 09:26:29 +01:00