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
79,580 Commits 36 Branches 519 Tags
Commit Graph

3614 Commits

Author SHA1 Message Date
Tim Hunt
0b4b0a7eea MDL-51914 qtype_ddmarker: fix checking points on the boundary 
All points on the boundary are now considered in the shape, on the
grounds that it is better to grade someone right for an edge case.
 2015-11-02 22:06:23 +00:00
David Mudrák
e8b75e6292 MDL-52018 lang: Fix behat tests to use the new strings 2015-11-02 22:30:46 +01:00
Helen Foster
da6ecfd8c1 MDL-52018 lang: Merge English strings from the en_fix language pack 2015-11-02 22:12:06 +01:00
Dan Poltawski
ca9daf0fb0 Merge branch 'MDL-51955' of git://github.com/stronk7/moodle 2015-10-29 14:22:28 +00:00
Eloy Lafuente (stronk7)
aa4a2716ef MDL-51955 testing: Exported files may be smaller than expected 
Open a bit the allowed size expectation to accomodate oracle
producing smaller files when outputing decimal numbers.
 2015-10-29 13:19:36 +01:00
Dan Poltawski
413c321a18 Merge branch 'MDL-51914' of git://github.com/timhunt/moodle 2015-10-28 11:52:03 +00:00
Tim Hunt
2d391d1b10 MDL-51914 qtype_ddmarker: precise grading round the edges of zones 
There was a previous change to the CSS (7px -> 3px) to make things
look prettier, which acutally broke the grading by a few pixes.
I fixed this by:

* Changing the offset of the cross hairs back to the correct value,
  and adding a comment to point out the imporance of not changing
  that CSS.

* Achieved the nice layout of the label relative to the cross-hairs
  in a different way.

* Added a similar clafirying comment in the JavaScript.

* Improved how the grid on the editing form is aligned with the
  background image.

* Added rounding to the grading code, to cope better now that
  browsers do sub-pixel positioning.
 2015-10-28 10:53:00 +00:00
Simey Lameze
abc2491211 MDL-51855 mod_question: fix offset error during upgrade 2015-10-26 11:51:18 +08:00
Tim Hunt
e5acdcb942 MDL-51771 question engine: fix typo in SQL 
Thanks to Pete at learningpool.com for finding thsi bug.
 2015-10-18 16:03:29 +01:00
Andrew Nicols
62bf94655e Merge branch 'MDL-50182' of git://github.com/stronk7/moodle 2015-10-16 08:07:04 +08:00
Dan Poltawski
4f8641be36 Merge branch 'MDL-38214_wipd' of git://github.com/ppichet/moodle 2015-10-14 14:15:14 +01:00
Dan Poltawski
e3b03886d0 MDL-47494 copyright: missed fixes from last commit 
With thanks to Tim!
 2015-10-13 09:55:28 +01:00
Dan Poltawski
bf47ddbdf3 MDL-47494 copyright: fix incorrect statement 
(From copy/paste error, blame Tim :P)
 2015-10-13 09:39:28 +01:00
Eloy Lafuente (stronk7)
ca09f076f8 MDL-50182 core: add 3.0 environmental requirements 
Only change from 2.9 is the modification of the slasharguments
admin setting string to recommend always to keep the setting enabled
and fix the problem in the server, warning about the drawbacks
of disabling it.

Also, there is a little phpdoc note added to one custom check
to have clearly specified when we can get rid of it.
 2015-10-13 00:33:41 +02:00
Pierre Pichet
bd15685352 MDL-38214 Questions: Add MCS, MCVS, MCHS Cloze subquestion types 
Daniel Seemuth add MCO,MCVS,MCHS new multianswer subquestion types
qtype_multianswer_initialise_multichoice_subquestion.
Pierre Pichet MCO to MCS, add shuffling display in decode and verify edit_multianswer_form.php
add test_questiontext_extraction.

Signed-off-by: Pierre Pichet <pichet.pierre@uqam.ca>
 2015-10-08 10:02:25 -05:00
Pierre Pichet
48b5b28ff4 MDL-38214 Questions: Add MCS, MCVS, MCHS Cloze subquestion types 
qtype_multianswer: fix codechecker issues.

Signed-off-by: Pierre Pichet <pichet.pierre@uqam.ca>
 2015-10-08 10:02:24 -05:00
Eloy Lafuente (stronk7)
3883191436 MDL-51555 behat: Added @_file_upload missing tags 
So phantomjs can perform complete runs without breakage.
 2015-10-01 17:41:48 +02:00
Andrew Nicols
2aac262f69 Merge branch 'MDL-51476' of git://github.com/timhunt/moodle 2015-09-29 11:40:40 +08:00
Tim Hunt
ddc016830d MDL-51476 questions: manual grading validation for ungraded Qs 
The change in MDL-51090 broke manually commenting on questions for which
no mark is given (max mark == 0). This fixes it, with unit tests.

Thanks to Nick Phillips for the original suggestion of the fix.
 2015-09-25 14:01:33 +01:00
rajesh Taneja
0f2aad5908 MDL-51555 behat: Increase question preview window 
As question preview window is small, chrome driver
fails to select drag and drop element
 2015-09-25 16:53:14 +08:00
rajesh Taneja
8d892b1d40 MDL-51555 behat: Added @_switch_window tag 
DND question types use switch window and the tag
was not added, so it was failing for phantomjs
Added tag to avoid phantomjs failures
 2015-09-25 11:53:03 +08:00
