mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-10 18:59:55 +01:00
Code Issues Projects Releases Wiki Activity
64,878 Commits 36 Branches 523 Tags
Commit Graph

14610 Commits

Author SHA1 Message Date
Damyon Wiese
057a79922e Merge branch 'MDL-42701' of git://github.com/stronk7/moodle 2013-11-05 13:10:52 +08:00
Damyon Wiese
6655b6102a MDL-42402 EditPDF: Fix the styles again 
More fixes for the vertical alignment of the images in the toolbar buttons and the dropdowns.
 2013-11-05 10:30:11 +08:00
Andrew Nicols
4816e19a6f MDL-42464 mod_chat: Correct use of amp; in session link 2013-11-05 09:50:33 +08:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Dan Poltawski
5e70fc1f9c Merge branch 'MDL-42548' of git://github.com/timhunt/moodle 2013-11-04 22:34:27 +08:00
Dan Poltawski
efe938fca5 Merge branch 'MDL-42464-master' of git://github.com/andrewnicols/moodle 2013-11-04 22:31:55 +08:00
Dan Poltawski
4a17894ac5 Merge branch 'MDL-42592_master' of https://github.com/markn86/moodle 2013-11-04 22:27:49 +08:00
Dan Poltawski
6db9f41419 Merge branch 'MDL-42355_editpdf_deselect_comment' of git://github.com/davosmith/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-04 20:10:24 +08:00
Dan Poltawski
22379484fd Merge branch 'wip-mdl-41849' of https://github.com/rajeshtaneja/moodle 2013-11-04 19:35:01 +08:00
Dan Poltawski
81da82f5f3 Merge branch '42350-26' of git://github.com/samhemelryk/moodle 2013-11-04 17:21:29 +08:00
Rajesh Taneja
5540b2caf3 MDL-41849 Quiz: Quiz send mail from noreply user 
Mails should be send by noreply user and not admin user
 2013-11-04 16:29:55 +08:00
Marina Glancy
8be0ca758c Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle 2013-11-04 19:16:23 +11:00
Ankit Agarwal
e5eff0b626 MDL-42287 behat: Use string from scorm content, instead of scorm structure 2013-11-04 15:52:42 +08:00
Damyon Wiese
2bd27878db MDL-42350 assign: Test group submission + drafts 2013-11-04 15:50:26 +08:00
Sam Hemelryk
7a47babb9e MDL-42350 mod_assign: fixed display of submission button 2013-11-04 15:50:25 +08:00
Dan Poltawski
b763a03ddb Merge branch 'MDL-42494-workshop-exception' of git://github.com/mudrd8mz/moodle 2013-11-04 14:51:16 +08:00
Marina Glancy
23f13c5304 Merge branch 'MDL-42429_master' of https://github.com/markn86/moodle 2013-11-04 17:27:57 +11:00
Sam Hemelryk
8e23283cbb Merge branch 'wip-MDL-42577-master' of git://github.com/marinaglancy/moodle 2013-11-04 14:24:46 +08:00
Marina Glancy
197ab6efef Merge branch 'MDL-42566_master' of https://github.com/markn86/moodle 2013-11-04 17:22:45 +11:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Marina Glancy
78d877d40b Merge branch 'MDL-42402-master' of git://github.com/damyon/moodle 2013-11-04 15:53:22 +11:00
Marina Glancy
feb09881fb Merge branch 'MDL-38664' of git://github.com/rwijaya/moodle 2013-11-04 15:13:42 +11:00
Damyon Wiese
42fb49ae0b Merge branch 'MDL-35146_master' of https://github.com/markn86/moodle 2013-11-04 11:53:40 +08:00
Tim Hunt
78a492330d MDL-41820 XSS in the quiz responses report. 
Thanks to Michael Hess for finding this bug and reporting it to us.
 2013-11-04 11:12:42 +08:00
