moodle.git
9 years agoMerge branch 'MDL-31363_grade_constants' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 28 Feb 2012 11:37:44 +0000 (12:37 +0100)]
Merge branch 'MDL-31363_grade_constants' of git://github.com/andyjdavis/moodle

Conflicts:
lib/grade/constants.php

9 years agoMerge branch 'MDL-14837_show-time-on-no-duration-events' of https://github.com/ncsu...
Aparup Banerjee [Tue, 28 Feb 2012 08:40:44 +0000 (16:40 +0800)]
Merge branch 'MDL-14837_show-time-on-no-duration-events' of https://github.com/ncsu-delta/moodle

9 years agoMerge branch 'm_MDL-31419_fix_auth_typo' of git://github.com/gerrywastaken/moodle
Aparup Banerjee [Tue, 28 Feb 2012 08:22:19 +0000 (16:22 +0800)]
Merge branch 'm_MDL-31419_fix_auth_typo' of git://github.com/gerrywastaken/moodle

9 years agoMerge branch 'MDL-30878' of git://github.com/mouneyrac/moodle
Aparup Banerjee [Tue, 28 Feb 2012 07:35:45 +0000 (15:35 +0800)]
Merge branch 'MDL-30878' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-28386-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Tue, 28 Feb 2012 06:41:48 +0000 (14:41 +0800)]
Merge branch 'MDL-28386-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-31086 Calendar : fix sql to get distinct list of courses
Dan Marsden [Tue, 10 Jan 2012 00:57:44 +0000 (13:57 +1300)]
MDL-31086 Calendar : fix sql to get distinct list of courses

9 years agoMerge branch 'MDL-31335_mtrace_email' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 28 Feb 2012 06:15:28 +0000 (14:15 +0800)]
Merge branch 'MDL-31335_mtrace_email' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-31739_forum_docblock' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 28 Feb 2012 06:12:26 +0000 (14:12 +0800)]
Merge branch 'MDL-31739_forum_docblock' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'wip-mdl-22896' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 28 Feb 2012 05:48:34 +0000 (13:48 +0800)]
Merge branch 'wip-mdl-22896' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-31399' of git://github.com/rwijaya/moodle
Aparup Banerjee [Tue, 28 Feb 2012 04:04:47 +0000 (12:04 +0800)]
Merge branch 'MDL-31399' of git://github.com/rwijaya/moodle

9 years agoMDL-31419 Fixing "Suspended acount" typo in auth.php
Gerard (Gerry) Caulfield [Thu, 23 Feb 2012 07:28:19 +0000 (15:28 +0800)]
MDL-31419 Fixing "Suspended acount" typo in auth.php

9 years agoMerge branch 'MDL-27793' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Tue, 28 Feb 2012 02:29:33 +0000 (03:29 +0100)]
Merge branch 'MDL-27793' of git://github.com/nebgor/moodle

9 years agoMDL-29161 weblib: added one more test about un-keyed array params
Eloy Lafuente (stronk7) [Mon, 27 Feb 2012 21:20:34 +0000 (22:20 +0100)]
MDL-29161 weblib: added one more test about un-keyed array params

9 years agoMerge branch 'MDL-29161' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Feb 2012 21:10:47 +0000 (22:10 +0100)]
Merge branch 'MDL-29161' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-31721' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Feb 2012 21:05:56 +0000 (22:05 +0100)]
Merge branch 'MDL-31721' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-31729' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Feb 2012 18:01:34 +0000 (19:01 +0100)]
Merge branch 'MDL-31729' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-29256-resource-format' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 27 Feb 2012 17:53:03 +0000 (18:53 +0100)]
Merge branch 'MDL-29256-resource-format' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'MDL-29199-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 27 Feb 2012 17:47:12 +0000 (18:47 +0100)]
Merge branch 'MDL-29199-master' of git://github.com/danpoltawski/moodle

9 years agoMDL-29229 message: Set contactlist pull-down width to not exceed parent columns width
Adam Olley [Mon, 5 Sep 2011 00:04:11 +0000 (09:34 +0930)]
MDL-29229 message: Set contactlist pull-down width to not exceed parent columns width

9 years agoMerge branch 'MDL-29523-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 27 Feb 2012 15:51:44 +0000 (16:51 +0100)]
Merge branch 'MDL-29523-master' of git://github.com/danpoltawski/moodle

