moodle.git
10 years agoMerge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle
Aparup Banerjee [Thu, 14 Jun 2012 09:08:18 +0000 (17:08 +0800)]
Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'wip-MDL-33420-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 14 Jun 2012 08:32:03 +0000 (16:32 +0800)]
Merge branch 'wip-MDL-33420-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 14 Jun 2012 08:23:08 +0000 (16:23 +0800)]
Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle

10 years agoMDL-33550 reset repository static cache between unit tests
Marina Glancy [Thu, 14 Jun 2012 08:21:04 +0000 (16:21 +0800)]
MDL-33550 reset repository static cache between unit tests

10 years agoMDL-33156 pix: standardise image icons for course pages
Martin Dougiamas [Thu, 14 Jun 2012 08:04:16 +0000 (16:04 +0800)]
MDL-33156 pix: standardise image icons for course pages

10 years agoMDL-33550 Set default status for file =0 and correct setting user in phpunit test
Marina Glancy [Thu, 14 Jun 2012 06:52:31 +0000 (14:52 +0800)]
MDL-33550 Set default status for file =0 and correct setting user in phpunit test

10 years agoRevert MDL-33513
Dan Poltawski [Thu, 14 Jun 2012 05:57:06 +0000 (13:57 +0800)]
Revert MDL-33513

This reverts commit b2cf2b807f7a7c8d1a02ebb52038c61cc63a1494.
This reverts commit 24b96f01702571989fa77a05c5cd11b9fedc2745.
This reverts commit 39c60294a6a027ae56f4b9eda159bb589b60c0c0.
This reverts commit 8a288971e25eaaa4c8cbd67e450cee0e12435d4e.

10 years agoMerge branch 'MDL-32767' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Thu, 14 Jun 2012 04:37:08 +0000 (16:37 +1200)]
Merge branch 'MDL-32767' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-33035-m23' of git://github.com/sunner/moodle
Dan Poltawski [Thu, 14 Jun 2012 04:29:14 +0000 (12:29 +0800)]
Merge branch 'MDL-33035-m23' of git://github.com/sunner/moodle

10 years agoMerge branch 'MDL-33718' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 14 Jun 2012 04:25:50 +0000 (12:25 +0800)]
Merge branch 'MDL-33718' of git://github.com/netspotau/moodle-mod_assign

10 years agoMerge branch 'wip-MDL-33592-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 14 Jun 2012 04:22:39 +0000 (12:22 +0800)]
Merge branch 'wip-MDL-33592-m23' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-33464' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 14 Jun 2012 04:20:14 +0000 (12:20 +0800)]
Merge branch 'MDL-33464' of git://github.com/netspotau/moodle-mod_assign

10 years agoMDL-27156 - version bump for new capability
Dan Poltawski [Thu, 14 Jun 2012 04:12:39 +0000 (12:12 +0800)]
MDL-27156 - version bump for new capability

10 years agoMerge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle
Dan Poltawski [Thu, 14 Jun 2012 04:00:18 +0000 (12:00 +0800)]
Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle

10 years agoMDL-33718: Help text change for assignment module.
Damyon Wiese [Thu, 14 Jun 2012 03:23:27 +0000 (11:23 +0800)]
MDL-33718: Help text change for assignment module.

10 years agoMerge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle
Dan Poltawski [Thu, 14 Jun 2012 03:12:21 +0000 (11:12 +0800)]
Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle

10 years agoMDL-33400 Lib : fixed character miscount
Aparup Banerjee [Thu, 14 Jun 2012 02:56:40 +0000 (10:56 +0800)]
MDL-33400 Lib : fixed character miscount

10 years agoMDL-33513 repositories - fix misleading phpdocs
Dan Poltawski [Thu, 14 Jun 2012 02:52:59 +0000 (10:52 +0800)]
MDL-33513 repositories - fix misleading phpdocs

