moodle.git
10 years agoMDL-36963 Improve mdeploy worker::move_directory() method
David Mudrák [Thu, 6 Dec 2012 01:31:36 +0000 (02:31 +0100)]
MDL-36963 Improve mdeploy worker::move_directory() method

The additional parameter allows to use this method without actual
removing the root of the source location. That is, it is now possible to
move the content of a folder only.

Also, a small refactoring happened here as we will need a variant of
this method that does not throw exception if the target already exists.

10 years agoMerge branch 'wip-MDL-36341-m24' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Thu, 6 Dec 2012 01:24:47 +0000 (02:24 +0100)]
Merge branch 'wip-MDL-36341-m24' of git://github.com/samhemelryk/moodle

10 years agoMDL-37003 Fix repeated line in update notification email
David Mudrák [Wed, 5 Dec 2012 23:03:25 +0000 (00:03 +0100)]
MDL-37003 Fix repeated line in update notification email

There was a problem experienced after 2.4.0 release because the version
of the 2.4.0 release was the same as 2.5dev release. So the version
value matched twice in the loop and the line was repeated in the email.

10 years agoMDL-36943 Do not notify about already installed updates
David Mudrák [Wed, 5 Dec 2012 22:47:54 +0000 (23:47 +0100)]
MDL-36943 Do not notify about already installed updates

Before this patch, the available_update_checker::cron_notifications()
method accessed the availableupdates property. But for plugins, that property
basically contains the most recent version available. So we were missing
the check against the actual version installed.

The fix was simple - obtain available updates via the available_updates()
method that performs the check.

10 years agoMDL-36840 Set course.format to 'site' for site-course
Marina Glancy [Wed, 5 Dec 2012 02:28:12 +0000 (10:28 +0800)]
MDL-36840 Set course.format to 'site' for site-course

10 years agoNOBUG: Bump backup relese for 2.5dev
Eloy Lafuente (stronk7) [Mon, 3 Dec 2012 20:11:33 +0000 (21:11 +0100)]
NOBUG: Bump backup relese for 2.5dev

10 years agoweekly release 2.5dev
Eloy Lafuente (stronk7) [Mon, 3 Dec 2012 19:05:30 +0000 (20:05 +0100)]
weekly release 2.5dev

10 years agoMoodle release 2.4 v2.4.0
Eloy Lafuente (stronk7) [Mon, 3 Dec 2012 19:01:33 +0000 (20:01 +0100)]
Moodle release 2.4

10 years agoie9 svg compatibility fixes
Eloy Lafuente (stronk7) [Mon, 3 Dec 2012 18:53:36 +0000 (19:53 +0100)]
ie9 svg compatibility fixes

10 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Mon, 3 Dec 2012 18:51:37 +0000 (19:51 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

10 years agoMerge branch 'MDL-36934-master' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 3 Dec 2012 08:48:13 +0000 (09:48 +0100)]
Merge branch 'MDL-36934-master' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-36912-master' of git://github.com/FMCorz/moodle
Aparup Banerjee [Mon, 3 Dec 2012 07:54:52 +0000 (15:54 +0800)]
Merge branch 'MDL-36912-master' of git://github.com/FMCorz/moodle

10 years agoMDL-36950 pluginlib - add MDL to comment
Dan Poltawski [Mon, 3 Dec 2012 07:47:35 +0000 (15:47 +0800)]
MDL-36950 pluginlib - add MDL to comment

10 years agoMerge branch 'MDL-36950-updates-proxy' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 3 Dec 2012 07:21:25 +0000 (15:21 +0800)]
Merge branch 'MDL-36950-updates-proxy' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-36777-master' of git://github.com/FMCorz/moodle
Aparup Banerjee [Mon, 3 Dec 2012 06:59:15 +0000 (14:59 +0800)]
Merge branch 'MDL-36777-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-36914-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 3 Dec 2012 06:45:04 +0000 (14:45 +0800)]
Merge branch 'MDL-36914-master' of git://github.com/damyon/moodle