9 years agoMDL-29592 weblib: prevent warnings when $USER not set
Dan Poltawski [Sun, 26 Feb 2012 10:39:40 +0000 (18:39 +0800)]
MDL-29592 weblib: prevent warnings when $USER not set

9 years agoMDL-31348 calendar: event links not using user timezone
Dan Poltawski [Thu, 23 Feb 2012 06:55:30 +0000 (14:55 +0800)]
MDL-31348 calendar: event links not using user timezone

thanks to Ben Thomas for the patch

9 years agoMerge branch 'MDL-31546-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 27 Feb 2012 14:44:11 +0000 (15:44 +0100)]
Merge branch 'MDL-31546-master' of git://github.com/danpoltawski/moodle

9 years agoMDL-31651 course/info: Fix hardcoded string
Dan Poltawski [Thu, 23 Feb 2012 07:52:21 +0000 (15:52 +0800)]
MDL-31651 course/info: Fix hardcoded string

9 years agoMDL-29523 filemanager: Fix a hardcode string
Sun Zhigang [Mon, 26 Sep 2011 01:08:05 +0000 (09:08 +0800)]
MDL-29523 filemanager: Fix a hardcode string

9 years agoMDL-14837 Calendar: Display start time on calendar events with no duration
Glenn Ansley [Fri, 24 Feb 2012 13:58:31 +0000 (08:58 -0500)]
MDL-14837 Calendar: Display start time on calendar events with no duration

9 years agoMDL-29199 dml: fix query logging on Oracle
Dan Poltawski [Fri, 24 Feb 2012 03:54:43 +0000 (11:54 +0800)]
MDL-29199 dml: fix query logging on Oracle

thanks to Jonathon Fowler for the fix

9 years agoMDL-31739 mod_forum: added phpdocs for forum_get_email_message_id()
Andrew Davis [Fri, 24 Feb 2012 02:45:56 +0000 (09:45 +0700)]
MDL-31739 mod_forum: added phpdocs for forum_get_email_message_id()

9 years agoMDL-31546 wiki: remove stray semicolon
Dan Poltawski [Fri, 24 Feb 2012 03:39:56 +0000 (11:39 +0800)]
MDL-31546 wiki: remove stray semicolon

causing errors on oracle

Thanks to Jonathon Fowler for the patch

9 years agoMDL-22896 libraries: Updated regular expression in html2text, for replacing unknown...
Rajesh Taneja [Tue, 21 Feb 2012 08:31:20 +0000 (16:31 +0800)]
MDL-22896 libraries: Updated regular expression in html2text, for replacing unknown/unhandled entities

9 years agoMDL-27793 Themes : review changes - removed .dir-rtl from .loginbox selector rule...
Aparup Banerjee [Wed, 9 Nov 2011 06:38:14 +0000 (14:38 +0800)]
MDL-27793 Themes : review changes - removed .dir-rtl from .loginbox selector rule to be default css rule. made them same width too.

9 years agoMDL-27793 Themes : fixed "remember username" wrapping unnecessarily.
Aparup Banerjee [Thu, 29 Sep 2011 06:38:09 +0000 (14:38 +0800)]
MDL-27793 Themes : fixed "remember username" wrapping unnecessarily.

9 years agoMDL-27793 Themes : fixed base (and other themes) theme's loginbox
Aparup Banerjee [Fri, 23 Sep 2011 07:58:00 +0000 (15:58 +0800)]
MDL-27793 Themes : fixed base (and other themes) theme's loginbox
 - fixed translated lengthy terms were being clipped
 - fixed clipping and positioning of loginbox in rtl and ltr languages both

9 years agoMDL-31729 questions: files for hints are not moved or deleted.
Tim Hunt [Tue, 21 Feb 2012 17:54:58 +0000 (17:54 +0000)]
MDL-31729 questions: files for hints are not moved or deleted.

The files that belong to the question hints are neither moved when the
question is moved to another context, nor deleted when the question is
deleted.

Oops! How come no one noticed that until today.

9 years agoMDL-31721 question editing: improve working for Show num correct
Tim Hunt [Tue, 21 Feb 2012 11:56:55 +0000 (11:56 +0000)]
MDL-31721 question editing: improve working for Show num correct

AMOS BEGIN
 CPY [shownumpartscorrect,question],[shownumpartscorrectwhenfinished,question]
AMOS END

9 years agoMDL-29161 weblib: moodle_ulr::out does not cope with array params.
Tim Hunt [Wed, 22 Feb 2012 20:12:08 +0000 (20:12 +0000)]
MDL-29161 weblib: moodle_ulr::out does not cope with array params.

