moodle.git
10 years agoMDL-37539 assign: Fix unit test after changes to upgrade for advanced file assignments.
Damyon Wiese [Tue, 22 Jan 2013 01:04:13 +0000 (09:04 +0800)]
MDL-37539 assign: Fix unit test after changes to upgrade for advanced file assignments.

10 years agoMDL-37539 Assignment upgrade: Disable submission comments if allow notes was not...
Damyon Wiese [Thu, 17 Jan 2013 04:09:36 +0000 (12:09 +0800)]
MDL-37539 Assignment upgrade: Disable submission comments if allow notes was not enabled.

For advanced upload of files only - this setting was stored in var2.

10 years agoMDL-37085 bug fix in link for module subtypes. Thanks to Andrew Nicols
Marina Glancy [Thu, 17 Jan 2013 01:45:24 +0000 (12:45 +1100)]
MDL-37085 bug fix in link for module subtypes. Thanks to Andrew Nicols

10 years agoMDL-36035 course: fixed typo in function name
Sam Hemelryk [Wed, 16 Jan 2013 20:15:26 +0000 (09:15 +1300)]
MDL-36035 course: fixed typo in function name

10 years agoMerge branch 'MDL-37555' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 19:52:47 +0000 (20:52 +0100)]
Merge branch 'MDL-37555' of git://github.com/stronk7/moodle

10 years agoMDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB.
Tim Hunt [Wed, 16 Jan 2013 12:38:04 +0000 (12:38 +0000)]
MDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB.

10 years agoMDL-37555 Apply realpath() 2 CFG->phpunit_dataroot
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 15:15:56 +0000 (16:15 +0100)]
MDL-37555 Apply realpath() 2 CFG->phpunit_dataroot

10 years agoNOBUG: mini-bump to help cache definitions.
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 14:57:46 +0000 (15:57 +0100)]
NOBUG: mini-bump to help cache definitions.

10 years agoMDL-37207 modchoosertoggle: added checks that user can update course
Marina Glancy [Wed, 16 Jan 2013 06:58:15 +0000 (17:58 +1100)]
MDL-37207 modchoosertoggle: added checks that user can update course

10 years agoMerge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 16 Jan 2013 06:17:40 +0000 (14:17 +0800)]
Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle

10 years agoMDL-37085 changed echo to return - little bug fix
Marina Glancy [Wed, 16 Jan 2013 06:14:51 +0000 (17:14 +1100)]
MDL-37085 changed echo to return - little bug fix

10 years agoMerge branch 'wip-MDL-37536-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 16 Jan 2013 05:51:58 +0000 (13:51 +0800)]
Merge branch 'wip-MDL-37536-m25' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-37546-master' of github.com:damyon/moodle
Dan Poltawski [Wed, 16 Jan 2013 05:49:34 +0000 (13:49 +0800)]
Merge branch 'MDL-37546-master' of github.com:damyon/moodle

10 years agoMDL-37546 Assignment fix assign_get_recent_mod_activity code cleanup regression.
Damyon Wiese [Wed, 16 Jan 2013 05:40:23 +0000 (13:40 +0800)]
MDL-37546 Assignment fix assign_get_recent_mod_activity code cleanup regression.

10 years agoMerge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Wed, 16 Jan 2013 05:22:04 +0000 (18:22 +1300)]
Merge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-36553' of git://github.com/rwijaya/moodle
Dan Poltawski [Wed, 16 Jan 2013 05:19:36 +0000 (13:19 +0800)]
Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'wip-MDL-36968-int' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 16 Jan 2013 05:16:40 +0000 (13:16 +0800)]
Merge branch 'wip-MDL-36968-int' of git://github.com/marinaglancy/moodle

10 years agoMDL-36553: Admin settings: remove border attribute from HTML settings table
Rossiani Wijaya [Wed, 16 Jan 2013 05:15:40 +0000 (13:15 +0800)]
MDL-36553: Admin settings: remove border attribute from HTML settings table