10 years agoMDL-36860 theme: Readme for MyMobile hack
Frederic Massart [Mon, 3 Dec 2012 06:17:40 +0000 (14:17 +0800)]
MDL-36860 theme: Readme for MyMobile hack

10 years agoMerge branch 'MDL-36883-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 3 Dec 2012 06:08:25 +0000 (14:08 +0800)]
Merge branch 'MDL-36883-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-36860-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 3 Dec 2012 05:56:21 +0000 (13:56 +0800)]
Merge branch 'MDL-36860-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-36944-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 3 Dec 2012 05:41:02 +0000 (13:41 +0800)]
Merge branch 'MDL-36944-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-36949-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 3 Dec 2012 05:28:12 +0000 (13:28 +0800)]
Merge branch 'MDL-36949-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-36884-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 3 Dec 2012 05:23:21 +0000 (13:23 +0800)]
Merge branch 'MDL-36884-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'wip-MDL-36888-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 3 Dec 2012 04:55:42 +0000 (12:55 +0800)]
Merge branch 'wip-MDL-36888-m24' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-36948-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 3 Dec 2012 03:59:01 +0000 (11:59 +0800)]
Merge branch 'MDL-36948-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-36618-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 3 Dec 2012 02:36:16 +0000 (10:36 +0800)]
Merge branch 'MDL-36618-master' of git://github.com/FMCorz/moodle

10 years agoMDL-36341 calendar: fixed JS bug with popup node setter
Sam Hemelryk [Tue, 20 Nov 2012 00:31:31 +0000 (13:31 +1300)]
MDL-36341 calendar: fixed JS bug with popup node setter

10 years agoMDL-36888 theme: allow the use of SVG in CSS background images.
Sam Hemelryk [Wed, 28 Nov 2012 05:15:54 +0000 (18:15 +1300)]
MDL-36888 theme: allow the use of SVG in CSS background images.

10 years agoAutomatically generated installer lang files
AMOS bot [Sun, 2 Dec 2012 00:40:59 +0000 (00:40 +0000)]
Automatically generated installer lang files

10 years agoMDL-36934 Only set the autosubmit class on selects when required
Andrew Robert Nicols [Fri, 30 Nov 2012 09:54:37 +0000 (09:54 +0000)]
MDL-36934 Only set the autosubmit class on selects when required

The url_select class can optionally show a button (much like the non-JS
fallback). In this case, the autosubmit nature of the form shouldn't be
enforced and it should only submit on the button.

10 years agoAutomatically generated installer lang files
AMOS bot [Sat, 1 Dec 2012 00:43:06 +0000 (00:43 +0000)]
Automatically generated installer lang files

10 years agoMDL-36950 Pass the Moodle proxy setting to the mdeploy.php utility
David Mudrák [Fri, 30 Nov 2012 15:12:34 +0000 (16:12 +0100)]
MDL-36950 Pass the Moodle proxy setting to the mdeploy.php utility

10 years agoMDL-36950 Make mdeploy.php accept proxy related settings
David Mudrák [Fri, 30 Nov 2012 15:11:52 +0000 (16:11 +0100)]
MDL-36950 Make mdeploy.php accept proxy related settings

10 years agoMDL-36903 Add a link to Moodle documentation from mdeploy error pages
David Mudrák [Fri, 30 Nov 2012 12:16:01 +0000 (13:16 +0100)]
MDL-36903 Add a link to Moodle documentation from mdeploy error pages

10 years agoMDL-36903 Make mdeploy.php use the custom CA certificate if it exists
David Mudrák [Fri, 30 Nov 2012 12:15:00 +0000 (13:15 +0100)]
MDL-36903 Make mdeploy.php use the custom CA certificate if it exists

