mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
70,451 Commits 36 Branches 519 Tags
Commit Graph

2769 Commits

Author SHA1 Message Date
Tim Hunt
165d6d7c56 MDL-43131 qbank: Fix show question text when first viewing. 
When you followed the link to the question bank, the checkbox for the
"Show question text in the question list" option correctly reflected the
user's preference, but what was actually shown in the question bank did
not.
 2013-12-05 11:22:18 +00:00
Sam Hemelryk
db9c8f4c7d Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle 2013-12-04 09:43:43 +13:00
Damyon Wiese
23a05a1b9a Merge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle 2013-12-03 16:15:53 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
David Monllao
e7c71c448b MDL-42627 behat: Moving the deprecated method to behat_deprecate and updating scenarios 2013-12-02 14:13:17 +08:00
Sam Hemelryk
12539749f4 Merge branch 'MDL-42918' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-02 13:44:05 +13:00
Eloy Lafuente (stronk7)
4942801c39 Merge branch 'MDL-42957-master' of https://github.com/jamiepratt/moodle 
Conflicts:
	question/classes/statistics/questions/calculator.php
	question/classes/statistics/responses/analyser.php
 2013-11-28 12:44:04 +01:00
James Pratt
487e7e6602 MDL-42957 (2) quiz statistics : Hardcoded sql LIMIT clause 
Fixing some typos and adding some tests.
 2013-11-28 17:13:26 +07:00
Dan Poltawski
bb29677965 Merge branch 'MDL-43000' of git://github.com/timhunt/moodle 2013-11-26 15:05:42 +08:00
Damyon Wiese
4d4b345392 MDL-42919 Question: Remove   from empty labels 
This allows the form elements with empty labels to "fold" properly.
 2013-11-26 13:30:36 +08:00
rwijaya
e94d023225 MDL-42918: fixed fullscreen width for multichoice answers editor 2013-11-26 12:21:51 +08:00
James Pratt
a9e2f21125 MDL-42957 quiz statistics : Hardcoded sql LIMIT clause 2013-11-25 10:43:18 +08:00
Tim Hunt
5dbfbc82cf MDL-43000 shortanswer qtype: handle patterns with many *s 
Teachers were typing patterns like
********************************<em>****************************</em>
which translates into a pattern like .*.*.*.*, which is very inefficient
to try to match, althought it is equivalent ot a single .*. At a certain
point preg was just giving up.

Since people actually do this, we should simplify the regex by treating
runs of * like a single *.
 2013-11-22 11:32:09 +00:00
James Pratt
e4b17111a4 MDL-42957 quiz statistics : Hardcoded sql LIMIT clause 2013-11-20 11:32:27 +07:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Damyon Wiese
34b67813ec Merge branch 'MDL-42598' of git://github.com/timhunt/moodle 2013-11-13 13:43:52 +08:00
Eloy Lafuente (stronk7)
5658129967 Merge branch 'MDL-42790' of git://github.com/timhunt/moodle 2013-11-13 01:12:27 +01:00
Marina Glancy
930fbd0505 Merge branch 'MDL-38574' of git://github.com/timhunt/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-13 11:05:25 +11:00
Tim Hunt
c1db10b6d5 MDL-38574 qtype chooser: quick fix to make it fit on-screen. 
MDL-32729 will provide a better fix for this, but we may as well apply
this quick fix on stable branches.
 2013-11-12 11:35:42 +00:00
Sam Hemelryk
0fd6069ecd Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle 2013-11-11 13:10:44 +08:00
Adrian Greeve
5b1944bbba MDL-40612 libraries: Tidy up and improvement of the code for additional name fields. 
Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
 2013-11-11 11:01:14 +08:00
Tim Hunt
3fc9410f84 MDL-42790 essay attempt on last: fix plain reponse mode 
Plain responses, without files, were getting messed up by the
fix for MDL-39980. Something that looked like an HTML comment was being
appended.

This fix works by avoiding appending anything if there are no files. The
new unit test (which was failing before I fixed the code) confirms that
this works. The other tests should be enough to verify that there are no
regressions.
 2013-11-08 15:13:04 +00:00
Dan Poltawski
46af039925 Merge branch 'MDL-42743' of git://github.com/timhunt/moodle 2013-11-08 16:08:20 +08:00
Tim Hunt
a568785223 MDL-42743 improve wording of the CBM summary on quiz review 2013-11-07 10:30:06 +00:00
Dan Poltawski
5b5447fa83 MDL-41615 question: fix unit tests 
Heading levels have been changed.
 2013-11-07 18:10:55 +08:00