10 years agoMDL-33400 questionlib - minor whitespace/equality imporvement
Dan Poltawski [Thu, 14 Jun 2012 02:28:34 +0000 (10:28 +0800)]
MDL-33400 questionlib - minor whitespace/equality imporvement

10 years agoMerge branch 'MDL-33400' of git://github.com/nebgor/moodle
Dan Poltawski [Thu, 14 Jun 2012 02:27:23 +0000 (10:27 +0800)]
Merge branch 'MDL-33400' of git://github.com/nebgor/moodle

10 years agoMDL-27156 repositories: switched the file manager and the file picker over to using...
Andrew Davis [Mon, 11 Jun 2012 10:21:46 +0000 (17:21 +0700)]
MDL-27156 repositories: switched the file manager and the file picker over to using get_user_max_upload_file_size()

10 years agoMDL-27156 repositories: switched some spots over to using get_user_max_upload_file_si...
Andrew Davis [Fri, 8 Jun 2012 10:23:47 +0000 (17:23 +0700)]
MDL-27156 repositories: switched some spots over to using get_user_max_upload_file_size() instead of get_max_upload_file_size()

10 years agoMDL-27156 repository: Added a new capability so that select users can bypass file...
Andrew Davis [Tue, 27 Mar 2012 10:42:53 +0000 (17:42 +0700)]
MDL-27156 repository: Added a new capability so that select users can bypass file size restrictions

10 years agoMDL-33464: Do not create a grade item on upgrade (mod_assign) because we already...
Damyon Wiese [Thu, 14 Jun 2012 01:14:40 +0000 (09:14 +0800)]
MDL-33464: Do not create a grade item on upgrade (mod_assign) because we already reassigned the old one

10 years agoMerge branch 'MDL-33645-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Wed, 13 Jun 2012 23:31:46 +0000 (11:31 +1200)]
Merge branch 'MDL-33645-master' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'MDL-33541' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Wed, 13 Jun 2012 23:27:37 +0000 (11:27 +1200)]
Merge branch 'MDL-33541' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-33554' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Wed, 13 Jun 2012 23:20:16 +0000 (11:20 +1200)]
Merge branch 'MDL-33554' of git://github.com/mouneyrac/moodle

10 years agoMDL-33400 Libraries : added callback to *_question_pluginfile without 'mod_' prefix
Aparup Banerjee [Wed, 13 Jun 2012 17:26:19 +0000 (01:26 +0800)]
MDL-33400 Libraries : added callback to *_question_pluginfile without 'mod_' prefix

10 years agoMerge branch 'w24_MDL-33204_m23_importsort' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 13 Jun 2012 16:01:31 +0000 (18:01 +0200)]
Merge branch 'w24_MDL-33204_m23_importsort' of git://github.com/skodak/moodle

10 years agoMerge branch 'w24_MDL-33635_m23_sort' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 13 Jun 2012 14:40:07 +0000 (16:40 +0200)]
Merge branch 'w24_MDL-33635_m23_sort' of git://github.com/skodak/moodle

10 years agoMDL-33635 improve collatorlib::ksort() coding style and perf
Petr Skoda [Wed, 13 Jun 2012 14:37:56 +0000 (16:37 +0200)]
MDL-33635 improve collatorlib::ksort() coding style and perf

Thanks Eloy Lafuente for spotting my sloppy coding style!

10 years agoMerge branch 'MDL-33611' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 13 Jun 2012 10:00:01 +0000 (18:00 +0800)]
Merge branch 'MDL-33611' of git://github.com/timhunt/moodle

10 years agoMDL-33513 Fixed source field
Dongsheng Cai [Wed, 13 Jun 2012 09:57:10 +0000 (19:57 +1000)]
MDL-33513 Fixed source field

10 years agoMerge branch 'MDL-33581' of git://github.com/mouneyrac/moodle
Dan Poltawski [Wed, 13 Jun 2012 09:45:27 +0000 (17:45 +0800)]
Merge branch 'MDL-33581' of git://github.com/mouneyrac/moodle