10 years agoMDL-36903 Pre-check the ZIP download before executing the mdeploy.php utility
David Mudrák [Fri, 30 Nov 2012 12:12:29 +0000 (13:12 +0100)]
MDL-36903 Pre-check the ZIP download before executing the mdeploy.php utility

This patch makes Moodle call HTTP HEAD method via cURL to see if the ZIP
is expected to be downloadable by mdeploy.php. This is mainly intended
for SSL certificates check.

10 years agoMDL-36903 Verify the SSL certificate of available updates provider
David Mudrák [Fri, 30 Nov 2012 10:46:19 +0000 (11:46 +0100)]
MDL-36903 Verify the SSL certificate of available updates provider

From now on, Moodle verifies the available updates provider server. To
make it work, either there must be a valid CA certificate available in
the operating system, or the administrator has to upload the valid CA
certificate to moodledata/moodleorgca.crt (PEM format) file manually.

10 years agoMDL-36949 usability: Use new icons for unused icons
Frederic Massart [Fri, 30 Nov 2012 12:24:20 +0000 (20:24 +0800)]
MDL-36949 usability: Use new icons for unused icons

10 years agoon-demand release 2.4rc1 v2.4.0-rc1
Eloy Lafuente (stronk7) [Fri, 30 Nov 2012 12:26:57 +0000 (13:26 +0100)]
on-demand release 2.4rc1

10 years agoie9 svg compatibility fixes
Eloy Lafuente (stronk7) [Fri, 30 Nov 2012 12:19:44 +0000 (13:19 +0100)]
ie9 svg compatibility fixes

10 years agoMDL-36948 usability: Styling for new reload icon
Frederic Massart [Fri, 30 Nov 2012 12:19:16 +0000 (20:19 +0800)]
MDL-36948 usability: Styling for new reload icon

10 years agoMDL-36948 usability: New reload icon
Barbara Ramiro [Fri, 30 Nov 2012 12:18:58 +0000 (20:18 +0800)]
MDL-36948 usability: New reload icon

