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
6ffb8fa21a
MDL-55557 mod_wiki: Add missing MOODLE_INTERNAL checks
2016-08-13 21:40:41 -04:00
dddadf5357
MDL-48773 mod_choice: Lock number of responses if selections are made.
2016-08-11 22:11:57 -04:00
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
0b490a1091
Merge branch 'MDL-41126_master' of git://github.com/dg711/moodle
2016-08-10 12:25:45 +08:00
2ac7ea8670
MDL-41126 mod_data: optimised data entry generator
2016-08-10 07:58:12 +05:30
431a82bd8d
MDL-55333 mod_feedback: Correct constant name
2016-08-10 10:13:07 +08:00
82e025f7e3
Merge branch 'wip-MDL-55333-master' of git://github.com/marinaglancy/moodle
2016-08-10 10:01:05 +08:00
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
298dd2f074
Merge branch 'MDL-55464_m32v1' of https://github.com/sbourget/moodle
2016-08-09 14:20:31 +01:00
017230d576
Merge branch 'MDL-53765-master' of git://github.com/junpataleta/moodle
2016-08-09 13:56:49 +01:00
be8c6766fd
MDL-55196 mod_data: Refactor import to use update_content function
2016-08-09 09:57:27 +01:00
c728048846
Merge branch 'wip-MDL-52230-master' of git://github.com/abgreeve/moodle
2016-08-09 09:49:38 +01:00
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
372dd3711e
Merge branch 'MDL-55225-master' of git://github.com/dpalou/moodle
2016-08-09 09:21:07 +01:00
05a9c36edc
Merge branch 'MDL-54862-master' of git://github.com/dpalou/moodle
2016-08-09 08:06:35 +01:00
8173c3ef7f
Merge branch 'wip-mdl-55329' of https://github.com/rajeshtaneja/moodle
2016-08-09 14:26:09 +08:00
e259795c4f
MDL-55329 behat: PyStrings should end with : (colon)
2016-08-09 14:22:21 +08:00
19491e68fe
MDL-41126 mod_data: Add type hinting
2016-08-09 12:49:01 +08:00
d5bd76f4e5
MDL-41126 mod_data: Styling fixes
2016-08-09 12:49:01 +08:00
20195fb46a
Merge branch 'wip-mdl-41126' of https://github.com/rajeshtaneja/moodle
2016-08-09 12:47:35 +08:00
d3932d2b51
MDL-53765 core: Deprecate update_module_button functions
...
First stage deprecation for the functions update_module_button and
core_renderer::update_module_button().
2016-08-09 11:17:43 +08:00
9f2b916dee
MDL_41126 phpunit: Timestamp should be less than 2038
...
http://php.net/manual/en/datetime.gettimestamp.php#114590
In 32-bit system the unix timestamp will overflow if the date goes beyond year 2038
and this method will return false.
2016-08-09 10:50:07 +08:00
675345475d
MDL-55274 mod_chat: Add unit tests for special commands
2016-08-09 10:44:08 +08:00
6a853f7521
MDL-53765 mod_resource/mod_wiki: Removed update_module_button()
2016-08-09 10:00:54 +08:00
fe88f065b7
Merge branch 'MDL-55274-master' of git://github.com/lameze/moodle
2016-08-09 09:05:09 +08:00
49924b335e
Merge branch 'MDL-55398_m32v1' of https://github.com/sbourget/moodle
2016-08-08 10:40:42 +01:00
e96c826c3d
MDL-55333 mod_feedback: work around MySQL tables in join limit
2016-08-08 14:40:27 +08:00
8676e7c3e0
MDL-18592 mod_choice: Allow teachers to make choice for students
...
Capability to delete reponses becomes capability to delete or modify
responses.
This also resolves MDL-51659 (incorrect events answer_submitted and
answer_updated) by deprecating them and replacing with the answer_created
2016-08-08 14:16:57 +08:00
6ab25fa0b2
Merge branch 'MDL-41126' of git://github.com/dg711/moodle
2016-08-08 13:24:25 +08:00
376be6ae86
MDL-55274 mod_chat: regain beep and / command in mod_chat.
...
format_text cannot be called on the whole input text, but must be
called on user-supplied text that will be output into chats. This
means it cannot simply be called in one place, but must instead be
called on the relevant parts of text once commands have been matched.
2016-08-08 12:30:33 +08:00
e6ab38f3ca
Merge branch 'MDL-55454' of git://github.com/timhunt/moodle
2016-08-08 10:00:30 +08:00
9f03fc3119
MDL-55464 mod_label: Add view permissions
2016-08-04 21:27:02 -04:00
400eb2d0e5
MDL-41126 mod_data: added field and entry generator
2016-08-05 04:08:50 +05:30
99ad3223a5
MDL-54656 behat: Skip test if db family is not mysql or postgres
2016-08-04 08:46:04 +08:00
0e9132e56e
MDL-55454 quiz: loses shufflequestion setting restoring old backups
2016-08-03 18:42:51 +01:00
1a354b81b6
MDL-54941 glossary: Correct variable naming for entry files
2016-08-03 14:33:53 +08:00
472ac2d390
MDL-55355 mod_feedback: Change show chart data step to avoid errors
2016-08-03 10:22:58 +08:00
bc7817edab
Merge branch 'MDL-54656_m32v3' of https://github.com/sbourget/moodle
2016-08-03 00:50:19 +02:00
8c7840df32
Merge branch 'MDL-54941-master' of git://github.com/jleyva/moodle
2016-08-03 00:29:45 +02:00
dffeff0a4b
Merge branch 'MDL-55322-master' of https://github.com/snake/moodle
2016-08-03 00:12:10 +02:00
5fe1db394b
Merge branch 'MDL-54745_master' of https://github.com/snake/moodle
2016-08-02 23:13:25 +02:00
e0519d032d
Merge branch 'MDL-55314-master' of https://github.com/mrmark/moodle
2016-08-02 17:16:07 +02:00
8a78cb42da
Merge branch 'MDL-55315-master' of https://github.com/mrmark/moodle
2016-08-02 17:07:16 +02:00
03961256d1
Merge branch 'MDL-55348-master' of git://github.com/dpalou/moodle
2016-08-02 16:48:26 +02:00
30452f23cb
MDL-55352 mod_feedback: Change series labels on multi choice rated
2016-08-02 09:23:18 +08:00
b34d7e700b
Merge branch 'MDL-54879-master' of git://github.com/junpataleta/moodle
2016-08-02 09:10:19 +08:00
952c6e2697
MDL-55398 mod_feedback: prevent direct script access to lib files.
2016-08-01 20:53:46 -04:00
8f33657dae
Merge branch 'MDL-55140_m32v2' of https://github.com/sbourget/moodle
2016-08-02 08:48:36 +08:00
6349765c44
Merge branch 'MDL-55360-master-workshopgradepass' of git://github.com/mudrd8mz/moodle
2016-08-01 18:57:00 +01:00
Adrian Greeve