10 years agoMDL-33611 quiz: acutally use the right help string
Tim Hunt [Wed, 13 Jun 2012 09:42:44 +0000 (10:42 +0100)]
MDL-33611 quiz: acutally use the right help string

The previous commit for this bug actually managed to use the wrong one.

10 years agoMerge branch 'MDL-33611' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 13 Jun 2012 08:39:24 +0000 (16:39 +0800)]
Merge branch 'MDL-33611' of git://github.com/timhunt/moodle

10 years agoMerge branch 'wip-MDL-33590-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 13 Jun 2012 08:33:50 +0000 (16:33 +0800)]
Merge branch 'wip-MDL-33590-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'w24_MDL-33553_m23_portfoliostrict' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 13 Jun 2012 08:22:27 +0000 (16:22 +0800)]
Merge branch 'w24_MDL-33553_m23_portfoliostrict' of git://github.com/skodak/moodle

10 years agoMerge branch 'wip-MDL-33597-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 13 Jun 2012 07:45:19 +0000 (15:45 +0800)]
Merge branch 'wip-MDL-33597-m23' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-33691' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Wed, 13 Jun 2012 07:24:42 +0000 (15:24 +0800)]
Merge branch 'MDL-33691' of git://github.com/netspotau/moodle-mod_assign

10 years agoMDL-33005 Drag and drop animation revised to play once only
Barbara Ramiro [Wed, 13 Jun 2012 06:59:46 +0000 (14:59 +0800)]
MDL-33005 Drag and drop animation revised to play once only

10 years agoMerge branch 'wip-MDL-33452-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 13 Jun 2012 07:03:07 +0000 (15:03 +0800)]
Merge branch 'wip-MDL-33452-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'master_MDL-33477' of git://github.com/danmarsden/moodle
Dan Poltawski [Wed, 13 Jun 2012 06:08:36 +0000 (14:08 +0800)]
Merge branch 'master_MDL-33477' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-33608-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Wed, 13 Jun 2012 06:02:05 +0000 (14:02 +0800)]
Merge branch 'MDL-33608-master-1' of git://git.luns.net.uk/moodle

10 years agoMDL-33645 assign: Teachers should not be allowed to change grades if it is overridden...
Ankit Agarwal [Tue, 12 Jun 2012 03:12:25 +0000 (11:12 +0800)]
MDL-33645 assign: Teachers should not be allowed to change grades if it is overridden in the gradebook

10 years agoMDL-33541 - remove cookies from filepicker
Dan Poltawski [Mon, 11 Jun 2012 06:55:13 +0000 (14:55 +0800)]
MDL-33541 - remove cookies from filepicker

10 years agoMDL-33550 Correctly process situation when file reference source is missing
Marina Glancy [Wed, 13 Jun 2012 04:11:06 +0000 (12:11 +0800)]
MDL-33550 Correctly process situation when file reference source is missing

- do not die with fatal error if source file in moodle internal repository is missing;
- moved code duplication for moodle repositories into class repository (functions send_file, get_reference_details, get_file_by_reference, get_file_reference);
- update file status after repository::sync_external_file so we know that it is missing (or not missing anymore). Do not run this function more than once for file within one request;
- display readable name for Private Files and Server files with the new format;
- display broken icon in filemanager if we know that source is missing, display information (for admin) where it was located before: see repository::get_reference_details() and extending classes;
- removed unnecessary queries in stored_file::sync_external_file();
- syncronize files before displaying it's size in mod_resource, do not query  directly

10 years agoMerge branch 'MDL-33128-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 13 Jun 2012 03:40:39 +0000 (15:40 +1200)]
Merge branch 'MDL-33128-master-1' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-32573' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Wed, 13 Jun 2012 03:32:54 +0000 (15:32 +1200)]
Merge branch 'MDL-32573' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-33576-2' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Wed, 13 Jun 2012 03:28:39 +0000 (11:28 +0800)]
Merge branch 'MDL-33576-2' of git://github.com/netspotau/moodle-mod_assign