9 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Thu, 23 Feb 2012 10:38:14 +0000 (11:38 +0100)]
weekly release 2.3dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 23 Feb 2012 10:34:35 +0000 (11:34 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-31399 Lesson Module: Fixed horizontal scroll bar issue when using rtl language...
Rossiani Wijaya [Thu, 23 Feb 2012 07:34:57 +0000 (15:34 +0800)]
MDL-31399 Lesson Module: Fixed horizontal scroll bar issue when using rtl language format (eg: arabic)

9 years agoMDL-31363 grade: removed 3 constants that are not being used anywhere
Andrew Davis [Thu, 23 Feb 2012 01:51:19 +0000 (08:51 +0700)]
MDL-31363 grade: removed 3 constants that are not being used anywhere

9 years agoMDL-30988 ajax: Fixed up phpdocs package in ajax scripts
Sam Hemelryk [Thu, 23 Feb 2012 01:38:52 +0000 (14:38 +1300)]
MDL-30988 ajax: Fixed up phpdocs package in ajax scripts

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 23 Feb 2012 00:31:05 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-30997 - group - trailing whitespace + comment alignment fixes
Eloy Lafuente (stronk7) [Wed, 22 Feb 2012 12:23:11 +0000 (13:23 +0100)]
MDL-30997 - group - trailing whitespace + comment alignment fixes

9 years agoMerge branch 'wip-MDL-30997-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Wed, 22 Feb 2012 12:09:54 +0000 (13:09 +0100)]
Merge branch 'wip-MDL-30997-master' of git://github.com/abgreeve/moodle

9 years agoAutomatically generated installer lang files
AMOS bot [Wed, 22 Feb 2012 00:31:10 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-30987 message: Minor phpdoc fix ups
Sam Hemelryk [Tue, 21 Feb 2012 22:15:42 +0000 (11:15 +1300)]
MDL-30987 message: Minor phpdoc fix ups

9 years agoMerge branch 'MDL-30987_message_docs2' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 21 Feb 2012 21:58:06 +0000 (10:58 +1300)]
Merge branch 'MDL-30987_message_docs2' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-30910' of git://github.com/rwijaya/moodle
Sam Hemelryk [Tue, 21 Feb 2012 21:22:06 +0000 (10:22 +1300)]
Merge branch 'MDL-30910' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'wip-MDL-30830-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 21 Feb 2012 20:11:15 +0000 (21:11 +0100)]
Merge branch 'wip-MDL-30830-m23' of git://github.com/samhemelryk/moodle

9 years agoMDL-29256 Fixed incorrect calculation of contentformat
David Mudrak [Tue, 21 Feb 2012 10:12:00 +0000 (11:12 +0100)]
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.

9 years agoMerge branch 'm_MDL-25996_making_language_editing_terms_user_friendly' of git://githu...
Eloy Lafuente (stronk7) [Tue, 21 Feb 2012 09:47:37 +0000 (10:47 +0100)]
Merge branch 'm_MDL-25996_making_language_editing_terms_user_friendly' of git://github.com/gerrywastaken/moodle

9 years agoMDL-30910: Lesson Module: fix lesson progress bar for screen readers
Rossiani Wijaya [Tue, 21 Feb 2012 04:31:35 +0000 (12:31 +0800)]
MDL-30910: Lesson Module: fix lesson progress bar for screen readers
AMOS BEGIN
   CPY [progresscompleted, mod_lesson]
AMOS END

9 years agoMDL-30987 message: updated phpdocs for /lib/messagelib.php and /message
Andrew Davis [Thu, 5 Jan 2012 05:05:02 +0000 (12:05 +0700)]
MDL-30987 message: updated phpdocs for /lib/messagelib.php and /message

9 years agoMDL-30997 - group - update of the api block documentation.
Adrian Greeve [Thu, 5 Jan 2012 01:29:55 +0000 (09:29 +0800)]
MDL-30997 - group - update of the api block documentation.

9 years agoMerge branch 'MDL-30249' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 21 Feb 2012 01:55:56 +0000 (14:55 +1300)]
Merge branch 'MDL-30249' of git://github.com/mouneyrac/moodle

9 years agoMDL-31158 enrol_manual: Fixed whitespace
Sam Hemelryk [Tue, 21 Feb 2012 01:46:04 +0000 (14:46 +1300)]
MDL-31158 enrol_manual: Fixed whitespace