Dan Poltawski
48fe93fa26 Merge branch 'MDL-41615_c' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-07 17:17:32 +08:00
rwijaya
c544ee92f5 MDL-41615 quiz_mod: fix heading levels for usability and accessibility 2013-11-07 12:04:00 +08:00
Dan Poltawski
02c6bd358f Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle 
Conflicts:
	lang/en/moodle.php
 2013-11-07 09:34:31 +08:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere 
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
 2013-11-06 16:40:01 +00:00
Helen Foster
5a25566060 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:41:44 +01:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Dan Poltawski
afc33a9ad1 MDL-42286 fix trailing whitespace 2013-11-04 14:14:30 +08:00
Dan Poltawski
fa5b21216f Merge branch 'MDL-42286_behat' of https://github.com/andyjdavis/moodle 2013-11-04 14:13:27 +08:00
Damyon Wiese
f21531eb77 Merge branch 'MDL-42546-master' of git://github.com/danpoltawski/moodle 2013-11-02 22:39:37 +08:00
Dan Poltawski
472c06f816 MDL-42546 question: fix some bad phpdocs 2013-11-01 12:06:43 +08:00
Andrew Davis
b54f5086f6 MDL-42286 questionbank: add behat tests for putting questions in categories MDLQA-95 2013-11-01 10:28:28 +08:00
Tim Hunt
d7db097db1 MDL-42598 quiz variant randomisation not random enough. 
A student would get the same question variants (for example for a
calculated question) on their first attempt at both copies of a
duplicated quiz.
 2013-10-29 16:19:24 +00:00
Jason Fowler
7db052a8f2 MDL-42285 Behat: Automate MDLQA-93 - A teacher can delete questions from the question bank 2013-10-24 12:35:23 +08:00
Tim Hunt
562684e3a0 MDL-42309 typo: fix reponse -> response throughout Moodle. 2013-10-15 13:47:27 +11:00
Tim Hunt
5562ab20ea MDL-42232 Multiple choice question choice alignment issue 
The problem was with the alignment of:
* tables inside the choices.
* Lists inside the choices.
* The specific feedback, when it spanned mulitple lines.

The problem was introduced by MDL-39420.
 2013-10-11 14:32:42 +01:00
Marina Glancy
1b7930fe4a Merge branch 'wip-MDL-42238-master' of git://github.com/abgreeve/moodle 2013-10-11 13:32:14 +11:00
Adrian Greeve
60e34a02db MDL-42238 - mod_quiz: Slight change to the logic to fix Alt. name messages. 2013-10-10 14:06:33 +08:00
Sam Hemelryk
2219f50a10 Merge branch 'MDL-32188' of git://github.com/timhunt/moodle 2013-10-10 08:34:11 +13:00
Damyon Wiese
6e4dcb9a47 MDL-40493 Question: Explain why setAdminUser is needed for tests 2013-10-09 16:53:21 +08:00
Tim Hunt
e9af46d8e7 MDL-32188 fix type in question/engine/upgrade.txt 2013-10-09 09:14:24 +01:00
Petr Škoda
c969753885 MDL-40493 question: set real $USER before testing question walktrough 2013-10-09 11:02:35 +13:00
Tim Hunt
8b9ef25ea2 MDL-32188 question CBM: use short certainty name in response summaries. 2013-10-04 21:46:47 +01:00
Tim Hunt
2bf83cb218 MDL-32188 question CBM: minimal handling of certainty -1 
Certainty -1 has never been used in standard Moodle, but is
used in Tony-Gardiner Medwin's patches to mean 'No idea' which
we intend to implement: MDL-42077. In the mean time, these changes
avoid errors for people who have used TGM's patches.
 2013-10-04 21:46:46 +01:00
Tim Hunt
e74aa0aa97 MDL-32188 question CBM: compute summary stats for CBM behaviours 
We now compute the average CBM score, accuracy, CBM bonus and enhanced
accuracy, both for the entire quiz, and for just the questions answered.

Note that these calculations must work correctly in the presence of
descriptions, ungraded questions, and manually graded questions. For
example, imagine a essay added at the end of the quiz "Summarise what
you learned attempting this exercise." This might have max mark zero or
non-zero. The CBM statistics just ignores questions like that.
 2013-10-04 17:56:36 +01:00
Tim Hunt
9b2fe16bca MDL-32188 question CBM: improve display of the certainty choices 
Switch to the neutral C=1, 2, 3 mode. Also add a helpicon, and improve
line-wrapping.
 2013-10-04 17:52:31 +01:00