2789 Commits

Author SHA1 Message Date
Tim Hunt
28273694e5 MDL-43246 give unit tests class a better name. 2014-01-23 15:20:57 +00:00
Dan Poltawski
e5c5f52e8b MDL-43670 quiz: improve code comments a little 2014-01-21 11:59:07 +08:00
Dan Poltawski
1f931e2928 Merge branch 'MDL-43670' of git://github.com/timhunt/moodle 2014-01-21 11:25:38 +08:00
Damyon Wiese
9a170849d7 MDL-39756 qtype_essay : Make defaults match upgrade (and php) for responserequired field 2014-01-20 17:24:04 +08:00
Damyon Wiese
ae69bab27f Merge branch 'MDL-39756-essay' of https://github.com/ktemkin/moodle 2014-01-20 16:20:15 +08:00
Damyon Wiese
3a96e8b4c3 Merge branch 'MDL-32523' of git://github.com/timhunt/moodle 2014-01-20 16:02:54 +08:00
Tim Hunt
3d96b4945a MDL-43733 use any auto-saved responses when questions are finished.
Before this, autosave was only working to save data when a student went
back in to continue an attempt. If the student, having crashed out,
never went back in and continued the attempt, their auto-saved responses
were not used when the attempt was automatically finished. That was a
rather bad oversight, which should now be fixed.
2014-01-17 16:58:13 +00:00
Tim Hunt
dc4a3ea1ee MDL-43670 quiz_question_instances to match coding guidelines.
Some columns needed to be renamed:
* quiz     -> quizid
* question -> questionid
* grade    -> maxmark

Then all the places that refer to those needed to be fixed.
2014-01-17 10:56:07 +00:00
Tim Hunt
d7ddbc8297 MDL-32523 question behat tests: distinctive question names
This means that, if you are watching the tests run, it is easier to see
which test is currently being executed.
2014-01-17 10:54:13 +00:00
M Kassaei
e0c41591e1 MDL-32523 Duplicate questions in question bank 2014-01-17 10:54:12 +00:00
Eloy Lafuente (stronk7)
8273055fb1 NOBUG: Fixed file access permissions 2014-01-16 18:50:54 +01:00
Kyle Temkin
a4f765eb1d MDL-39756 add advanced attachment options to essay question type
Adds a set of options to the essay question type which implement
the following new features:

-Adds an input format which accepts only file uploads, and no
 inline text.
-Adds an option to make the inline text response optional when
 attachments are enabled, so students can choose to upload
 an essay file.
-Adds an option to make attachments required, so essays without
 attachments will be marked incomplete.
2014-01-15 12:43:04 -05:00
Damyon Wiese
761549816d Merge branch 'w02_MDL-43511_m27_bankcache' of https://github.com/skodak/moodle 2014-01-14 14:29:58 +08:00
Dan Poltawski
81f7090b0c MDL-40313 question: build shifter after js changes 2014-01-14 14:28:44 +08:00
Petr Škoda
c0fa7b0d93 MDL-43511 do not cache the MUC cache in question code 2014-01-12 18:20:52 +08:00
Tim Hunt
d62382d1f9 MDL-40313 question bank search classes should be namespaced. 2014-01-09 18:26:21 +00:00
Tim Hunt
e22e749002 MDL-40313 Fix code and doc checker warnings. 2014-01-09 18:26:18 +00:00
Ray Morris
efa5155a2a MDL-40313 questionbank: Add question filtering API
Add new API for filtering questions, refactoring the options to display
old questions and include subcategories into new
question_bank_search_condition classes. Make the new API pluggable via
local_[pluginname]_get_question_bank_search_conditions.
2014-01-09 16:46:42 +00:00
Eloy Lafuente (stronk7)
ebc77165a4 Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle 2013-12-10 23:29:06 +01:00
David Monllao
d1e55a47be MDL-42625 behat: Step definitions + related changes in features
In general aiming for compatibility with multiple browsers,
firefox, chrome and phantomjs to be more specific.

* Removing hardcoded waits
* Adding @_alert, @_switch_window and @_switch_frame tags,
  to label actions that different drivers have problems with.
* Adding missing @_files_upload and @_only_local tags to features that
  uploads files.
* Fixing a few wait for page ready what specified miliseconds.
* New methods to ensure elements (usual selectors), sections and editors
  are ready to interact with
* Changing the select an option implementation to deal with the different
  drivers implementations when listening to JS events.
2013-12-06 13:10:24 +08:00
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