11910 Commits

Author SHA1 Message Date
Aparup Banerjee
dcfd468dff Merge branch 'MDL-31739_forum_docblock' of git://github.com/andyjdavis/moodle 2012-02-28 14:12:26 +08:00
Aparup Banerjee
0f0eca4299 Merge branch 'MDL-31399' of git://github.com/rwijaya/moodle 2012-02-28 12:04:47 +08:00
Eloy Lafuente (stronk7)
516b956a28 Merge branch 'MDL-29256-resource-format' of git://github.com/mudrd8mz/moodle 2012-02-27 18:53:03 +01:00
David Mudrak
a75af402af MDL-30982 Activity module stepslib - API documentation 2012-02-27 11:59:43 +01:00
David Mudrak
85aad2ef97 MDL-30982 Documenting some parts of backup settings machinery 2012-02-27 11:59:43 +01:00
David Mudrak
63baccbc54 MDL-30982 Improving phpDocs for the classes that extend backup_activity_task 2012-02-27 11:59:42 +01:00
Petr Skoda
e67bc2a410 MDL-30964 fix phpdocs in access.php files in all plugins 2012-02-27 07:23:10 +01:00
Marina Glancy
00ecac7295 MDL-31738: added functions mod_xxx_get_file_info() to glossary and data modules 2012-02-27 14:20:00 +08:00
Marina Glancy
292077063e MDL-23787 added possibility to embed images into textarea fields in database activity 2012-02-27 14:17:11 +08:00
Gerard (Gerry) Caulfield
8caba22968 MDL-30724 Limit assignment_count_real_submissions() to only select real
submissions

I've also refactored some code so that it is more structured and allows
for easier overriding of function associated with counting submissions
and updated associated doc blocks.
2012-02-27 12:24:48 +08:00
Sam Hemelryk
ef6cf871de MDl-30985 events: Fixed up phpdocs after review 2012-02-27 14:34:06 +13:00
Sam Hemelryk
1d1719f5dd MDL-30985 Fixed up event API phpdocs 2012-02-27 14:34:06 +13:00
Andrew Davis
8260050dbd MDL-31739 mod_forum: added phpdocs for forum_get_email_message_id() 2012-02-24 10:48:24 +07:00
Dan Poltawski
92b145dc81 MDL-31546 wiki: remove stray semicolon
causing errors on oracle

Thanks to Jonathon Fowler for the patch
2012-02-24 11:41:54 +08:00
Rossiani Wijaya
7b4495b3b3 MDL-31399 Lesson Module: Fixed horizontal scroll bar issue when using rtl language format (eg: arabic) 2012-02-23 15:34:57 +08:00
Eduardo Pinto
dd30ae41d0 MDL-26496 Lesson Module: removed warning when no answer is selected from single choice question 2012-02-23 14:10:18 +08:00
Sam Hemelryk
2caf3f9bee Merge branch 'MDL-30910' of git://github.com/rwijaya/moodle 2012-02-22 10:22:06 +13:00
David Mudrak
cb3ef22065 MDL-29256 Fixed incorrect calculation of contentformat
Legacy Resource modules of the type Web page force the HTML format for
their content. The format stored in the reference field is valid only
for legacy resources of the type Plain text page. See page_20_migrate()
function.
2012-02-21 11:19:57 +01:00
Rossiani Wijaya
af4de0a2c2 MDL-30910: Lesson Module: fix lesson progress bar for screen readers
AMOS BEGIN
   CPY [progresscompleted, mod_lesson]
AMOS END
2012-02-21 12:31:35 +08:00
Eloy Lafuente (stronk7)
c3ca963d81 Merge branch 'MDL-30698_multiple_emails' of git://github.com/andyjdavis/moodle 2012-02-21 01:43:53 +01:00
Sam Hemelryk
e6e4fe4f43 Merge branch 'MDL-29402-master' of https://github.com/mackensen/moodle 2012-02-21 10:44:00 +13:00
Sam Hemelryk
da3ec93275 Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict resolution 2012-02-21 10:33:00 +13:00
Eloy Lafuente (stronk7)
6ff5994b49 Merge branch 'MDL-19421-master-3' of git://git.luns.net.uk/moodle 2012-02-20 17:11:22 +01:00
Andrew Robert Nicols
ab48e73159 MDL-19421 Correct lesson dependency mapping on restore 2012-02-20 14:56:02 +00:00
Andrew Robert Nicols
bca2b1c157 MDL-31014 Allow for selection of a different displayformat when approving glossary entries 2012-02-20 12:28:52 +00:00
Eloy Lafuente (stronk7)
2a5fa9e64a Merge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle 2012-02-20 12:02:18 +01:00
Sam Hemelryk
6007f8d8d8 Merge branch 'master_MDL-31381' of git://github.com/danmarsden/moodle 2012-02-20 17:04:45 +13:00
Sam Hemelryk
52b2afa553 Merge branch 'm_MDL-30957_adding_assignment_completion_status_method_and_call' of git://github.com/gerrywastaken/moodle 2012-02-20 16:53:21 +13:00
Gerard (Gerry) Caulfield
ad2d5eba0b MDL-30957 Adding a new method "is_complete" to assignment lib for
testing if a submission has actually been submitted and then adding a
call to it before displaying the the assignment submission date header

