3614 Commits

Author SHA1 Message Date
Davo Smith
946ab15c72 MDL-3782 qtype_multianswer: support 'multiple-answer' subquestions 2016-08-03 08:04:49 +01:00
Eloy Lafuente (stronk7)
ddf1d5c692 Merge branch 'MDL-55244-master' of git://github.com/danpoltawski/moodle 2016-07-27 00:19:40 +02:00
David Monllao
837cec00f9 Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle
Conflicts:
	lib/upgrade.txt
2016-07-26 10:14:30 +08:00
Rajesh Taneja
52f3e060e4
MDL-55091 phpunit: Following has been deprecated.
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
2016-07-26 10:11:30 +08:00
Dan Poltawski
3a0bc0fdc4 MDL-55244 js: build changes
There should be no changes to minified code
2016-07-25 07:58:05 +01:00
Dan Poltawski
5bb4f444de MDL-55244 js: fix problems with eslint --fix
eslint --fix '**/yui/src/**/*.js'
2016-07-25 07:53:05 +01:00
Steffen Pegenau
51ed23519a MDL-55200 question type ddmarker: Display coordinates on image
To make the creation of dropzones easier, the mouse coordinates are shown.
2016-07-18 20:40:49 +02:00
Dan Poltawski
6e304922fb MDL-54944 js: built files after changes 2016-07-07 12:11:07 +01:00
Dan Poltawski
c905cd233d MDL-54944 js: fix quoting of object properities coding style
Detected by http://eslint.org/docs/rules/quote-props
2016-07-07 12:11:05 +01:00
Rajesh Taneja
0908069407 MDL-50758 behat: Fixed string changes 2016-07-05 07:40:03 +08:00
Anant
4358ee3892 MDL-50758 qtype_multichoice: Displays multiple correct answers 2016-06-30 10:40:38 -07:00
Andrew Nicols
00f99e270a Merge branch 'MDL-54649-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:14 +01:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible.
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
2016-06-10 08:06:49 +10:00
Dan Poltawski
996a1dab8f MDL-54649 quiz/question: fix css lint errors
Mostly the rules were not having any effect so have been removed.

The text-wrap rule was removed rather than corrected because overflow
was clipped with ellipsis anyway.

An exception for !important has been added to mod/quiz/styles.css
because the use in the secure style is by design. But the exception
isn't ideal because it applied to the whole file and csslint doesn't
seem to be very intelligent at appling line rules at a more granular
level at this point in time.
2016-06-03 14:18:57 +01:00
David Monllao
0cdef23bdb Merge branch 'MDL-53938' of git://github.com/timhunt/moodle 2016-05-31 11:42:17 +08:00
David Monllao
9812222d21 Merge branch 'MDL-29905-master' of git://github.com/FMCorz/moodle 2016-05-30 15:40:43 +08:00
Andrew Nicols
7c8f4f6b70 Merge branch 'MDL-35987-master' of git://github.com/FMCorz/moodle 2016-05-30 13:38:52 +08:00
Frederic Massart
31031e98c7 MDL-29905 question: Auto remove stale questions upon category deletion 2016-05-30 12:26:09 +08:00
Eric Merrill
54640aba8a MDL-29905 question: Try to delete unused hidden/random questions
Before going to display the warning about moving in use questions,
try to delete unused Random qtype questions, as well as 'hidden'
questions (these are questions that were deleted from the category),
but were in use at the time.
2016-05-30 12:25:21 +08:00
Frederic Massart
9a601adc9e MDL-35987 qtype_multianswer: Prevent restore failure due to bad sequence 2016-05-25 12:23:50 +08:00
Andrew Nicols
979d5c0603 Merge branch 'MDL-54715-master' of git://github.com/marinaglancy/moodle 2016-05-24 14:53:24 +08:00
Marina Glancy
3e9437f412 MDL-54715 core_question: fixed bug when importing questions with tags
Thanks to WangYang for original patch
2016-05-24 14:37:53 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Eloy Lafuente (stronk7)
1abca11e0a MDL-54638 versions: bump all versions and requires near release
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
Dan Poltawski
7fdd86247b Merge branch 'wip-mdl-54543' of https://github.com/rajeshtaneja/moodle 2016-05-13 18:11:28 +08:00
Rajesh Taneja
80b852d0c9 MDL-54543 behat: Increase file download range
with different db's, the id and defaultgrade
might be different, so increasing the range
to avoid such failures
2016-05-12 15:48:13 +08:00
Tim Hunt
c76789f49a MDL-53938 qformat_gift: handle multi-choice MR with one 100% choice 2016-05-11 18:07:23 +01:00
Frederic Massart
67ee10307f MDL-54098 external: Remove usage of require_login and $PAGE->set_context 2016-05-09 19:42:37 +08:00
Dan Poltawski
35b3f50ee2 Merge branch 'MDL-53728' of git://github.com/timhunt/moodle 2016-04-11 14:02:29 +01:00
Tim Hunt
f06eacd99d MDL-53728 question import/export: improve form structure 2016-04-06 15:35:29 +01:00
Rajesh Taneja
921faad9ad MDL-53571 behat: Use Escaper for escaping
xpathLiteral has been depreacted, use Escaper instead
2016-04-06 15:38:31 +08:00
Rajesh Taneja
eb9ca848fa MDL-53381 behat: Replaced chained steps with api.
Behat 3.x doesn't support chained steps and hence
this is first step to get rid of chained steps in core.
2016-04-06 11:32:49 +08:00
Juan Leyva
b6c538416b MDL-52767 mod_quiz: New API for retrieving the question types 2016-03-23 00:56:05 +01:00
Eloy Lafuente (stronk7)
55e90f2270 Merge branch 'MDL-53393-master' of git://github.com/cameron1729/moodle 2016-03-22 03:16:51 +01:00
Cameron Ball
3e3f624549 MDL-53393 libraries: Upgrade Html2Text to 4.0.1 2016-03-21 12:05:33 +08:00
Pau Ferrer Ocaña
176bcaa928 MDL-53409 question: Add tests for core_question_update_flag 2016-03-18 15:08:22 +01:00
Pau Ferrer Ocaña
7361b9682e MDL-53409 question: New WS core_question_update_flag 2016-03-18 15:08:17 +01:00
David Monllao
8e9cafbee7 Merge branch 'MDL-53304' of git://github.com/timhunt/moodle 2016-03-14 13:26:12 +08:00
Rajesh Taneja
e01012e96d MDL-46891 behat: Driver specific fixes.
1. Browserkit doesn't handle [] in name
2. Grades are not visible in viewport and might fail
   with few drivers, increasing size of window to ensure
   grades are visible and can be modified.
