moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66385 commits 37 branches 544 tags 1.3 GiB
Commit graph

14985 commits

Author SHA1 Message Date
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
Ankit Agarwal
a0c779c198 MDL-42604 scorm: Fix division by zero warnings in error logs 2013-10-30 10:47:53 +08:00
Tim Hunt
d7db097db1 MDL-42598 quiz variant randomisation not random enough. 
A student would get the same question variants (for example for a
calculated question) on their first attempt at both copies of a
duplicated quiz.
 2013-10-29 16:19:24 +00:00
Damyon Wiese
d79d1bd8fa MDL-42351 EditPDF: Fix jiggling of relatively positioned elements 
When calling setX/setY with YUI - YUI takes into account the position style
of the element. If none is set it assumes position relative. Position relative
is bad because relatively positioned elements still take up space in the page,
and all the elements after that node are positioned, taking into account the size
of that node. So when a node is resized or deleted, all nodes after that one in
the list of drawables are affected.

The magic fix - is just to set position: absolute on the drawables before calling setX/setY.
 2013-10-29 22:18:19 +08:00
Mark Nelson
2072af6c1d MDL-42592 mod_chat: passed additional name fields to be used by the fullname function 2013-10-29 16:41:46 +08:00
Rajesh Taneja
aa13929988 MDL-42584 Events: modified get_description in events 
blog_entry_created - Removed summary field
blog_entry_deleted - Removed summary field and unwanted entry record
blog_entry_updated - Fixed single quotes and removed summary field
course_module_created - Removed subject
course_module_updated - Removed subject
user_deleted - Removed user firstname and last name
course_module_viewed - Fixed description
 2013-10-29 15:24:23 +08:00
Dan Poltawski
6cd49ef747 Merge branch 'wip-MDL-42463-master' of git://github.com/marinaglancy/moodle 2013-10-29 14:54:44 +08:00
Dan Poltawski
c426631850 Merge branch 'MDL-42401-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-10-29 14:43:02 +08:00
Michael de Raadt
9f3da4079a MDL-41092 assign: Fix duplicate key error in assign cron 2013-10-29 14:38:48 +08:00
John Beedell
614bf85a9e MDL-41473 book: Book html zip import, incorrect url produced for internal linking to other chapters 2013-10-29 14:31:01 +08:00
Marina Glancy
e58a30f9e8 MDL-42577 mod_url: add redirection delay with edit link 
only for teachers and in the course format that does not have course view page (Single activity)
 2013-10-29 16:08:01 +11:00
Jerome Mouneyrac
b9e946f827 MDL-42356 Edit PDF: When no stamps uploaded toolbar looks strange 2013-10-29 11:41:43 +08:00
Ankit Agarwal
fb6ce191a6 MDL-42287 behat: Add an autoamted test to test MDLQA-82 2013-10-29 10:38:35 +08:00
Marina Glancy
55607effe1 MDL-42463 chat: do not set property of cm_info class 
MDL-41192 made all properties of class cm_info read-only
 2013-10-29 10:27:39 +11:00
Dan Poltawski
b1a6c9dc52 Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	login/change_password.php
 2013-10-28 15:37:05 +08:00
Marina Glancy
5ea6d66e9f Merge branch 'MDL-42028-master-4' of git://github.com/mouneyrac/moodle 2013-10-28 16:56:45 +11:00
Jerome Mouneyrac
aa3e4bdec7 MDL-42028 EditPDF: replace the loading icon by a progress bar 2013-10-28 13:48:22 +08:00
Dan Poltawski
f76bd72234 Merge branch 'MDL-38419' of https://github.com/moodlerooms/moodle 2013-10-28 12:33:39 +08:00
Mark Nelson
5311f38215 MDL-35146 mod_wiki: fixed variable typo and altered code to conform to Moodle guidelines 2013-10-28 12:28:03 +08:00
Anton Fletcher
19b2d3fa9c MDL-35146 mod_wiki: fixed issue where pages for deleted groups caused an error on restore 2013-10-28 12:28:03 +08:00
Prateek Sachan
3266d14bbe MDL-38850: Fixed Horizontal bar issue in lesson 2013-10-28 11:03:17 +08:00
Dan Poltawski
92fbc0de26 Merge branch 'MDL-42534-master-int' of git://github.com/FMCorz/moodle 2013-10-28 10:51:44 +08:00
Adrian Greeve
222e0a0045 MDL-42379 behat: Automated test for approving and disapproving glossary entries. 
Automate MDLQA-34 - A teacher can set that glossary entries require approval before being viewable be everyone.
 2013-10-28 09:29:37 +08:00
Marina Glancy
3bbbb3c902 MDL-42400 mod_workshop: data generator for workshop 2013-10-26 14:00:27 +11:00
Marina Glancy
20dff4b97e MDL-42400 mod_wiki: data generator for wiki 2013-10-26 14:00:27 +11:00
Marina Glancy
7b22ba41b7 MDL-42400 mod_url: data generator for url 2013-10-26 14:00:26 +11:00
Marina Glancy
e426f55059 MDL-42400 mod_survey: data generator for survey 2013-10-26 14:00:26 +11:00