Eloy Lafuente (stronk7)
caac3c50a1 NOBUG: Fixed file access permissions 2015-09-24 16:06:53 +02:00
rajesh Taneja
4cfaf27c08 MDL-49973 behat: Fixed string change from Continue to Delete 2015-09-24 15:38:20 +02:00
Eloy Lafuente (stronk7)
201a26bbaa Merge branch 'MDL-47494' of git://github.com/timhunt/moodle 
Note: Fixed some minor grunt and EOF whitespace issues while merging.
 2015-09-22 18:38:27 +02:00
Dan Poltawski
11a83dbb1e Merge branch 'MDL-49973-master' of git://github.com/cameron1729/moodle 2015-09-22 09:44:44 +01:00
Eric Merrill
8bc1d28b1a MDL-47494 question General code cleanup 
Remove old browser CSS.
Fix code style problems.
Add many PHPdocs.
Set @package uniformly.
 2015-09-19 07:23:52 +01:00
Damyon Wiese
031152cc83 MDL-47494 qtype: Fix the behat tests for OU dd question types 2015-09-18 07:56:27 +01:00
Damyon Wiese
96a744babd MDL-47494 qtype: Bump the version numbers for OU DD qtypes 2015-09-18 07:56:26 +01:00
Damyon Wiese
5a22d35e8b MDL-47494 question_ddwtos: Remove @ou tags from behat. 2015-09-18 07:56:25 +01:00
Damyon Wiese
da98a64d91 MDL-47494 question_ddimageortext: Remove wrong @since tag 2015-09-18 07:56:25 +01:00
Damyon Wiese
5a1a082c93 MDL-47494 questions: Add transparency to new ou question type icons 2015-09-18 07:56:24 +01:00
Damyon Wiese
f825273476 MDL-47494 questions: Reload XMLDB files for ou question types 2015-09-18 07:56:13 +01:00
Tim Hunt
b9d85e9a45 MDL-47494 gapselect: removing the qtype_combined integration. 
Once this question type is in core. This integration with
qtype_combined will have to ship with qtype_combined, which
is no problem.
 2015-09-18 07:51:41 +01:00
Tim Hunt
2e8202e022 MDL-47494 ddmarkder: Remove the code for converting old imagetarget Qs 
imagetarget was a Moodle 1.9 question type. The ddmarkers plugin
had code for converting old imagetarget questions to new ddmarker
questions. However, since Moodle core does not support upgrading
directly from 1.9, and since I suspect most pople who might need
this code have already used it, I am removing it form core.
 2015-09-18 07:51:41 +01:00
Tim Hunt
096b04058b MDL-47494 questions: clean up unnecessary stuff now these are not plugins 
* Remove extra stuff from version.php files.
* Remove README.txt files
* Remove OU-specific test annotations.
 2015-09-18 07:51:40 +01:00
Tim Hunt
5c8d91d83f Merge branch 'MDL-47494-ddmarker' into MDL-47494 2015-09-18 07:51:37 +01:00
Tim Hunt
2ce6a9c64f Merge branch 'MDL-47494-ddimageortext' into MDL-47494 2015-09-18 07:51:36 +01:00
Tim Hunt
55d4613f22 Merge branch 'MDL-47494-ddwtos' into MDL-47494 2015-09-18 07:51:34 +01:00
Tim Hunt
1fc5d49cc2 Merge branch 'MDL-47494-gapselect' into MDL-47494 2015-09-18 07:51:33 +01:00
Andrew Davis
6537778044 MDL-49973 changed continue to delete on delete confirmations 2015-09-14 17:40:34 +08:00
Tim Hunt
53eee12a7a MDL-51147 qtype_match: stats should cope even if Q edited badly 
The numbers become pretty meaningless, but we need to avoid fatal
errors.
 2015-09-09 16:48:27 +01:00
Tim Hunt
6b3bd52fae MDL-51090 question manual grading: fixing for testing issues 2015-09-02 15:09:34 +08:00
David Monllao
f242c83c77 Merge branch 'MDL-51090' of git://github.com/timhunt/moodle 2015-09-02 09:47:34 +08:00
Tim Hunt
b2694c0219 MDL-51090 question: further refinements to validating manual grades 2015-09-01 23:05:37 +01:00
David Monllao
9f6a55f7ea Merge branch 'MDL-51179-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/upgrade.txt
 2015-09-01 15:57:21 +08:00
Damyon Wiese
988592c556 MDL-51179 Atto: Extend autosave fix to cover text changes 
Added new functions to editor api - set/get_text so the
original form text can be determined from an editor.

When calling use_editor() you should first call set_text() with
the text that will be inserted in the form element.

There is also a new scheduled task for cleaning Atto autosave drafts.
 2015-09-01 12:23:00 +08:00
Tim Hunt
aa8092c60f MDL-47494 gapselect: Clarify comment. 2015-08-26 23:14:16 +01:00
Tim Hunt
99348b2319 MDL-47494 ddmarker: Fix unit tests for 3.0 compatibility. 2015-08-21 12:35:58 +01:00
Tim Hunt
4a53044a10 MDL-47494 ddimageortext: Fix unit tests for 3.0 compatibility. 2015-08-21 12:35:36 +01:00
Tim Hunt
976d30839d MDL-47494 ddwtos: Fix unit tests for 3.0 compatibility. 2015-08-21 12:35:01 +01:00