9 years agoMerge branch 'MDL-31158_grade_recovery' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 21 Feb 2012 01:44:50 +0000 (14:44 +1300)]
Merge branch 'MDL-31158_grade_recovery' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-31561' of git://github.com/kiklop74/moodle
Eloy Lafuente (stronk7) [Tue, 21 Feb 2012 01:30:14 +0000 (02:30 +0100)]
Merge branch 'MDL-31561' of git://github.com/kiklop74/moodle

9 years agoMerge branch 'MDL-31562' of git://github.com/kiklop74/moodle
Eloy Lafuente (stronk7) [Tue, 21 Feb 2012 01:28:14 +0000 (02:28 +0100)]
Merge branch 'MDL-31562' of git://github.com/kiklop74/moodle

9 years agoMDL-31158 grade: altered the help string for recovergradesdefault
Andrew Davis [Wed, 1 Feb 2012 07:06:18 +0000 (14:06 +0700)]
MDL-31158 grade: altered the help string for recovergradesdefault

9 years agoMerge branch 'wip-mdl-25432' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 21 Feb 2012 01:10:10 +0000 (02:10 +0100)]
Merge branch 'wip-mdl-25432' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-30698_multiple_emails' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 21 Feb 2012 00:43:53 +0000 (01:43 +0100)]
Merge branch 'MDL-30698_multiple_emails' of git://github.com/andyjdavis/moodle

9 years agoAutomatically generated installer lang files
AMOS bot [Tue, 21 Feb 2012 00:31:12 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-30974 forms: Last minute phpdoc fixes
Sam Hemelryk [Mon, 20 Feb 2012 23:39:35 +0000 (12:39 +1300)]
MDL-30974 forms: Last minute phpdoc fixes

9 years agoMerge branch 'wip-mdl-30974' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 20 Feb 2012 23:07:30 +0000 (12:07 +1300)]
Merge branch 'wip-mdl-30974' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-30988 Fixed phpdocs during integration review
Sam Hemelryk [Mon, 20 Feb 2012 23:01:00 +0000 (12:01 +1300)]
MDL-30988 Fixed phpdocs during integration review

9 years agoMerge branch 'm_MDL-30988_adding_preference_api_phpdocs' of git://github.com/gerrywas...
Sam Hemelryk [Mon, 20 Feb 2012 22:59:48 +0000 (11:59 +1300)]
Merge branch 'm_MDL-30988_adding_preference_api_phpdocs' of git://github.com/gerrywastaken/moodle

9 years agoMerge branch 'MDL-29402-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Mon, 20 Feb 2012 21:44:00 +0000 (10:44 +1300)]
Merge branch 'MDL-29402-master' of https://github.com/mackensen/moodle

9 years agoMerged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict...
Sam Hemelryk [Mon, 20 Feb 2012 21:33:00 +0000 (10:33 +1300)]
Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict resolution

9 years agoMerge branch 'MDL-19421-master-3' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 16:11:22 +0000 (17:11 +0100)]
Merge branch 'MDL-19421-master-3' of git://git.luns.net.uk/moodle

9 years agoMDL-19421 Correct lesson dependency mapping on restore
Andrew Robert Nicols [Mon, 30 Jan 2012 15:49:01 +0000 (15:49 +0000)]
MDL-19421 Correct lesson dependency mapping on restore

9 years agoMerge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 14:34:31 +0000 (15:34 +0100)]
Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle

9 years agoMDL-31014 Allow for selection of a different displayformat when approving glossary...
Andrew Robert Nicols [Wed, 4 Jan 2012 10:59:56 +0000 (10:59 +0000)]
MDL-31014 Allow for selection of a different displayformat when approving glossary entries

9 years agoMerge branch 'wip-MDL-25299-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 11:58:54 +0000 (12:58 +0100)]
Merge branch 'wip-MDL-25299-m23' of git://github.com/samhemelryk/moodle

9 years agoMDL-30999 whitespace fix
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 11:17:33 +0000 (12:17 +0100)]
MDL-30999 whitespace fix

9 years agoMDL-30999 grade phpdocs - change some inline @see by correct @link
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 11:09:50 +0000 (12:09 +0100)]
MDL-30999 grade phpdocs - change some inline @see by correct @link

9 years agoMerge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 11:02:18 +0000 (12:02 +0100)]
Merge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'wip-MDL-30979-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 10:38:20 +0000 (11:38 +0100)]
Merge branch 'wip-MDL-30979-m23' of git://github.com/samhemelryk/moodle