Damyon Wiese
f859f6b4e6 Merge branch 'MDL-42521_master' of git://github.com/grabs/moodle 2013-11-04 10:56:12 +08:00
Damyon Wiese
0d0b93ce2f Merge branch 'MDL-42663_master' of git://github.com/dmonllao/moodle 2013-11-04 10:49:06 +08:00
Damyon Wiese
23cd687d72 Merge branch 'MDL-38850' of git://github.com/rwijaya/moodle 2013-11-04 09:38:38 +08:00
Andreas Grabs
73bbdce8c6 MDL-42521 mod_feedback - Feedback does not show line graphs in Clean theme 2013-11-03 19:11:27 +01:00
Damyon Wiese
e0c14e5018 Merge branch 'w45_MDL-42387_m26_filelifetime' of https://github.com/skodak/moodle 2013-11-02 22:24:19 +08:00
Petr Škoda
0c431257e9 MDL-42387 standardise file lifetime handling 2013-11-01 10:42:18 +01:00
Dan Poltawski
54173d4180 Merge branch 'MDL-42287-master' of git://github.com/ankitagarwal/moodle 2013-11-01 17:31:17 +08:00
David Monllao
92bfad6b1b MDL-42663 mod_lesson: Move definitions to show_clock() 
Seems that the required data is not always set
before timer.js is included.
 2013-11-01 16:37:45 +08:00
Mark Nelson
66dbecef8a MDL-42429 mod_lesson: removed unnecessary conditional check causing a PHP notice 2013-11-01 16:22:49 +08:00
Marina Glancy
1637827d75 Merge branch 'wip-mdl-42584' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/classes/event/user_deleted.php
 2013-11-01 13:04:29 +11:00
Marina Glancy
35e903971b Merge branch 'MDL-42565-master' of git://github.com/ankitagarwal/moodle 2013-11-01 12:42:17 +11:00
Marina Glancy
003a81ee11 Merge branch 'MDL-42356-master' of git://github.com/mouneyrac/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-01 12:16:20 +11:00
Marina Glancy
f5b2c9f4af Merge branch 'MDL-42351-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-01 09:00:03 +08:00
Marina Glancy
b53c155276 Merge branch 'wip-MDL-42599-master' of git://github.com/abgreeve/moodle 2013-11-01 08:57:38 +08:00
Dan Poltawski
d61d4c1bf6 Merge branch 'MDL-42482_editpdf_blank_comments' of git://github.com/davosmith/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-01 08:57:33 +08:00
Dan Poltawski
fc74cc8238 Merge branch 'MDL-42352_editpdf_scrolling' of git://github.com/davosmith/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-01 08:56:53 +08:00
Damyon Wiese
bb1a600046 Merge branch 'MDL-41092-master' of git://github.com/ankitagarwal/moodle 2013-11-01 08:55:28 +08:00
Damyon Wiese
4d2bd6735f MDL-41092 Assign: Expose SQL error in cron unit test 2013-11-01 08:55:28 +08:00
Sam Hemelryk
9620bcebee Merge branch 'wip-MDL-42379-master' of git://github.com/abgreeve/moodle 2013-11-01 08:55:26 +08:00
Damyon Wiese
3b4ace3ec8 Merge branch 'MDL-41251_c' of git://github.com/rwijaya/moodle 2013-11-01 08:55:24 +08:00
Damyon Wiese
6df3cf52c5 Merge branch 'MDL-42579_m26_2' of git://github.com/sbourget/moodle 2013-11-01 08:55:23 +08:00
Mark Nelson
af9fc21cfd MDL-42566 mod_data: introduced check to ensure the picture supplied is valid 2013-10-31 16:06:42 +08:00
Ankit Agarwal
fa3f7b972c MDL-42604 scorm: Minor coding style fixes 2013-10-31 14:29:15 +08:00
Ankit Agarwal
e24c2c1a73 MDL-42565 assign: Status of grading is not displayed anymore 2013-10-30 14:28:21 +08:00
Adrian Greeve
5450ed4347 MDL-42599 forum rss: Update the sql statements to return all user name fields. 2013-10-30 11:25:59 +08:00
Stephen Bourget
bd56062327 MDL-42579 Glossary: Fix debug notice from missing name fields. 2013-10-29 22:56:53 -04:00