10 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Fri, 30 Nov 2012 11:48:01 +0000 (12:48 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

10 years agoMDL-36884 usability: Deprecated icons fallback on most corresponding new icons
Frederic Massart [Fri, 30 Nov 2012 10:55:32 +0000 (18:55 +0800)]
MDL-36884 usability: Deprecated icons fallback on most corresponding new icons

10 years agoMDL-36944 usability: New version of switchrole icon
Frederic Massart [Fri, 30 Nov 2012 11:28:19 +0000 (19:28 +0800)]
MDL-36944 usability: New version of switchrole icon

10 years agoMDL-36912 usability: CSS adaptations for assignment
Frederic Massart [Fri, 30 Nov 2012 06:26:31 +0000 (14:26 +0800)]
MDL-36912 usability: CSS adaptations for assignment

10 years agoMDL-36912 usability: New icons for assignment module
Barbara Ramiro [Fri, 30 Nov 2012 06:05:11 +0000 (14:05 +0800)]
MDL-36912 usability: New icons for assignment module

10 years agoMDL-36618 usability: New icons for permissions risks
Barbara Ramiro [Fri, 30 Nov 2012 11:07:47 +0000 (19:07 +0800)]
MDL-36618 usability: New icons for permissions risks

10 years agoMDL-36777 usability: Theming fixes on backup steps
Frederic Massart [Thu, 29 Nov 2012 06:08:43 +0000 (14:08 +0800)]
MDL-36777 usability: Theming fixes on backup steps

10 years agoMDL-36777 usability: New icons for backup
Barbara Ramiro [Fri, 30 Nov 2012 06:32:46 +0000 (14:32 +0800)]
MDL-36777 usability: New icons for backup

10 years agoMDL-36830 usability: Glossary and database small design improvements
Frederic Massart [Mon, 26 Nov 2012 06:02:44 +0000 (14:02 +0800)]
MDL-36830 usability: Glossary and database small design improvements

10 years agoMerge branch 'MDL-36632-master' of git://github.com/FMCorz/moodle
Aparup Banerjee [Fri, 30 Nov 2012 07:44:50 +0000 (15:44 +0800)]
Merge branch 'MDL-36632-master' of git://github.com/FMCorz/moodle

10 years agoMDL-36632 usability: Grading methods icons and CSS
Frederic Massart [Wed, 28 Nov 2012 08:57:16 +0000 (16:57 +0800)]
MDL-36632 usability: Grading methods icons and CSS

10 years agoMerge branch 'MDL-36774-master' of git://github.com/FMCorz/moodle
Aparup Banerjee [Fri, 30 Nov 2012 07:32:15 +0000 (15:32 +0800)]
Merge branch 'MDL-36774-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-36765-master' of git://github.com/FMCorz/moodle
Aparup Banerjee [Fri, 30 Nov 2012 07:21:05 +0000 (15:21 +0800)]
Merge branch 'MDL-36765-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-36869-master' of git://github.com/FMCorz/moodle
Aparup Banerjee [Fri, 30 Nov 2012 07:05:41 +0000 (15:05 +0800)]
Merge branch 'MDL-36869-master' of git://github.com/FMCorz/moodle

10 years agoMDL-36860 theme: Fix MyMobile theme CSS
Frederic Massart [Fri, 30 Nov 2012 05:19:21 +0000 (13:19 +0800)]
MDL-36860 theme: Fix MyMobile theme CSS

10 years agoMDL-36860 theme: MyMobile jQuery Mobile hack
Frederic Massart [Fri, 30 Nov 2012 05:18:44 +0000 (13:18 +0800)]
MDL-36860 theme: MyMobile jQuery Mobile hack

10 years agoMDL-36933 Bump everything to 2012112900
Eloy Lafuente (stronk7) [Fri, 30 Nov 2012 02:28:29 +0000 (03:28 +0100)]
MDL-36933 Bump everything to 2012112900

(versions, requires and dependencies)

10 years agoMDL-36933 Prepare main version and backup branch
Eloy Lafuente (stronk7) [Fri, 30 Nov 2012 02:15:31 +0000 (03:15 +0100)]
MDL-36933 Prepare main version and backup branch

10 years agoMerge branch 'wip-MDL-36937-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 30 Nov 2012 01:48:36 +0000 (09:48 +0800)]
Merge branch 'wip-MDL-36937-m24' of git://github.com/samhemelryk/moodle

10 years agoMDL-36937 cache: Fixed up typo
Sam Hemelryk [Fri, 30 Nov 2012 01:29:58 +0000 (14:29 +1300)]
MDL-36937 cache: Fixed up typo

10 years agoRevert "MDL-36838 moodle->mahara mnet SSO failure in FF17"
Dan Poltawski [Fri, 30 Nov 2012 01:23:17 +0000 (09:23 +0800)]
Revert "MDL-36838 moodle->mahara mnet SSO failure in FF17"

Firefox have now decided to reverse their UA change (since integration)
and this patch has some minor drawbacks.

This reverts commit 1c65f683dc0a52e47fdf68e952c832d7c63e03a0.

10 years agoMDL-36869 usability: Revised icons enrolusers and assignroles
Barbara Ramiro [Thu, 29 Nov 2012 08:15:15 +0000 (16:15 +0800)]
MDL-36869 usability: Revised icons enrolusers and assignroles

10 years agoMDL-36914: Assignment upgrade. Clean up patch to include outcomes in the upgrade
Damyon Wiese [Thu, 29 Nov 2012 08:07:20 +0000 (16:07 +0800)]
MDL-36914: Assignment upgrade. Clean up patch to include outcomes in the upgrade

Thanks to Nathan Mares for reporting this issue.

10 years agoMDL-36914: Re-associate all grade_item records when upgrading assignments to prevent...
Nathan Mares [Tue, 27 Nov 2012 23:21:32 +0000 (10:21 +1100)]
MDL-36914: Re-associate all grade_item records when upgrading assignments to prevent data loss

10 years agoMerge branch 'MDL-36783-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 29 Nov 2012 07:06:19 +0000 (15:06 +0800)]
Merge branch 'MDL-36783-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-36638-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 29 Nov 2012 06:53:11 +0000 (14:53 +0800)]
Merge branch 'MDL-36638-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-36839-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 29 Nov 2012 06:43:50 +0000 (14:43 +0800)]
Merge branch 'MDL-36839-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'master_MDL-36858' of git://github.com/danmarsden/moodle
Aparup Banerjee [Thu, 29 Nov 2012 04:53:25 +0000 (12:53 +0800)]
Merge branch 'master_MDL-36858' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-36718-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 29 Nov 2012 04:51:00 +0000 (12:51 +0800)]
Merge branch 'MDL-36718-master' of git://github.com/FMCorz/moodle