10 years agoMerge branch 'MDL-33675-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 13 Jun 2012 03:24:07 +0000 (15:24 +1200)]
Merge branch 'MDL-33675-master-1' of git://git.luns.net.uk/moodle

10 years agoMDL-33691: The grading table is showing "graded" for assignments with a NULL grade
Damyon Wiese [Wed, 13 Jun 2012 03:01:37 +0000 (11:01 +0800)]
MDL-33691: The grading table is showing "graded" for assignments with a NULL grade

10 years agoMerge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
Dan Poltawski [Wed, 13 Jun 2012 02:12:21 +0000 (10:12 +0800)]
Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle

10 years agoMDL-33477 Advanced grading Marking Guide - fix lang
Dan Marsden [Wed, 13 Jun 2012 02:09:41 +0000 (14:09 +1200)]
MDL-33477 Advanced grading Marking Guide - fix lang

10 years agoMerge branch 'wip-mdl-33664' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 13 Jun 2012 02:07:32 +0000 (10:07 +0800)]
Merge branch 'wip-mdl-33664' of git://github.com/rajeshtaneja/moodle

10 years agoMDL-33664 Hub: required renderer is passed to backup->display and huburl is initalise...
Rajesh Taneja [Tue, 12 Jun 2012 05:40:34 +0000 (13:40 +0800)]
MDL-33664 Hub: required renderer is passed to backup->display and huburl is initalised before use.

10 years agoMDL-33420 Enable references in Server files repository
Marina Glancy [Mon, 11 Jun 2012 06:35:12 +0000 (14:35 +0800)]
MDL-33420 Enable references in Server files repository

10 years agoMDL-33590 Correctly determine that file is an archive to enable unzip in filemanager
Marina Glancy [Mon, 11 Jun 2012 05:27:37 +0000 (13:27 +0800)]
MDL-33590 Correctly determine that file is an archive to enable unzip in filemanager

10 years agoMDL-33576: If grade set to "No grade" in mod_assign hide inputs for quickgrading
Damyon Wiese [Thu, 7 Jun 2012 04:00:34 +0000 (12:00 +0800)]
MDL-33576: If grade set to "No grade" in mod_assign hide inputs for quickgrading

10 years agoMDL-33682 backup: keep old behavior, aka, use section number on empty section name.
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 22:54:21 +0000 (00:54 +0200)]
MDL-33682 backup: keep old behavior, aka, use section number on empty section name.

10 years agoMerge branch 'MDL-33682' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 22:37:42 +0000 (00:37 +0200)]
Merge branch 'MDL-33682' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-33681' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 22:06:26 +0000 (00:06 +0200)]
Merge branch 'MDL-33681' of git://github.com/timhunt/moodle

10 years agoMDL-32937 SCORM: better lang for dnd interface
Dan Marsden [Tue, 12 Jun 2012 21:59:11 +0000 (09:59 +1200)]
MDL-32937 SCORM: better lang for dnd interface

10 years agoMerge branch 'MDL-33610' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Tue, 12 Jun 2012 17:59:33 +0000 (01:59 +0800)]
Merge branch 'MDL-33610' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-33593' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Tue, 12 Jun 2012 17:46:17 +0000 (01:46 +0800)]
Merge branch 'MDL-33593' of git://github.com/danpoltawski/moodle

10 years agoMDL-33682 backup: cope with sections called '0'
Tim Hunt [Tue, 12 Jun 2012 16:46:47 +0000 (17:46 +0100)]
MDL-33682 backup: cope with sections called '0'

It was not previously possible to have a section called 0 because of
bugs in the standard course formats, but we hit this with the OU course
format. You got an exception because backup settings tested to see if
their lable was empty, which means a section name of '0' was fatal.
Should work now.

