Andrew Nicols
e8bfc39d07
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2016-08-11 13:16:58 +08:00
Tony Butler
2ee668ec56
MDL-55513 core_filestorage: Touch and test size instead of file_exists()
...
file_exists() can return false when file exists (in certain scenarios)
2016-08-10 09:35:23 +01:00
Tony Butler
e98483d748
MDL-55513 core_filestorage: Pass full path of temp dir to remove_dir()
2016-08-10 09:35:23 +01: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
Simey Lameze
6b7a8e6682
MDL-55229 course: Handle invisible course categories
2016-08-10 09:54:17 +08:00
Andrew Nicols
c3efb495fd
Merge branch 'wip-mdl-52230' of https://github.com/rajeshtaneja/moodle
2016-08-10 09:53:24 +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
AMOS bot
8400590f9a
Automatically generated installer lang files
2016-08-10 00:04:38 +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
Dan Poltawski
f616fc1b50
Merge branch 'wip-MDL-55425-master' of git://github.com/marinaglancy/moodle
2016-08-09 10:58:40 +01:00
Dan Poltawski
a9dbd914a0
Merge branch 'MDL-55246_unoconv' of https://github.com/Syxton/moodle
2016-08-09 10:11:13 +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
Dan Poltawski
6259952eb2
Merge branch 'MDL-54606' of https://github.com/mr-russ/moodle
2016-08-09 09:32:46 +01:00
Dan Poltawski
8eb15b447a
Merge branch 'MDL-55390_master-fix' of git://github.com/dmonllao/moodle
2016-08-09 09:29:49 +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
4aa5e355e6
MDL-51078 report_log: use simpler/faster str_split over preg_split
2016-08-09 09:04:31 +01:00
Dan Poltawski
4d31fc8444
Merge branch 'MDL-51078_m32v3' of https://github.com/sbourget/moodle
2016-08-09 08:57:09 +01:00
David Monllao
f3d38863fe
MDL-55390 search: is_search_area unit tests
...
Added extra checking for search manager get_search_area.
2016-08-09 15:51:30 +08: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
5fa90114d7
MDL-55329 behat: Correct typo
2016-08-09 14:41:22 +08: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
f1c6194f3d
Merge branch 'MDL-55480-master' of git://github.com/FMCorz/moodle
2016-08-09 13:50:55 +08:00
Andrew Nicols
46c31069f3
MDL-55390 core_search: Correct variable name
2016-08-09 13:44:10 +08:00
Andrew Nicols
aaf8d55a27
Merge branch 'MDL-55390' of https://github.com/dg711/moodle
2016-08-09 13:42:32 +08:00
Andrew Nicols
6c19db54f9
Merge branch 'MDL-53572-master' of git://github.com/danpoltawski/moodle
2016-08-09 12:52:13 +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
Andrew Nicols
95a556c50a
Merge branch 'MDL-55465-master' of git://github.com/danpoltawski/moodle
2016-08-09 12:31:46 +08:00
Andrew Nicols
a5aa1b6b00
Merge branch 'MDL-53016-master' of https://github.com/xow/moodle
2016-08-09 11:41:09 +08:00
Jun Pataleta
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
Rajesh Taneja
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
Andrew Nicols
675345475d
MDL-55274 mod_chat: Add unit tests for special commands
2016-08-09 10:44:08 +08:00
Rex Lorenzo
6a853f7521
MDL-53765 mod_resource/mod_wiki: Removed update_module_button()
2016-08-09 10:00:54 +08:00
Andrew Nicols
fe88f065b7
Merge branch 'MDL-55274-master' of git://github.com/lameze/moodle
2016-08-09 09:05:09 +08:00
Dan Poltawski
763c5b0eb4
Merge branch 'MDL-48856' of https://github.com/mr-russ/moodle
2016-08-08 14:45:06 +01:00
Dan Poltawski
741bd4dfb7
Merge branch 'MDL-55061' of https://github.com/zanekarl17/moodle
2016-08-08 14:33:08 +01:00
Dan Poltawski
49924b335e
Merge branch 'MDL-55398_m32v1' of https://github.com/sbourget/moodle
2016-08-08 10:40:42 +01:00
Dan Poltawski
0c4ccf73d9
Merge branch 'wip-MDL-55418-master' of https://github.com/marinaglancy/moodle
2016-08-08 10:33:46 +01:00
Dan Poltawski
1194324e80
Merge branch 'MDL-55453-master' of https://github.com/mrmark/moodle
2016-08-08 09:53:22 +01:00
Andrew Nicols
27a94d591d
Merge branch 'MDL-55292' of https://github.com/mr-russ/moodle
2016-08-08 15:25:45 +08:00
Marina Glancy
e96c826c3d
MDL-55333 mod_feedback: work around MySQL tables in join limit
2016-08-08 14:40:27 +08:00
Marina Glancy
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