As recommended I've simplified the functions and split the logic out into appropriate upload classes.
2012-02-20 11:34:38 +08:00
Sam Hemelryk
22fbfa3b2f Merge branch 'master_MDL-31397' of git://github.com/danmarsden/moodle 2012-02-20 16:03:19 +13:00
Sam Hemelryk
26fad611da Merge branch 'master_MDL-31652' of git://github.com/danmarsden/moodle 2012-02-20 15:57:12 +13:00
Sam Hemelryk
9405721002 Merge branch 'master_MDL-31659' of git://github.com/danmarsden/moodle 2012-02-20 15:49:41 +13:00
Sam Hemelryk
3cb4c1e594 Merge branch 'MDL-30965-master' of git://github.com/ankitagarwal/moodle 2012-02-20 15:46:46 +13:00
Sam Hemelryk
398f16fe0f MDL-31014 Integrated 2012-02-20 15:39:11 +13:00
Sam Hemelryk
284814724b Merge branch 'MDL-31014-master-3' of git://git.luns.net.uk/moodle 2012-02-20 15:38:32 +13:00
Sam Hemelryk
8f9c818604 Merge branch 'MDL-31589-master-2' of git://git.luns.net.uk/moodle 2012-02-20 15:17:39 +13:00
Sam Hemelryk
22bd2b93e5 Merge branch 'MDL-31556' of git://github.com/rwijaya/moodle 2012-02-20 12:39:12 +13:00
Sam Hemelryk
6dce4aa1ba Merge branch 'MDL-31647-master' of git://github.com/sammarshallou/moodle 2012-02-20 12:03:32 +13:00
Sam Hemelryk
9fdd4f7dc8 Merge branch 'wip-MDL-30971-master' of git://github.com/phalacee/moodle 2012-02-20 11:37:59 +13:00
sam marshall
f5f19eb70e MDL-31647 Glossary: Links to glossary entries from glossary main page should not be popups 2012-02-17 10:36:18 +00:00
Dan Marsden
1c6df63d5c SCORM MDL-31381 decrease max width of TOC to prevent SCORM content from being hidden, remove padding from pop-up and improve maxheight calculation 2012-02-17 17:14:12 +13:00
Ankit Agarwal
d6ae6816d0 MDL-30965 SCORM Removing unused variable ->head 2012-02-17 08:46:45 +05:30
Dan Marsden
6a3f2ad229 MDL-31659 SCORM remove old file and reference to it - it hasn't been used since the rework of SCORM player in MDL-22951 2012-02-17 15:29:36 +13:00
Dan Marsden
9e93f995dc SCORM MDL-31397 - add slashes to js string 2012-02-17 15:22:52 +13:00
Andrew Davis
e54816bcf8 MDL-30698 message: changed message ID to be a hash 2012-02-17 09:21:02 +07:00
Andrew Davis
1376b0ddf8 MDL-30698 forum: made message ID genuinely unique to prevent mail servers dropping emails the look like duplicates 2012-02-17 09:21:02 +07:00
Joseph Rezeau
608ba9fffb MDL-31556 Lesson Module: fixed missing 'lesson closes' event in calendar 2012-02-16 16:08:15 +08:00
Sam Hemelryk
889860576a Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle 2012-02-16 15:38:05 +13:00
Sam Hemelryk
1609f3cf7c Revert "MDL-30935_in_lti_change_role_from_instructor_to_teacher"
This reverts commit 0758f991b36bdccb429b08a05ccbafe1d7ad977d.
2012-02-16 15:37:57 +13:00
Gerard (Gerry) Caulfield
72ed614c74 MDL-30935_in_lti_change_role_from_instructor_to_teacher 2012-02-16 10:23:22 +08:00