10 years agoMDL-33681 course: cannot have a section called '0'.
Tim Hunt [Tue, 12 Jun 2012 16:45:40 +0000 (17:45 +0100)]
MDL-33681 course: cannot have a section called '0'.

No reason to prevent this. It is just a matter of doing a proper test,
rather than the sloppy PHP !empty().

10 years agoMDL-32573 - repository: make instance_config_form static
Dan Poltawski [Tue, 12 Jun 2012 14:15:09 +0000 (22:15 +0800)]
MDL-32573 - repository: make instance_config_form static

10 years agoMDL-33675 Add updated help texts for modules to appear in activity chooser
Andrew Robert Nicols [Tue, 12 Jun 2012 10:48:18 +0000 (11:48 +0100)]
MDL-33675 Add updated help texts for modules to appear in activity chooser

10 years agoMerge branch 'MDL-33676' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 12 Jun 2012 10:36:08 +0000 (18:36 +0800)]
Merge branch 'MDL-33676' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-33123-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 10:33:54 +0000 (12:33 +0200)]
Merge branch 'MDL-33123-master' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 10:31:27 +0000 (12:31 +0200)]
Merge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle

10 years agoMDL-33676 Activity chooser dialogue background set to transparent for IE
Barbara Ramiro [Fri, 8 Jun 2012 10:25:41 +0000 (18:25 +0800)]
MDL-33676 Activity chooser dialogue background set to transparent for IE

10 years agoMDL-33611 quiz: improve help string
Tim Hunt [Fri, 8 Jun 2012 10:24:00 +0000 (11:24 +0100)]
MDL-33611 quiz: improve help string

Thanks to Helen and Michelle. Who would have thought that 124 words
would require such a team effort!

10 years agoMerge branch 'MDL-33612' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 12 Jun 2012 09:38:25 +0000 (17:38 +0800)]
Merge branch 'MDL-33612' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-33292-master-3' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 12 Jun 2012 09:18:18 +0000 (17:18 +0800)]
Merge branch 'MDL-33292-master-3' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-33588-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 12 Jun 2012 09:16:40 +0000 (17:16 +0800)]
Merge branch 'MDL-33588-master-1' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'w24_MDL-33182_m23_mnetstrict' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 12 Jun 2012 09:10:54 +0000 (17:10 +0800)]
Merge branch 'w24_MDL-33182_m23_mnetstrict' of git://github.com/skodak/moodle

10 years agoMDL-33182 fix mnet enrol E_STRICT issue
Petr Skoda [Sun, 10 Jun 2012 08:00:24 +0000 (10:00 +0200)]
MDL-33182 fix mnet enrol E_STRICT issue

10 years agoMDL-33553 fix mod_data E_STRICT issue
Petr Skoda [Sun, 10 Jun 2012 07:54:48 +0000 (09:54 +0200)]
MDL-33553 fix mod_data E_STRICT issue

10 years agoMerge branch 'MDL-33393' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 12 Jun 2012 09:00:09 +0000 (17:00 +0800)]
Merge branch 'MDL-33393' of git://github.com/timhunt/moodle

Conflicts:
mod/quiz/lang/en/quiz.php

10 years agoMDL-33204 use natural filename sorting when importing books form html
Petr Skoda [Sun, 10 Jun 2012 16:14:18 +0000 (18:14 +0200)]
MDL-33204 use natural filename sorting when importing books form html

10 years agoMDL-33635 add collatorlib::ksort() support
Petr Skoda [Sun, 10 Jun 2012 16:04:49 +0000 (18:04 +0200)]
MDL-33635 add collatorlib::ksort() support

10 years agoMDL-33635 improve collatorlib
Petr Skoda [Sun, 10 Jun 2012 14:28:31 +0000 (16:28 +0200)]
MDL-33635 improve collatorlib

1/ the sort flag can not use Intl extension constants because they may not be available
2/ add sort flag to all methods
3/ use private constructor instead of abstract - more Java like API to match the textlib
4/ add natural sorting support
5/ consistent bool return type
6/ better non-intl fallback
7/ more tests

