mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity
76,289 Commits 36 Branches 527 Tags
9e313e798f
Commit Graph

3540 Commits

Author SHA1 Message Date
David Monllao
9e313e798f MDL-51784 general: Adding missing php4 style constructors 
Adding them to warn people calling the php4 constructor.
 2015-12-11 14:02:42 +08:00
Marina Glancy
c4d0b752a2 MDL-51784 various: use __construct() for PHP7 compatibility 2015-12-11 12:48:24 +08:00
David Monllao
e574148c50 MDL-52333: qtype_calculated: Adding division by zero test 2015-12-10 16:38:57 +08:00
Tony Levi
c6f9107029 MDL-52333 qtype: PHP7-compatibility in calculate_raw() 
Code also modified by Tim Hunt
 2015-12-10 16:38:57 +08:00
Dan Poltawski
bbd3156049 Merge branch 'wip-MDL-52193-master' of https://github.com/marinaglancy/moodle 2015-12-07 15:36:55 +00:00
David Monllao
f2304bfb81 Merge branch 'MDL-48004-master' of git://github.com/danpoltawski/moodle 2015-12-03 18:52:24 +01:00
David Monllao
200ab5266a Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle 
Conflicts:
	lib/upgrade.txt
 2015-12-03 18:51:42 +01:00
Andrew Nicols
6e8e992d37 Merge branch 'wip-mdl-52357' of https://github.com/rajeshtaneja/moodle 2015-12-03 18:50:03 +01:00
Rajesh Taneja
0049d2591b MDL-52357 behat: add 2 sec delay to ensure window is stable 2015-12-01 15:45:05 +08:00
Ankit Agarwal
c917b53a8d MDL-50269 deprecations: Properly deprecate notify() 2015-12-01 15:29:33 +08:00
Dan Poltawski
17fda969ff MDL-45364 ddimageortext: refine naming & docs of new methods 2015-11-26 19:48:44 +00:00
Andrew Nicols
2ccb8d006a MDL-45364 qtype_ddimageortext: Fix JS Lint issues 2015-11-26 19:09:29 +00:00
Dan Poltawski
5aeba19926 MDL-48004 question: remove buggy arg of question_edit_setup 
There are no uses of this in core and it does not make sense
 2015-11-26 15:04:10 +00:00
Dan Poltawski
4dc29f5e8d MDL-48004 question: prevent notices on import screen 
If query params were not passed the page would previously display debug
notices as setting the $requirecourseid param to question_edit_setup()
was buggy.
 2015-11-26 15:02:36 +00:00
Dan Poltawski
4e1648cc34 Merge branch 'MDL-52291' of git://github.com/stronk7/moodle 2015-11-25 11:22:17 +00:00
Eloy Lafuente (stronk7)
e716c18fb9 MDL-52291 questions: fix upgrade from 2.5 and earlier 
Because of some changes performed to the multichoice qtype
for Moodle 2.6, older sites are not able to upgrade properly.

This commits does introduce DB introspection to decide which
table and column names must be used. Nasty but enough.

Note MDL-52298 has been created about to avoid/minimize the
chances of this happening again.
 2015-11-25 00:19:30 +01:00
Rajesh Taneja
a3f22d315f MDL-50163 behat: wait to ensure elements are placed properly by js. 2015-11-24 11:16:44 +08:00
Eloy Lafuente (stronk7)
65b70071ca Merge branch 'wip-MDL-52203-master' of https://github.com/marinaglancy/moodle 2015-11-19 09:45:30 +01:00
Dan Poltawski
78b2c65c0a Merge branch 'MDL-52162_master' of git://github.com/dmonllao/moodle 2015-11-19 06:33:54 +00:00
Marina Glancy
3be59be349 MDL-52203 qtype_multianswer: avoid fatal error during upgrade 2015-11-19 11:06:48 +08:00
Marina Glancy
97562c4d7c MDL-52193 questions: add missing require_once 2015-11-18 13:33:34 +08:00
David Monllao
0519a1dabb MDL-52162 question: Removing unnecessary dependency 
APIs dependencies were correctly removed during MDL-38214 review although
this unnecessary require remained here.

Credit to Marina Glancy.
 2015-11-18 13:16:39 +08:00
Eloy Lafuente (stronk7)
6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
Eloy Lafuente (stronk7)
2e144835bb MDL-52059 versions: bump all versions and requires near release 
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
 2015-11-10 12:33:52 +01:00
Dan Poltawski
728754de6b Merge branch 'MDL-52018-master-enfix' of git://github.com/mudrd8mz/moodle 2015-11-03 17:56:21 +01:00
Andrew Nicols
80ad34e720 Merge branch 'MDL-51914' of git://github.com/timhunt/moodle 2015-11-03 09:42:04 +08:00
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