10 years agoMDL-36638 usability: Core changes for new quiz/question icons
Frederic Massart [Tue, 27 Nov 2012 08:52:13 +0000 (16:52 +0800)]
MDL-36638 usability: Core changes for new quiz/question icons

10 years agoMDL-36638 usability: New quiz/question related icons
Barbara Ramiro [Wed, 28 Nov 2012 07:23:13 +0000 (15:23 +0800)]
MDL-36638 usability: New quiz/question related icons

10 years agoMDL-36837 theme: Help icons aligned on the left are well positioned
Frederic Massart [Mon, 26 Nov 2012 07:42:35 +0000 (15:42 +0800)]
MDL-36837 theme: Help icons aligned on the left are well positioned

10 years agoMerge branch 'MDL-36695-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 29 Nov 2012 04:21:03 +0000 (12:21 +0800)]
Merge branch 'MDL-36695-master' of git://github.com/FMCorz/moodle

10 years agoMDL-36883 course: Fixed HTML differences with drag & drop
Frederic Massart [Thu, 29 Nov 2012 03:14:05 +0000 (11:14 +0800)]
MDL-36883 course: Fixed HTML differences with drag & drop

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 29 Nov 2012 00:40:19 +0000 (00:40 +0000)]
Automatically generated installer lang files

10 years agoMDL-36878 course: fixed issue with module metadata cache
Sam Hemelryk [Wed, 28 Nov 2012 23:56:52 +0000 (12:56 +1300)]
MDL-36878 course: fixed issue with module metadata cache

Credit goes to Sam Chaffee.

10 years agoMerge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 28 Nov 2012 09:51:33 +0000 (17:51 +0800)]
Merge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle

10 years agoMDL-36638 usability: Fix missing padding in forum headers
Frederic Massart [Wed, 28 Nov 2012 09:36:38 +0000 (17:36 +0800)]
MDL-36638 usability: Fix missing padding in forum headers

10 years agoMerge branch 'MDL-36838-FF17-MNETSSO-MASTER' of git://github.com/peterbulmer/moodle
Dan Poltawski [Wed, 28 Nov 2012 09:35:54 +0000 (17:35 +0800)]
Merge branch 'MDL-36838-FF17-MNETSSO-MASTER' of git://github.com/peterbulmer/moodle

10 years agoMDL-36718 usability: New activity completion icons
Barbara Ramiro [Mon, 26 Nov 2012 04:36:10 +0000 (12:36 +0800)]
MDL-36718 usability: New activity completion icons

10 years agoMDL-36858 SCORM: improve lang help for attempts grading to warn about failed status.
Dan Marsden [Wed, 28 Nov 2012 07:53:18 +0000 (20:53 +1300)]
MDL-36858 SCORM: improve lang help for attempts grading to warn about failed status.

10 years agoMDL-36765 usability: CSS fixes for new course icons
Frederic Massart [Wed, 28 Nov 2012 07:12:28 +0000 (15:12 +0800)]
MDL-36765 usability: CSS fixes for new course icons