10 years agoMDL-33204 disable yui_combo slasharguments by default for now
Petr Skoda [Tue, 12 Jun 2012 08:13:17 +0000 (10:13 +0200)]
MDL-33204 disable yui_combo slasharguments by default for now

10 years agoMDL-33636 add more yui caching goodness
Petr Skoda [Tue, 12 Jun 2012 08:13:01 +0000 (10:13 +0200)]
MDL-33636 add more yui caching goodness

10 years agoMDL-33123 book: Fixing numbering issue with hidden sub-chapters
Ankit Agarwal [Mon, 11 Jun 2012 05:18:11 +0000 (13:18 +0800)]
MDL-33123 book: Fixing numbering issue with hidden sub-chapters

10 years agoMerge branch 'MDL-33598-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 12 Jun 2012 07:57:58 +0000 (15:57 +0800)]
Merge branch 'MDL-33598-master-integration' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'wip-MDL-33156-master' of https://github.com/barbararamiro/moodle
Dan Poltawski [Tue, 12 Jun 2012 07:55:26 +0000 (15:55 +0800)]
Merge branch 'wip-MDL-33156-master' of https://github.com/barbararamiro/moodle

10 years agoMerge branch 'wip-MDL-33005-master' of https://github.com/barbararamiro/moodle
Dan Poltawski [Tue, 12 Jun 2012 05:54:10 +0000 (13:54 +0800)]
Merge branch 'wip-MDL-33005-master' of https://github.com/barbararamiro/moodle

10 years agoMerge branch 'wip-MDL-33446-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 12 Jun 2012 05:45:10 +0000 (13:45 +0800)]
Merge branch 'wip-MDL-33446-master' of git://github.com/marinaglancy/moodle

10 years agoMDL-33572 - assign: fixed syntax probblem found immediately after integration
Dan Poltawski [Tue, 12 Jun 2012 05:41:54 +0000 (13:41 +0800)]
MDL-33572 - assign: fixed syntax probblem found immediately after integration

Grr. shouldn't have escaped our review.

10 years agoMerge branch 'MDL-33572' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Tue, 12 Jun 2012 05:38:34 +0000 (13:38 +0800)]
Merge branch 'MDL-33572' of git://github.com/netspotau/moodle-mod_assign

10 years agoMerge branch 'w23_MDL-33543_m23_datastrict' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 12 Jun 2012 05:36:15 +0000 (13:36 +0800)]
Merge branch 'w23_MDL-33543_m23_datastrict' of git://github.com/skodak/moodle

10 years agoMDL-32937 - scorm: switch commenting style to //
Dan Poltawski [Tue, 12 Jun 2012 05:18:51 +0000 (13:18 +0800)]
MDL-32937 - scorm: switch commenting style to //

10 years agoMDL-32767 - course: Add a summary of activities
Dan Poltawski [Wed, 30 May 2012 08:25:43 +0000 (16:25 +0800)]
MDL-32767 - course: Add a summary of activities

When in single-page summary mode

10 years agoMDL-33598 Messaging: students can change their assignment notification preferences
Frederic Massart [Mon, 11 Jun 2012 05:32:46 +0000 (13:32 +0800)]
MDL-33598 Messaging: students can change their assignment notification preferences

10 years agoMerge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 12 Jun 2012 05:05:47 +0000 (13:05 +0800)]
Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-33400' of git://github.com/nebgor/moodle
Dan Poltawski [Tue, 12 Jun 2012 05:03:42 +0000 (13:03 +0800)]
Merge branch 'MDL-33400' of git://github.com/nebgor/moodle

10 years agoMerge branch 'master_MDL-33515' of git://github.com/danmarsden/moodle
Aparup Banerjee [Tue, 12 Jun 2012 03:25:17 +0000 (11:25 +0800)]
Merge branch 'master_MDL-33515' of git://github.com/danmarsden/moodle