10 years agoMDL-36968 Move function print_recent_activity() to the block recent_activity
Marina Glancy [Wed, 5 Dec 2012 01:55:16 +0000 (09:55 +0800)]
MDL-36968 Move function print_recent_activity() to the block recent_activity

10 years agoMerge branch 'w02_MDL-37187_m25_flatfile' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 16 Jan 2013 03:53:00 +0000 (11:53 +0800)]
Merge branch 'w02_MDL-37187_m25_flatfile' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-31484_anonymous_user_clash' of git://github.com/davosmith/moodle
Dan Poltawski [Wed, 16 Jan 2013 03:45:22 +0000 (11:45 +0800)]
Merge branch 'MDL-31484_anonymous_user_clash' of git://github.com/davosmith/moodle

10 years agoMerge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 16 Jan 2013 03:39:03 +0000 (11:39 +0800)]
Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle

10 years agoMDL-36708 files: Fixed missing key in array
Frederic Massart [Wed, 16 Jan 2013 03:28:14 +0000 (11:28 +0800)]
MDL-36708 files: Fixed missing key in array

10 years agoMerge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle
Dan Poltawski [Wed, 16 Jan 2013 03:18:18 +0000 (11:18 +0800)]
Merge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle

Conflicts:
files/renderer.php
lib/outputrenderers.php

10 years agoMerge branch 'w02_MDL-35899_m25_cohortsort' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 16 Jan 2013 03:09:21 +0000 (11:09 +0800)]
Merge branch 'w02_MDL-35899_m25_cohortsort' of git://github.com/skodak/moodle

10 years agoMerge branch 'w02_MDL-37175_m25_paypalmanage' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 16 Jan 2013 02:54:55 +0000 (10:54 +0800)]
Merge branch 'w02_MDL-37175_m25_paypalmanage' of git://github.com/skodak/moodle

10 years agoMerge branch 'w02_MDL-37184_m25_editenrol' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 16 Jan 2013 02:19:57 +0000 (10:19 +0800)]
Merge branch 'w02_MDL-37184_m25_editenrol' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-36412-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Wed, 16 Jan 2013 01:54:26 +0000 (09:54 +0800)]
Merge branch 'MDL-36412-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 01:27:48 +0000 (02:27 +0100)]
Merge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle

10 years agoMDL-37536 cache: fixed typo
Sam Hemelryk [Wed, 16 Jan 2013 01:22:58 +0000 (14:22 +1300)]
MDL-37536 cache: fixed typo

10 years agoMerge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 01:22:26 +0000 (02:22 +0100)]
Merge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle

Conflicts:
lib/upgrade.txt

10 years agoMerge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 01:05:27 +0000 (02:05 +0100)]
Merge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'w02_MDL-37019_m25_metadef' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 00:58:08 +0000 (01:58 +0100)]
Merge branch 'w02_MDL-37019_m25_metadef' of git://github.com/skodak/moodle

10 years agoMDL-35775 Whitespace fix.
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 00:30:19 +0000 (01:30 +0100)]
MDL-35775 Whitespace fix.

10 years agoMerge branch 'MDL-35775-master' of git://github.com/micaherne/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 00:28:53 +0000 (01:28 +0100)]
Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle

10 years agoMerge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 00:08:26 +0000 (01:08 +0100)]
Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle

Conflicts:
lib/db/caches.php

10 years agoMDL-23504 admin: fixed whitespace issue
Sam Hemelryk [Tue, 15 Jan 2013 23:00:37 +0000 (12:00 +1300)]
MDL-23504 admin: fixed whitespace issue

10 years agoMerge branch 'wip-mdl-23504' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 15 Jan 2013 22:06:39 +0000 (11:06 +1300)]
Merge branch 'wip-mdl-23504' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 15 Jan 2013 22:03:39 +0000 (11:03 +1300)]
Merge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle

10 years agoMerge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 15 Jan 2013 22:01:16 +0000 (11:01 +1300)]
Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle

Conflicts:
lib/deprecatedlib.php

10 years agoMerge branch 'MDL-37173-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 20:56:13 +0000 (21:56 +0100)]
Merge branch 'MDL-37173-m' of git://github.com/andrewnicols/moodle

10 years agoMerge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 20:50:31 +0000 (21:50 +0100)]
Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle

Conflicts:
message/tests/externallib_test.php

10 years agoMerge branch 'MDL-31726' of git://github.com/colchambers/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 20:44:38 +0000 (21:44 +0100)]
Merge branch 'MDL-31726' of git://github.com/colchambers/moodle

10 years agoMDL-36988 cleanup role switching
Petr Škoda [Fri, 7 Dec 2012 17:13:22 +0000 (18:13 +0100)]
MDL-36988 cleanup role switching

This patch uses local URLs in parameters because it is more compatible
with various security hacks. Session key is not added automatically to
return url for safety reasons - we do not want to execute some random
action again. POST pages are now returned to course page too.

10 years agoMDL-37184 document new general enrolment editing page
Petr Škoda [Tue, 15 Jan 2013 20:29:10 +0000 (21:29 +0100)]
MDL-37184 document new general enrolment editing page

10 years agoMDL-37429 document zip packer improvements
Petr Škoda [Tue, 15 Jan 2013 19:45:36 +0000 (20:45 +0100)]
MDL-37429 document zip packer improvements

10 years agoMerge branch 'MDL-31616' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 19:14:03 +0000 (20:14 +0100)]
Merge branch 'MDL-31616' of git://github.com/timhunt/moodle

10 years agoMerge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 19:04:21 +0000 (20:04 +0100)]
Merge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle

10 years agoNOBUG: 1 more whitespace, was hurting my eyes all the time.
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 18:19:04 +0000 (19:19 +0100)]
NOBUG: 1 more whitespace, was hurting my eyes all the time.

10 years agoMDL-33117 Whitespace fixes
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 18:09:57 +0000 (19:09 +0100)]
MDL-33117 Whitespace fixes

10 years agoMerge branch 'MDL-34883_unit_tests' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 17:21:12 +0000 (18:21 +0100)]
Merge branch 'MDL-34883_unit_tests' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 17:17:12 +0000 (18:17 +0100)]
Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-36553' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 17:12:20 +0000 (18:12 +0100)]
Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'MDL-36554' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 17:02:26 +0000 (18:02 +0100)]
Merge branch 'MDL-36554' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 17:00:17 +0000 (18:00 +0100)]
Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle

10 years agoMDL-37313 question: fix trailing whitespace
Dan Poltawski [Tue, 15 Jan 2013 08:36:14 +0000 (16:36 +0800)]
MDL-37313 question: fix trailing whitespace

10 years agoMerge branch 'MDL-37313' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 15 Jan 2013 08:35:17 +0000 (16:35 +0800)]
Merge branch 'MDL-37313' of git://github.com/jmvedrine/moodle

10 years agoMerge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 15 Jan 2013 08:04:57 +0000 (16:04 +0800)]
Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle

10 years agoMDL-30070 message: Web Services for contact list
Frederic Massart [Thu, 13 Dec 2012 08:25:36 +0000 (16:25 +0800)]
MDL-30070 message: Web Services for contact list

10 years agoMDL-30070 message: Optimised search for users over multiple courses
Frederic Massart [Fri, 14 Dec 2012 04:01:14 +0000 (12:01 +0800)]
MDL-30070 message: Optimised search for users over multiple courses

10 years agoMerge branch 'MDL-36529' of git://github.com/colchambers/moodle
Dan Poltawski [Tue, 15 Jan 2013 06:55:18 +0000 (14:55 +0800)]
Merge branch 'MDL-36529' of git://github.com/colchambers/moodle