3. Click edit first to see grade link
4. Expand fields before setting value
5. Updated xpath, as crawler update it.
6. Hover fails to show icon
2016-03-11 10:51:16 +08:00
Rajesh Taneja
42ad096fdb MDL-46891 Behat: Added support for behat 3 2016-03-11 10:51:15 +08:00
Eloy Lafuente (stronk7)
7e9b046a50 Merge branch 'MDL-53369' of git://github.com/timhunt/moodle 2016-03-10 13:17:09 +01:00
David Monllao
9eede5bb9a Merge branch 'MDL-53350' of git://github.com/timhunt/moodle 2016-03-08 09:04:01 +08:00
Tim Hunt
981743b3ba MDL-53369 qtype_ddwtos: prevent boxes on consecutive lines touching 2016-03-07 15:22:54 +00:00
Tim Hunt
4b8a86503d MDL-53353 drag-drop marker quetions: fix edit form jitter 2016-03-04 17:41:54 +00:00
Tim Hunt
286d28b5e5 MDL-53350 drag-drop to text: layout problem on reivew 2016-03-04 17:01:31 +00:00
Tim Hunt
81e47a35e8 MDL-53304 question behaviour: don't show useless Check buttons
Previously, the Check button was often shown disabled when it
could not be used (e.g. when the question was finished, or when an
interactive question was in the try-again state). Eventually we
realised it was better usability to hide it in these cases.

Note that when a teacher reviews an in-progress quiz attempt, they will
see a disabled Check button if the student doing the quiz can see the
button.
2016-03-04 14:06:19 +00:00
Rajesh Taneja
677ba15853 MDL-51075 behat: Fixed exported question file size 2016-03-02 11:39:10 +08:00
KeenRivals
26c19b02d5 MDL-50175 graphics: Optimized PNG images with optipng
Used options: -o7 -strip all and advdef -z4 -i50.

(With ./lib excluded)
2016-02-25 11:56:37 +00:00
Eloy Lafuente (stronk7)
153fbcd24a Merge branch 'MDL-53065' of git://github.com/timhunt/moodle 2016-02-22 23:01:04 +01:00
Tim Hunt
293f5d1b11 MDL-53065 quiz redo question: avoid PHP notice in edge case
When selecting the variant of the new question, we need to add the
new question to the usage before trying to select a variant.

Also, we need to acutally use the selected variant number!
2016-02-19 12:10:39 +00:00