Commit graph

15163 commits

Author SHA1 Message Date
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
Marina Glancy
78135fd2ec MDL-42400 mod_lesson: data generator for lesson 2013-10-26 14:00:25 +11:00
Marina Glancy
659b15ea5b MDL-42400 mod_glossary: data generator for glossary 2013-10-26 14:00:25 +11:00
Marina Glancy
b6affde2cb MDL-42400 generator: Add function testing_module_generator::create_content()
also implement it for mod_book and mod_forum to call existing create_page, create_discussion/post functions
2013-10-26 14:00:24 +11:00
Marina Glancy
7fbe33fcf1 MDL-42400 generator: module generators call add_moduleinfo instead of direct inserts 2013-10-26 14:00:23 +11:00
Tim Hunt
6c7e553fc4 MDL-42548 quiz review: don't show grade for non-finished attempts.
Now we show the attempt state separately, so there is no need to show
Grade: Attempt still in progress - especially since we were showing that
for abandoned and overdue attempts which is just wrong.
2013-10-25 20:08:17 +01:00
Dan Poltawski
b2d08cad46 Merge branch 'MDL-42220-master' of git://github.com/ankitagarwal/moodle 2013-10-25 12:42:38 +08:00
Dan Poltawski
cf49c1b642 Merge branch 'MDL-42219-master' of git://github.com/ankitagarwal/moodle 2013-10-25 12:39:37 +08:00
Frederic Massart
268bd2fe77 MDL-42534 mod_forum: Fix issue because cm_info is read only 2013-10-25 11:34:10 +08:00
Dan Poltawski
3f9a9e86b3 Merge branch 'MDL-42338' of git://github.com/rwijaya/moodle 2013-10-24 16:28:46 +08:00
Damyon Wiese
6d87dcebe2 MDL-42401 EditPDF: Allow dragging the edit pdf window.
Also move the location of the call the centerDialogue so it fires after the drawing region is
added to the window.
2013-10-24 13:50:58 +08:00
Damyon Wiese
298a7ee386 MDL-42402 EditPDF: CSS Improvements for editing toolbar.
The main change here is to prevent the default rendering of a select list for the page
selector, so that it looks more consistent with the rest of the toolbar on different
browsers/os combinations.

This is done with some vendor specific css rules targeting webkit, mozilla and ie.

There are also some minor tweaks to vertically align the images in the buttons and reduce the padding
above and below the toolbar.
2013-10-24 13:22:39 +08:00
rwijaya
45535d95b3 MDL-42338 lti_mod: convert hardcoded string. 2013-10-24 10:30:02 +08:00
Dan Poltawski
459dbd4362 Merge branch 'MDL-42030-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-10-24 10:19:47 +08:00
David Mudrák
e01d4a2236 MDL-42494 Fix workshop coding exception if all assessments have zero weight
If all assessments for the given submission have zero weight, the grading
evaluation plugin "Comparison with the best assessment" is unable to decide on
the average assessment as it ignores those with zero weight. In such rare case,
it makes sense to set the grading grade to null and prevent the coding
exception.
2013-10-23 11:45:18 +02:00
Dan Poltawski
0f136c1a5b Merge branch 'MDL-42290-master' of git://github.com/ankitagarwal/moodle 2013-10-23 14:36:07 +08:00
Ankit Agarwal
b2b50d92f6 MDL-42219 quiz: Fix alternate name warnings in quiz
Fix the alternate name warning which is generated when submitting an attempt for a quiz
2013-10-23 14:36:00 +08:00
Ankit Agarwal
b469c5e750 MDL-42220 quiz: Fix name fields warning in quiz
Fix warnings generated when manually grading a quiz attempts
2013-10-23 14:21:15 +08:00
Damyon Wiese
19becd541a Merge branch 'MDL-42210_master' of git://github.com/grabs/moodle 2013-10-23 14:06:04 +08:00
rwijaya
5639454509 MDL-41251 forum_mod: add aria label and role to forum discussion page for accessibility purpose.
Thanks to Nate Baxley for creating the original patch.
2013-10-23 12:43:35 +08:00
Dan Poltawski
de3d8fda10 Merge branch 'MDL-40531' of https://github.com/stronk7/moodle 2013-10-23 12:37:45 +08:00
Davo Smith
60b8708076 MDL-42355 assignfeedback_editpdf - do not start a new comment immediately when deselecting the old comment 2013-10-22 18:46:45 +01:00
Davo Smith
6e67d80d50 MDL-42482 assignfeedback_editpdf - prevent blank comments from disappearing when the menu is opened 2013-10-22 18:26:44 +01:00