10 years agoMerge branch 'MDL-36534' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 15 Jan 2013 06:44:28 +0000 (14:44 +0800)]
Merge branch 'MDL-36534' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 15 Jan 2013 06:32:22 +0000 (14:32 +0800)]
Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle

10 years agoMerge branch 'MDL-37381-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Tue, 15 Jan 2013 06:29:41 +0000 (14:29 +0800)]
Merge branch 'MDL-37381-master' of git://github.com/mouneyrac/moodle

10 years agoMDL-28705 enrol_imsenterprise Quick unit tests fix
David Monllao [Tue, 15 Jan 2013 06:20:05 +0000 (14:20 +0800)]
MDL-28705 enrol_imsenterprise Quick unit tests fix

10 years agoMerge branch 'w02_MDL-36898_m25_ccontact' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 15 Jan 2013 05:57:39 +0000 (13:57 +0800)]
Merge branch 'w02_MDL-36898_m25_ccontact' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 15 Jan 2013 05:55:50 +0000 (13:55 +0800)]
Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-37077-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 15 Jan 2013 05:54:40 +0000 (13:54 +0800)]
Merge branch 'MDL-37077-master' of git://github.com/ankitagarwal/moodle

10 years agoMDL-37077 phpunit: Adding phpunit tests for the ws api core_calendar_delete_event
Ankit Agarwal [Mon, 10 Dec 2012 08:18:07 +0000 (16:18 +0800)]
MDL-37077 phpunit: Adding phpunit tests for the ws api core_calendar_delete_event

10 years agoMDL-36708 files: Checking the size limit of a draft area does include references
Frederic Massart [Mon, 7 Jan 2013 09:24:19 +0000 (17:24 +0800)]
MDL-36708 files: Checking the size limit of a draft area does include references

10 years agoMerge branch 'w02_MDL-37391_m25_enrolconnection' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 15 Jan 2013 05:43:20 +0000 (13:43 +0800)]
Merge branch 'w02_MDL-37391_m25_enrolconnection' of git://github.com/skodak/moodle

10 years agoMerge branch 'w02_MDL-37064_m25_languser' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 15 Jan 2013 05:36:44 +0000 (13:36 +0800)]
Merge branch 'w02_MDL-37064_m25_languser' of git://github.com/skodak/moodle

10 years agoMDL-37077 webservices: Implementing the WS api core_calendar_delete_calendar_events()
Ankit Agarwal [Mon, 10 Dec 2012 06:03:51 +0000 (14:03 +0800)]
MDL-37077 webservices: Implementing the WS api core_calendar_delete_calendar_events()

10 years agoMDL-37077 webservices: Define the ws api method for deleting calendar events
Ankit Agarwal [Mon, 10 Dec 2012 05:27:25 +0000 (13:27 +0800)]
MDL-37077 webservices: Define the ws api method for deleting calendar events

10 years agoMerge branch 'MDL-37162_master' of git://github.com/pauln/moodle
Dan Poltawski [Tue, 15 Jan 2013 05:23:02 +0000 (13:23 +0800)]
Merge branch 'MDL-37162_master' of git://github.com/pauln/moodle

10 years agoMerge branch 'MDL-35556d' of git://github.com/srynot4sale/moodle
Dan Poltawski [Tue, 15 Jan 2013 05:15:31 +0000 (13:15 +0800)]
Merge branch 'MDL-35556d' of git://github.com/srynot4sale/moodle

10 years agoMerge branch 'MDL-33669' of git://github.com/equella/moodle
Dan Poltawski [Tue, 15 Jan 2013 05:13:53 +0000 (13:13 +0800)]
Merge branch 'MDL-33669' of git://github.com/equella/moodle

10 years agoMerge branch 'MDL-37355-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Tue, 15 Jan 2013 05:11:46 +0000 (13:11 +0800)]
Merge branch 'MDL-37355-master' of git://github.com/mouneyrac/moodle

