18506 Commits

Author SHA1 Message Date
Henning Bostelmann
e5e89cacfb MDL-55236 mod_assign: Allow subplugins to backup files 2016-09-05 11:39:12 +02:00
Dan Poltawski
eccebeebf5 Merge branch 'MDL-55815' of git://github.com/timhunt/moodle 2016-09-05 08:27:58 +01:00
Dan Poltawski
e5c5f5d3ff Merge branch 'MDL-54113-master' of git://github.com/andrewnicols/moodle 2016-09-05 07:53:26 +01:00
Marina Glancy
f9e2d3d451 MDL-55832 mod_feedback: apply filters to multichoice quesitons 2016-09-05 13:29:57 +08:00
Andrew Nicols
63d7b1acc0 MDL-42041 mod_book: Add Turn Editing On to page body 2016-09-05 13:08:24 +08:00
John Okely
d51757a729 MDL-55457 mod_lti: Support object icon_info in tool proxy 2016-09-02 09:39:31 +08:00
Tim Hunt
6ae04c2684 MDL-42125 quiz stats: fix regression caused by MDL-51603 2016-09-01 12:38:30 +01:00
Tim Hunt
9e5e0d8de4 MDL-42125 quiz stats: clearer message when manual grading required 2016-09-01 12:34:40 +01:00
John Okely
3b4491e8aa MDL-55742 mod_lti: Remove support for get_magic_quotes_gpc
Thanks to Bishop Bettini for the original patch.
2016-09-01 14:58:29 +08:00
Dan Marsden
5d453ff40e MDL-55820 scorm: use correct displayattempt default options 2016-09-01 13:19:35 +12:00
Tim Hunt
d0f8daef12 MDL-55815 quiz review: after close should beat immediately after
This only arises in specific situations: student submitted less than 2
mintues before time close, or when a teacher previews after the close
date. However, in those cases, the old behaviour was confusing. Now,
'After the quiz is closed' takes priority.
2016-08-31 12:55:21 +01:00
Tim Hunt
daf6becfb0 MDL-55815 quiz: convert attempt state tests to a data provider 2016-08-31 12:54:18 +01:00
Eloy Lafuente (stronk7)
4bdb1298c4 Merge branch 'MDL-55237_master' of git://github.com/dmonllao/moodle 2016-08-30 12:54:46 +02:00
sam marshall
3bf0482841 MDL-55724 Glossary: Prevent infinite loop in trusttext_strip 2016-08-30 10:25:38 +01:00
David Monllao
bb75b82e21 Merge branch 'MDL-54873-master' of git://github.com/andrewnicols/moodle 2016-08-30 12:52:38 +08:00
Andrew Nicols
5e171c6986 MDL-54873 assign: Seed recordid to print_recent_activity 2016-08-30 11:57:57 +08:00
Andrew Nicols
c06ce32d85 MDL-54873 assign: Add recordid fetching participants
get_submission_info_for_participants is primarily used by externallib.php
2016-08-30 11:46:21 +08:00
Andrew Nicols
cf29b1e08d MDL-54873 assign: Fetch mapping id for blind marking in cron 2016-08-30 11:46:20 +08:00
Andrew Nicols
4ed4be4988 MDL-54873 assign: Fetch mapping id for blind marking grading
This change modifies the grading table to pre-seed record ids where they
already exist.

Where they do not exist, they are still fetched.
2016-08-30 11:46:20 +08:00
David Monllao
8bee2d8df6 MDL-55237 core_component: Fix last namespace level matching
Thanks to Andreas Grabs for proposing a fix.
2016-08-30 11:15:27 +08:00
Eloy Lafuente (stronk7)
e6166d9bf7 Merge branch 'MDL-53634-master' of git://github.com/andrewnicols/moodle 2016-08-30 02:28:32 +02:00
David Monllao
a74218d464 Merge branch 'MDL-55661-master-enfix' of git://github.com/mudrd8mz/moodle 2016-08-29 14:40:03 +08:00
David Monllao
bc1ac4a89d Merge branch 'wip-MDL-55708-master' of git://github.com/marinaglancy/moodle 2016-08-29 11:18:58 +08:00
David Monllao
af1cacb586 Merge branch 'MDL-55477' of git://github.com/timhunt/moodle 2016-08-29 11:14:11 +08:00
David Monllao
80e31fdeaa Merge branch 'MDL-55668-master' of git://github.com/danpoltawski/moodle 2016-08-29 10:26:51 +08:00
Andrew Nicols
c42c23557e MDL-53634 forum: Switch digest selection to inplace_editable 2016-08-26 15:05:05 +08:00
Helen Foster
b61b927356 MDL-55661 lang: Merge English strings from the en_fix language pack 2016-08-25 14:38:07 +02:00
David Monllao
fa90f52986 MDL-55127 mod_data: Search entries fixes
- If the database contains has than 4 valid fields all fields from the 4th one
  to the last one will be merged into the 4th one so we index all entry contents