10 years agoMDL-36765 usability: New icons for courses and remote courses
Barbara Ramiro [Wed, 28 Nov 2012 07:06:46 +0000 (15:06 +0800)]
MDL-36765 usability: New icons for courses and remote courses

10 years agoMerge branch 'MDL-35966-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 28 Nov 2012 06:15:28 +0000 (14:15 +0800)]
Merge branch 'MDL-35966-master' of git://github.com/damyon/moodle

10 years agoMerge branch 'MDL-36864_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 28 Nov 2012 06:14:49 +0000 (14:14 +0800)]
Merge branch 'MDL-36864_master' of git://github.com/markn86/moodle

10 years agoMDL-36783 usability: Portfolio CSS for new icons
Frederic Massart [Wed, 28 Nov 2012 06:01:26 +0000 (14:01 +0800)]
MDL-36783 usability: Portfolio CSS for new icons

10 years agoMDL-36783 usability: New icons for portfolio
Barbara Ramiro [Wed, 28 Nov 2012 05:37:08 +0000 (13:37 +0800)]
MDL-36783 usability: New icons for portfolio

10 years agoMDL-36864 blocks: only perform myaddinstance capability check on the My Moodle page...
Mark Nelson [Wed, 28 Nov 2012 04:47:54 +0000 (12:47 +0800)]
MDL-36864 blocks: only perform myaddinstance capability check on the My Moodle page, not on any other pages using the user context

10 years agoMDL-36839 theme: Margin on single selects
Frederic Massart [Mon, 26 Nov 2012 08:05:17 +0000 (16:05 +0800)]
MDL-36839 theme: Margin on single selects

10 years agoMDL-36774 theme: Comment issues in glossary and blogs
Frederic Massart [Mon, 26 Nov 2012 04:32:14 +0000 (12:32 +0800)]
MDL-36774 theme: Comment issues in glossary and blogs

10 years agoMDL-33791 - fix upgrade.txt ordering
Dan Poltawski [Wed, 28 Nov 2012 02:28:01 +0000 (10:28 +0800)]
MDL-33791 - fix upgrade.txt ordering

10 years agoMerge branch 'wip-MDL-36859-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 28 Nov 2012 01:56:59 +0000 (09:56 +0800)]
Merge branch 'wip-MDL-36859-m24' of git://github.com/samhemelryk/moodle

10 years agoMDL-36695 usability: New icons for feedback module
Barbara Ramiro [Wed, 28 Nov 2012 01:48:25 +0000 (09:48 +0800)]
MDL-36695 usability: New icons for feedback module

10 years agoMerge branch 'MDL-36752-master-2' of git://git.luns.net.uk/moodle
Dan Poltawski [Wed, 28 Nov 2012 01:40:24 +0000 (09:40 +0800)]
Merge branch 'MDL-36752-master-2' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-36336_modLtiRestoreGrade' of git://github.com/moodlerooms/moodle
Sam Hemelryk [Tue, 27 Nov 2012 22:48:12 +0000 (11:48 +1300)]
Merge branch 'MDL-36336_modLtiRestoreGrade' of git://github.com/moodlerooms/moodle

10 years agoMerge branch 'wip-mdl-36238' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 27 Nov 2012 22:41:42 +0000 (11:41 +1300)]
Merge branch 'wip-mdl-36238' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle
Sam Hemelryk [Tue, 27 Nov 2012 22:25:24 +0000 (11:25 +1300)]
Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle

10 years agoMerge branch 'MDL-30139_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 27 Nov 2012 22:14:47 +0000 (11:14 +1300)]
Merge branch 'MDL-30139_master' of https://github.com/markn86/moodle

10 years agoMerge branch 'MDL-36012-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 27 Nov 2012 22:12:53 +0000 (11:12 +1300)]
Merge branch 'MDL-36012-master' of git://github.com/damyon/moodle