10 years agoMerge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 15 Jan 2013 05:06:10 +0000 (13:06 +0800)]
Merge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-37374' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 15 Jan 2013 04:59:33 +0000 (12:59 +0800)]
Merge branch 'MDL-37374' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-35793' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 15 Jan 2013 04:56:51 +0000 (12:56 +0800)]
Merge branch 'MDL-35793' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 15 Jan 2013 04:54:28 +0000 (12:54 +0800)]
Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle

10 years agoMerge branch 'wip-MDL-30998-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 15 Jan 2013 04:51:48 +0000 (12:51 +0800)]
Merge branch 'wip-MDL-30998-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'wip-MDL-30316-master' of git://github.com/phalacee/moodle
Dan Poltawski [Tue, 15 Jan 2013 04:46:44 +0000 (12:46 +0800)]
Merge branch 'wip-MDL-30316-master' of git://github.com/phalacee/moodle

10 years agoMerge branch 'w02_MDL-29596_m25_editauth' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 15 Jan 2013 04:43:59 +0000 (12:43 +0800)]
Merge branch 'w02_MDL-29596_m25_editauth' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-29835_master' of git://github.com/pauln/moodle
Dan Poltawski [Tue, 15 Jan 2013 04:41:13 +0000 (12:41 +0800)]
Merge branch 'MDL-29835_master' of git://github.com/pauln/moodle

10 years agoMerge branch 'MDL-32341-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 15 Jan 2013 04:38:22 +0000 (12:38 +0800)]
Merge branch 'MDL-32341-master' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'MDL-37366-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 15 Jan 2013 04:10:10 +0000 (12:10 +0800)]
Merge branch 'MDL-37366-master' of git://github.com/andrewnicols/moodle

10 years agoMerge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 15 Jan 2013 03:56:12 +0000 (11:56 +0800)]
Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-36616-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 15 Jan 2013 03:48:11 +0000 (11:48 +0800)]
Merge branch 'MDL-36616-master' of git://github.com/FMCorz/moodle

10 years agoMDL-37085 - fix trailing whitespace
Dan Poltawski [Tue, 15 Jan 2013 03:42:30 +0000 (11:42 +0800)]
MDL-37085 - fix trailing whitespace

10 years agoMerge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 15 Jan 2013 03:30:36 +0000 (16:30 +1300)]
Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'MDL-36587-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 15 Jan 2013 03:19:40 +0000 (11:19 +0800)]
Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle

Conflicts:
mod/assign/locallib.php

10 years agoMerge branch 'MDL-37415-m' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 15 Jan 2013 03:09:27 +0000 (11:09 +0800)]
Merge branch 'MDL-37415-m' of git://github.com/andrewnicols/moodle

10 years agoMerge branch 'MDL-37413-m' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 15 Jan 2013 02:58:31 +0000 (10:58 +0800)]
Merge branch 'MDL-37413-m' of git://github.com/andrewnicols/moodle

10 years agoMerge branch 'MDL-37194-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Tue, 15 Jan 2013 02:42:31 +0000 (10:42 +0800)]
Merge branch 'MDL-37194-master' of git://github.com/mouneyrac/moodle

10 years agoMDL-37085 added missing get_renderer call
Marina Glancy [Tue, 15 Jan 2013 01:14:31 +0000 (12:14 +1100)]
MDL-37085 added missing get_renderer call

10 years agoMerge branch 'MDL-37431' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jan 2013 23:16:18 +0000 (00:16 +0100)]
Merge branch 'MDL-37431' of git://github.com/timhunt/moodle

10 years agoMerge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jan 2013 23:06:06 +0000 (00:06 +0100)]
Merge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'MDL-37456' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jan 2013 22:32:39 +0000 (23:32 +0100)]
Merge branch 'MDL-37456' of git://github.com/danpoltawski/moodle