26ae471585
Merge branch 'MDL-40896' of git://github.com/timhunt/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-08-19 15:38:23 +08:00
9e6eb082ff
MDL-38203 multianswer qtype: feedback pop-up should be constrained.
...
So that, when there is a lot of feedback, it is all visible.
2013-08-15 14:15:38 +01:00
afb1b3d03b
MDL-39980 question engine: Attempt on last loses response files
...
When doing Each attempt builds on last, we need to copy any response
files into a draft file area, and then re-save them.
While writing the unit test for this, I had to deal with a todo in the
question engine so that questions with files in the response could be
unit-tested.
I also found an fixed a bug with qtype_essay_question::is_same_response
and fixed some notices in the existing essay/manual graded unit tests.
2013-08-15 12:55:13 +01:00
89b04bef50
MDL-41093 qtype match: unique index upgrade problem.
...
Eliminate duplicate rows before we try to add a unique index. We
arbitrarily keep the duplicate row with the lowest id.
2013-08-15 12:20:07 +01:00
fa5c608c62
MDL-41036 Question category info should use HTML editor
...
This is a minimal fix. All this code could do with a clean-up, but at
the moment, it works, so I am not going to touch it.
2013-08-15 12:19:47 +01:00
2f7827b241
MDL-40896 Add missing question edit CSS to bootstrapbase.
2013-08-15 12:18:00 +01:00
387d040b7b
Merge branch 'MDL-40668-master' of git://github.com/damyon/moodle
2013-08-13 11:14:37 +08:00
0c0dfa8fbd
MDL-40668 tinymce: Remove collapsable editor options
...
We have an alternative (pdw toolbars)
Also, allow tinymce to be collapsed down to a single row.
2013-08-13 10:54:36 +08:00
ed07242713
MDL-39507 qtype_essay: hacky fix for unit tests
...
This is just to get the tests passing for integration purposes. Tim
may want to do a robust fix and revert this.
2013-08-13 10:47:19 +08:00
942a0e37d4
Merge branch 'MDL-39507' of git://github.com/timhunt/moodle
2013-08-13 09:52:35 +08:00
defb89c30c
Merge branch 'MDL-41091' of git://github.com/timhunt/moodle
2013-08-13 09:38:40 +12:00
e2b388c1a4
MDL-39507 questions: fix pluginfile URLs before format_text.
...
This commit build's on Jean-Michel's work, tidying up a few lose ends.
2013-08-12 10:32:02 +01:00
df7d175d0f
MDL-41091 questions: fix get_all_submitted_qt_vars for unit testing.
2013-08-08 14:41:53 +01:00
6c23d0d403
MDL-39507 questions: fix pluginfile URLs before format_text.
2013-08-08 10:05:48 +01:00
398dc6a3ab
MDL-30001 WEBCT Import does not work for 2.0
2013-08-08 07:43:43 +02:00
eff03a8be7
MDL-47494 ddmarker: Fix incorrect PARAM_TEXT.
2013-08-07 19:37:48 +01:00
874104d5af
MDL-47494 ddimageortext: Fix incorrect PARAM_TEXT.
2013-08-07 19:37:32 +01:00
09ab016651
MDL-47494 gapselect: Fix incorrect PARAM_TEXT.
2013-08-07 19:36:45 +01:00
2f1e464a88
MDL-40438 migrate all collatorlib:: and textlib:: uses
2013-08-06 21:04:35 +02:00
87934924be
Merge branch 'MDL-31226-master' of https://github.com/lucisgit/moodle
2013-08-06 14:38:08 +10:00
f8e28244cb
MDL-31226: quiz: Fix message for attempts built on previous.
...
At the moment, when attempt is built on the last one, "not yet answered"
message is shown, which confuses many people. This patch modifies the state to
"complete" for attempt based on previous and modifies the output string.
Many thanks to Tim Hunt for guiding me through quiz infrastructure and some code
suggestions.
2013-08-02 16:19:18 +01:00
18be442ce3
MDL-47494 ddmarker: Fix use of deprecated context functions.
...
Also, improve import to use new qformat_xml method.
2013-08-02 14:30:14 +01:00
86687aadb6
MDL-47494 ddimageortext: Fix use of deprecated context functions.
...
Also, improve import to use new qformat_xml method.
2013-08-02 14:28:56 +01:00
c6457b8acf
Merge branch 'MDL-35053' of git://github.com/timhunt/moodle
2013-07-30 10:21:38 +12:00
d2fd7262af
MDL-39404 Update question/format files to match codechecker standards
2013-07-26 21:32:34 +02:00
68d2f6a008
MDL-35053 questions: question files outside an attempt.
...
Now update all the places that display files outside attempts to use the
new API.
2013-07-26 13:10:11 +01:00
181393aad2
MDL-35053 questions: question files outside an attempt.
...
Sometimes it is necssary to display parts of a question outside of an
attempt. For example for staff review. When displaying the question, we
need to handle images in the question text. In the past there was a
mechanism for this that could only cope with the question text.
This commit introduces a new method that can handle displaying any
part of the question content.
This commit intentionally does not upgrade the parts of the system that
use the mecanism. That is so that this commit can be used to demonstrate
that backwards-compatibility works. The next commit will upgrade the
callers.
2013-07-26 13:10:08 +01:00
a3c5150b2a
MDL-40714 pass through simulated data to sub questions
...
in multi-answer question type
2013-07-23 15:29:28 +08:00
c2b051c7aa
MDL-40542 need to be able to select variant
...
in unit tests
2013-07-23 15:11:56 +08:00
c2f2e7f008
MDL-40541 need to be able to select random q
...
in unit tests
2013-07-23 15:08:32 +08:00
388f047345
MDL-40543 convert from simulated responses
...
to post data
2013-07-23 15:00:02 +08:00
5432ccec64
Merge branch 'wip_MDL-40778_v2' of https://github.com/jamiepratt/moodle
2013-07-23 14:26:35 +08:00
09ff04bcfe
MDL-40778 clear cache for random questions between tests
2013-07-22 11:12:21 +07:00
3897608152
MDL-39635 behat: XPath cleanups
...
- Escaping steps arguments redirected to other steps
- Adding normalized-space() in all contains() assertions
- General xpaths review
- Convering provided xpath text strings to xpath literals
to avoid problems with arguments containing both single
quotes and double quotes
2013-07-19 10:02:36 +02:00
dedb973878
MDL-39635 behat: Replacing hardcoded language strings
...
Using get_string() instead.
2013-07-19 10:02:10 +02:00
1c74b26090
MDL-40220 use new core_component::get_plugin_directory()
2013-07-16 22:38:38 +02:00
bd3b3bba9f
MDL-40220 use new core_component::get_plugin_list()
2013-07-16 22:36:11 +02:00
38dff99e64
MDL-31776 - lib: Alternate name fields - fixed up user object in question code.
2013-07-10 15:28:27 +08:00
76149901a9
MDL-40449 use data generator to create random qs
2013-07-10 15:45:45 +12:00
c6df1f5ad0
Merge branch 'MDL-39420' of git://github.com/timhunt/moodle
2013-07-09 22:43:54 +08:00
dad5f63d3d
MDL-39420 multichoice: fix layout of multi-line choices.
2013-07-09 11:56:28 +01:00
3a1b0dd908
Merge branch 'wip-MDL-40430-master' of git://github.com/abgreeve/moodle
2013-07-09 16:57:07 +08:00
329846f198
MDL-40430 - Libraries: Deprecate print_context_name().
2013-07-09 16:11:55 +08:00
01c898ecec
MDL-40171 question saving test
2013-07-09 15:08:01 +08:00
eb729e0391
Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle
2013-07-09 13:26:49 +08:00
b4a044f3fb
Merge branch 'MDL-40434' of git://github.com/timhunt/moodle
2013-07-09 11:30:42 +10:00
f383a58a90
MDL-40499 Edit question from 1.9 backup breaks if images in subdirs
2013-07-04 14:09:13 +02:00
38c3492038
MDL-40434 calculatedmulti multiple-response questions not randomised
2013-07-02 08:21:42 +01:00
e4bb5050a6
Merge branch 'MDL-40370' of git://github.com/timhunt/moodle
2013-07-01 18:01:32 +02:00
8434f64a48
MDL-47494 ddmarker: Update version and readme for the 1.3 release.
2013-07-01 15:42:04 +01:00
Damyon Wiese