- get_content_value now receives the whole data_content record as fields may need
  other values than just the content to prepare the value
- phpunit database generator changes to separate checkboxes from radio buttons options
  and to separate multimenu options from menu options
2016-08-25 16:50:15 +08:00
Marina Glancy
92c9be1978 MDL-55708 mod_assign: display formatted acitvity names 2016-08-25 09:53:29 +08:00
Damyon Wiese
43b0df2601 MDL-55668 assign: Don't link to user profile if blind marking is enabled 2016-08-24 11:21:31 +01:00
David Monllao
70003837db MDL-55127 mod_data: Adding missing required classes 2016-08-24 13:57:44 +08:00
Andrew Nicols
f42288ea62 MDL-54113 assign: Open files in new window
Open files in a new window when viewing to ensure that the form change
checker does not warn about the page reloading.
2016-08-24 11:33:09 +08:00
Dan Poltawski
7c085e1a2d Merge branch 'wip-MDL-55127_master' of https://github.com/dg711/moodle 2016-08-23 11:12:46 +01:00
Andrew Nicols
f71df007d1 MDL-46654 mod_forum: Reduce complexity of closure 2016-08-23 16:17:07 +08:00
Dan Poltawski
3f92140fc8 Merge branch 'wip-mdl-46514' of https://github.com/rajeshtaneja/moodle 2016-08-23 08:59:24 +01:00
David Monllao
86d6ff2dc8 Merge branch 'MDL-46654-master' of git://github.com/andrewnicols/moodle 2016-08-23 15:30:54 +08:00
Dan Poltawski
0969f0da5b Merge branch 'MDL-48773_m32v1' of https://github.com/sbourget/moodle 2016-08-23 08:18:16 +01:00
Rajesh Taneja
bdcd90b2f3
MDL-46514 behat: section should be set before switch-case 2016-08-23 15:14:39 +08:00
David Monllao
bab59f1c08 Merge branch 'MDL-54838-master' of https://github.com/nashtechdev01/moodle 2016-08-23 12:42:52 +08:00
Dan Poltawski
4ac1bb2f34 Merge branch 'MDL-55605-lesson-restore-bug' of https://github.com/kenneth-hendricks/moodle 2016-08-22 14:13:26 +01:00
Dan Poltawski
293857b5eb Merge branch 'MDL-55557_m32v1' of https://github.com/sbourget/moodle 2016-08-22 12:45:18 +01:00
Dan Poltawski
6f9f149b04 MDL-44712 scorm: make upgrade match install.xml defintion 2016-08-22 12:40:03 +01:00
Andrew Nicols
8381ac52cd MDL-46654 mod_forum: Remove irrelevant digest/subscribe options
If the user cannot subscribe, there is no point showing the digest options.
2016-08-22 19:12:20 +08:00
Andrew Nicols
d6c05ad1f1 MDL-46654 mod_forum: Hide digestoptions when no subscription
Daily digest options should not be generated if the user cannot subscribe
to anything in the first place.
2016-08-22 19:06:06 +08:00
Dan Poltawski
ccee2dc2c5 MDL-44712 readme: fix trailing whitespace 2016-08-22 10:51:34 +01:00
Tim Hunt
12a725be10 MDL-55477 quiz reports: all user fields should have repeats suppressed 2016-08-19 18:04:51 +01:00
Devang Gaur
2af9ad7d30 MDL-55127 mod_data: added database entries to globalsearch 2016-08-19 13:58:19 +05:30
An Pham Van
d0207fdc06 MDL-54838 workshop: Differentiate labels for each comment field.
In a Workshop activity, comment fields on Assessment forms do not properly link to the corresponding Aspect.
So screen reader users may find it difficult to complete the Assessment forms.
There should be a hidden label text for each comment field.
2016-08-19 13:44:19 +07:00
Andrew Nicols
2e48384dea MDL-55632 mod_forum: Tidy up forum post messages 2016-08-19 09:38:57 +08:00
Kenneth Hendricks
504b65d2e5 MDL-55605 mod_lesson: Fix activitylinks restore bug 2016-08-18 16:35:34 +10:00