9 years agoMDL-30977 page phpdocs: 2 minor fixes in 2 functions
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 10:28:08 +0000 (11:28 +0100)]
MDL-30977 page phpdocs: 2 minor fixes in 2 functions

9 years agoMerge branch 'wip-MDL-30977-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 10:25:01 +0000 (11:25 +0100)]
Merge branch 'wip-MDL-30977-m23' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'MDL-30972_final' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 10:20:21 +0000 (11:20 +0100)]
Merge branch 'MDL-30972_final' of git://github.com/nebgor/moodle

9 years agoMerge branch 'wip-mdl-29967' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 20 Feb 2012 05:20:37 +0000 (18:20 +1300)]
Merge branch 'wip-mdl-29967' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-29254 Fixed whitespace
Sam Hemelryk [Mon, 20 Feb 2012 05:08:33 +0000 (18:08 +1300)]
MDL-29254 Fixed whitespace

9 years agoMerged MDL-29254 with conflict resolution
Sam Hemelryk [Mon, 20 Feb 2012 05:07:13 +0000 (18:07 +1300)]
Merged MDL-29254 with conflict resolution

9 years agoMerge branch 'MDL-31483_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 20 Feb 2012 04:34:58 +0000 (17:34 +1300)]
Merge branch 'MDL-31483_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'wip-MDL-30780-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 20 Feb 2012 04:29:47 +0000 (17:29 +1300)]
Merge branch 'wip-MDL-30780-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-28386 Authentication Fixing user id issue with logs when a new user is added
EVAN Irving-Pease [Mon, 20 Feb 2012 03:39:23 +0000 (09:09 +0530)]
MDL-28386 Authentication Fixing user id issue with logs when a new user is added

9 years agoMerge branch 'wip-MDL-31627-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 20 Feb 2012 04:25:48 +0000 (17:25 +1300)]
Merge branch 'wip-MDL-31627-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'm_MDL-31388_fix_enrol_LDAP_typo' of git://github.com/gerrywastaken...
Sam Hemelryk [Mon, 20 Feb 2012 04:13:36 +0000 (17:13 +1300)]
Merge branch 'm_MDL-31388_fix_enrol_LDAP_typo' of git://github.com/gerrywastaken/moodle

9 years agoMerge branch 'MDL-31532' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 20 Feb 2012 04:10:52 +0000 (17:10 +1300)]
Merge branch 'MDL-31532' of git://github.com/stronk7/moodle

9 years agoMerge branch 'master_MDL-31381' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 20 Feb 2012 04:04:45 +0000 (17:04 +1300)]
Merge branch 'master_MDL-31381' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-31432_messaging_popup' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 20 Feb 2012 03:58:36 +0000 (16:58 +1300)]
Merge branch 'MDL-31432_messaging_popup' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'm_MDL-30957_adding_assignment_completion_status_method_and_call' of...
Sam Hemelryk [Mon, 20 Feb 2012 03:53:21 +0000 (16:53 +1300)]
Merge branch 'm_MDL-30957_adding_assignment_completion_status_method_and_call' of git://github.com/gerrywastaken/moodle

9 years agoMDL-30957 Adding a new method "is_complete" to assignment lib for
Gerard (Gerry) Caulfield [Mon, 2 Jan 2012 18:43:39 +0000 (02:43 +0800)]
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.

9 years agoMDL-31335 message: wrapped calls to mtrace() in email_to_user() within a check to...
Andrew Davis [Fri, 10 Feb 2012 03:02:39 +0000 (10:02 +0700)]
MDL-31335 message: wrapped calls to mtrace() in email_to_user() within a check to make sure its a CLI script

9 years agoMerge branch 'master_MDL-31397' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 20 Feb 2012 03:03:19 +0000 (16:03 +1300)]
Merge branch 'master_MDL-31397' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master_MDL-31652' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 20 Feb 2012 02:57:12 +0000 (15:57 +1300)]
Merge branch 'master_MDL-31652' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master_MDL-31659' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 20 Feb 2012 02:49:41 +0000 (15:49 +1300)]
Merge branch 'master_MDL-31659' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-30965-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 20 Feb 2012 02:46:46 +0000 (15:46 +1300)]
Merge branch 'MDL-30965-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-31014 Integrated
Sam Hemelryk [Mon, 20 Feb 2012 02:39:11 +0000 (15:39 +1300)]
MDL-31014 Integrated