moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 19:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80584 commits 37 branches 544 tags 1.3 GiB
Commit graph

80584 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
e4346dad32 Merge branch 'wip-mdl-55380' of https://github.com/rajeshtaneja/moodle 2016-08-15 11:38:34 +01:00
Dan Poltawski
2595cb58c9 Merge branch 'wip-MDL-55397-master' of git://github.com/marinaglancy/moodle 2016-08-15 11:35:35 +01:00
Dan Poltawski
5e17cd21aa Merge branch 'MDL-52105-master' of git://github.com/lameze/moodle 2016-08-15 11:13:27 +01:00
Dan Poltawski
21b6554e2a Merge branch 'MDL-55533_multiresponse_feedback' of git://github.com/davosmith/moodle 2016-08-15 11:09:51 +01:00
Dan Poltawski
623f92f9f7 Merge branch 'MDL-46214-master' of git://github.com/andrewnicols/moodle 2016-08-15 09:47:02 +01:00
Damyon Wiese
36ba9c3e76 MDL-54647 tests: Reverse order of expected and actual 2016-08-15 16:34:11 +08:00
Damyon Wiese
300852ee30 MDL-54647 file_storage: Redo the test pdf every time it's viewed 2016-08-15 16:32:21 +08:00
Andrew Nicols
40cc0ba04e Merge branch 'MDL-55513-master' of https://github.com/lucisgit/moodle 2016-08-15 14:07:41 +08:00
Devang Gaur
26c0d75f3e MDL-54973 message: added messages to globalsearch 2016-08-15 11:27:25 +05:30
Simey Lameze
6fdd61a073 MDL-52105 enrol_self: Behat test for key holder feature 2016-08-15 12:56:52 +08:00
Simey Lameze
33b6da5327 MDL-52105 enrol_self: Fix wrong holdkey cap restriction for manager 
This commit add an upgrade step to remove wrong CAP_PROHIBIT on enrol/self:holdkey for manager role.
Also remove the restriction from the self enrolment access file.
 2016-08-15 12:56:51 +08:00
Andrew Nicols
c470716854 Merge branch 'MDL-55229-master' of git://github.com/lameze/moodle 2016-08-15 12:18:19 +08:00
Andrew Nicols
098aad4f72 Merge branch 'MDL-55520-master' of git://github.com/damyon/moodle 2016-08-15 10:58:39 +08:00
Frederic Massart
0eb97bfa13
MDL-55445 files: Support for cacheability in send_file() 2016-08-15 10:54:29 +08:00
Frederic Massart
92b9ef9917
MDL-55445 gdlib: Support for resizing an image 2016-08-15 10:54:28 +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
Andrew Nicols
62192d93ea MDL-46214 event: Mark previously deprecated events as deprecated 2016-08-15 09:17:02 +08:00
Andrew Nicols
51d85c7c6c MDL-46214 event: Support deprecation of events 
This patch adds two new functions to the event base to allow deprecation of
the individual events, without entirely removing them from the UI.

This is different to our normal deprecation procedure because all events
must support display of historical data. It must also be possible to view
the event information in the event monitor.
 2016-08-15 09:17:02 +08:00
Stephen Bourget
6ffb8fa21a MDL-55557 mod_wiki: Add missing MOODLE_INTERNAL checks 2016-08-13 21:40:41 -04:00
Stephen Bourget
f12d9aa801 MDL-55551 Blog: Add missing MOODLE_INTERNAL check. 2016-08-12 20:16:04 -04:00
Marina Glancy
d29a07030e MDL-55494 report_eventlist: ignore only logstore_legacy 2016-08-12 13:55:38 +08:00
Marina Glancy
951f77006a MDL-55494 tool_monitor: ignore only tool_monitor and logstore_legacy 
previously any plugin type ending with _monitor or _legacy would be ignored
 2016-08-12 13:40:28 +08:00
Marina Glancy
3d91ad9946 MDL-50586 gradingform_rubric: warn about missing 0-points levels 2016-08-12 13:25:54 +08:00
Rajesh Taneja
39515ba566
MDL-55380 behat: Fixed shared stats definition 
Stats definition was being shared between
progress and moodle_progress format which
was causing double counting. Now they both
have there own stats counter definitions
 2016-08-12 10:17:00 +08:00
Stephen Bourget
dddadf5357 MDL-48773 mod_choice: Lock number of responses if selections are made. 2016-08-11 22:11:57 -04:00
Stephen Bourget
2ce8cf628f MDL-55239 Badges: Additional events for badges 2016-08-11 21:16:35 -04:00
Davo Smith
a7b72fb291 MDL-55533 qtype_multianswer: fix feedback for multiresponse 2016-08-11 14:13:58 +01: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
Damyon Wiese
c3d4d3f7c1 MDL-55520 forms: Mod grade is changing values back to default 
When a field is disabled in the page - no value is sent and modgrade is reverting
to the default. This change prevents the max grade from changing accidentally.
 2016-08-11 14:43:05 +08:00
Andrew Nicols
6f302b17b9 weekly release 3.2dev 2016-08-11 13:17:01 +08:00
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