Commit graph

18277 commits

Author SHA1 Message Date
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
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
David Monllao
70003837db MDL-55127 mod_data: Adding missing required classes 2016-08-24 13:57:44 +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
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
Kenneth Hendricks
504b65d2e5 MDL-55605 mod_lesson: Fix activitylinks restore bug 2016-08-18 16:35:34 +10:00
Dan Marsden
b30a884bfa MDL-44712 SCORM: Improve multi-sco activity completion. 2016-08-18 10:14:40 +12:00
Dan Poltawski
5fb09e48ce Merge branch 'MDL-55130-master' of git://github.com/crazyserver/moodle 2016-08-16 12:48:00 +01:00
Marina Glancy
f32a984db7 MDL-18592 mod_choice: deprecate incorrect events 2016-08-16 10:43:54 +08:00
Dan Poltawski
c6970e9c16 Merge branch 'MDL-18592-master' of git://github.com/marinaglancy/moodle 2016-08-15 14:27:34 +01:00
Pau Ferrer Ocaña
c13c21b9b5 MDL-55130 wiki: Reduce data usage when only renew lock is needed. 2016-08-15 14:40:38 +02:00
Dan Poltawski
16d7b6b133 Merge branch 'MDL-55196_master' of https://github.com/andrewhancox/moodle 2016-08-15 12:00:47 +01:00
Dan Poltawski
338fd5dd57 Merge branch 'wip-MDL-55366-master' of git://github.com/abgreeve/moodle 2016-08-15 11:44:09 +01:00
Andrew Nicols
098aad4f72 Merge branch 'MDL-55520-master' of git://github.com/damyon/moodle 2016-08-15 10:58:39 +08:00
Adrian Greeve
bd576de814 MDL-55366 mod_lesson: Fix warning with TF page.
Having an image in the answer text would create a warning.
2016-08-15 10:17:41 +08:00
Stephen Bourget
6ffb8fa21a MDL-55557 mod_wiki: Add missing MOODLE_INTERNAL checks 2016-08-13 21:40:41 -04:00
Stephen Bourget
dddadf5357 MDL-48773 mod_choice: Lock number of responses if selections are made. 2016-08-11 22:11:57 -04:00
Damyon Wiese
a95014f5b4 MDL-55520 assign: Behat test for rescaling max grades bug
Verify the max grade is not silently changed back to 100 when you visit
and save the assignment settings form.
2016-08-11 15:13:31 +08:00
Andrew Nicols
0b490a1091 Merge branch 'MDL-41126_master' of git://github.com/dg711/moodle 2016-08-10 12:25:45 +08:00
Devang Gaur
2ac7ea8670 MDL-41126 mod_data: optimised data entry generator 2016-08-10 07:58:12 +05:30
Andrew Nicols
431a82bd8d MDL-55333 mod_feedback: Correct constant name 2016-08-10 10:13:07 +08:00
Andrew Nicols
82e025f7e3 Merge branch 'wip-MDL-55333-master' of git://github.com/marinaglancy/moodle 2016-08-10 10:01:05 +08:00
Rajesh Taneja
b68de8cfe7
MDL-52230 mod_data: Fixed fieldname key for number field
AMOS BEGIN
 MOV [namedate, mod_data],[fieldtypelabel, datafield_date]
 MOV [namefile, mod_data],[fieldtypelabel, datafield_file]
 MOV [namecheckbox, mod_data],[fieldtypelabel, datafield_checkbox]
 MOV [namelatlong, mod_data],[fieldtypelabel, datafield_latlong]
 MOV [namemenu, mod_data],[fieldtypelabel, datafield_menu]
 MOV [namemultimenu, mod_data],[fieldtypelabel, datafield_multimenu]
 MOV [namenumber, mod_data],[fieldtypelabel, datafield_number]
 MOV [namepicture, mod_data],[fieldtypelabel, datafield_picture]
 MOV [nameradiobutton, mod_data],[fieldtypelabel, datafield_radiobutton]
 MOV [nametext, mod_data],[fieldtypelabel, datafield_text]
 MOV [nametextarea, mod_data],[fieldtypelabel, datafield_textarea]
 MOV [nameurl, mod_data],[fieldtypelabel, datafield_url]
AMOS END
2016-08-10 09:50:21 +08:00
Dan Poltawski
298dd2f074 Merge branch 'MDL-55464_m32v1' of https://github.com/sbourget/moodle 2016-08-09 14:20:31 +01:00
Dan Poltawski
017230d576 Merge branch 'MDL-53765-master' of git://github.com/junpataleta/moodle 2016-08-09 13:56:49 +01:00
Andrew Hancox
be8c6766fd MDL-55196 mod_data: Refactor import to use update_content function 2016-08-09 09:57:27 +01:00
Dan Poltawski
c728048846 Merge branch 'wip-MDL-52230-master' of git://github.com/abgreeve/moodle 2016-08-09 09:49:38 +01:00
Andrew Hancox
421b2d44fe MDL-52230 mod_data: Take fieldname from field:name()
AMOS BEGIN
 CPY [namedate, mod_data],[fieldtypelable, datafield_date]
 CPY [namefile, mod_data],[fieldtypelable, datafield_file]
 CPY [namecheckbox, mod_data],[fieldtypelable, datafield_checkbox]
 CPY [namelatlong, mod_data],[fieldtypelable, datafield_latlong]
 CPY [namemenu, mod_data],[fieldtypelable, datafield_menu]
 CPY [namemultimenu, mod_data],[fieldtypelable, datafield_multimenu]
 CPY [namenumber, mod_data],[fieldtypelable, datafield_number]
 CPY [namepicture, mod_data],[fieldtypelable, datafield_picture]
 CPY [nameradiobutton, mod_data],[fieldtypelable, datafield_radiobutton]
 CPY [nametext, mod_data],[fieldtypelable, datafield_text]
 CPY [nametextarea, mod_data],[fieldtypelable, datafield_textarea]
 CPY [nameurl, mod_data],[fieldtypelable, datafield_url]
AMOS END
2016-08-09 16:22:00 +08:00
Dan Poltawski
372dd3711e Merge branch 'MDL-55225-master' of git://github.com/dpalou/moodle 2016-08-09 09:21:07 +01:00
Dan Poltawski
05a9c36edc Merge branch 'MDL-54862-master' of git://github.com/dpalou/moodle 2016-08-09 08:06:35 +01:00
Andrew Nicols
8173c3ef7f Merge branch 'wip-mdl-55329' of https://github.com/rajeshtaneja/moodle 2016-08-09 14:26:09 +08:00
Rajesh Taneja
e259795c4f
MDL-55329 behat: PyStrings should end with : (colon) 2016-08-09 14:22:21 +08:00
Andrew Nicols
19491e68fe MDL-41126 mod_data: Add type hinting 2016-08-09 12:49:01 +08:00
Andrew Nicols
d5bd76f4e5 MDL-41126 mod_data: Styling fixes 2016-08-09 12:49:01 +08:00
Andrew Nicols
20195fb46a Merge branch 'wip-mdl-41126' of https://github.com/rajeshtaneja/moodle 2016-08-09 12:47:35 +08:00