moodle.git
8 years agoMerge branch 'wip-MDL-25928-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 17 Dec 2012 04:05:05 +0000 (12:05 +0800)]
Merge branch 'wip-MDL-25928-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'wip-MDL-35874-master' of git://github.com/phalacee/moodle
Dan Poltawski [Mon, 17 Dec 2012 03:52:55 +0000 (11:52 +0800)]
Merge branch 'wip-MDL-35874-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'wip-MDL-35979-master' of git://github.com/phalacee/moodle
Dan Poltawski [Mon, 17 Dec 2012 03:48:32 +0000 (11:48 +0800)]
Merge branch 'wip-MDL-35979-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'MDL-37078-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 17 Dec 2012 03:36:57 +0000 (11:36 +0800)]
Merge branch 'MDL-37078-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-37165-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 17 Dec 2012 03:30:27 +0000 (11:30 +0800)]
Merge branch 'MDL-37165-master' of git://github.com/damyon/moodle

8 years agoMDL-25928 course: Fixed course info on the combo list to be a popup
Sam Hemelryk [Mon, 17 Dec 2012 03:03:06 +0000 (16:03 +1300)]
MDL-25928 course: Fixed course info on the combo list to be a popup

8 years agoweekly on-sync release 2.5dev
Eloy Lafuente (stronk7) [Fri, 14 Dec 2012 12:33:07 +0000 (13:33 +0100)]
weekly on-sync release 2.5dev

8 years agoMDL-37165 Assignment: Oracle fix for count_submissions_with_status (and friends).
Damyon Wiese [Fri, 14 Dec 2012 07:10:06 +0000 (15:10 +0800)]
MDL-37165 Assignment: Oracle fix for count_submissions_with_status (and friends).

Oracle does not like the use of AS after a join.

8 years agoMerge branch 'MDL-30700-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Thu, 13 Dec 2012 09:31:59 +0000 (10:31 +0100)]
Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle

8 years agoMDL-35874 - Blocks - Adding a label to the 'Add a block' block's select field
Jason Fowler [Wed, 5 Dec 2012 06:24:53 +0000 (14:24 +0800)]
MDL-35874 - Blocks - Adding a label to the 'Add a block' block's select field

8 years agoMDL-30700 tablelib: Fixed get_sort_for_table to work with text sorting columns for...
Damyon Wiese [Thu, 13 Dec 2012 01:46:36 +0000 (09:46 +0800)]
MDL-30700 tablelib: Fixed get_sort_for_table to work with text sorting columns for oracle

This change stores the list of columns that require text sorting in the session,
so the static function "get_sort_for_table" can work without any additional parameters.

8 years agoMerge branch 'MDL-36897' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 13 Dec 2012 01:54:17 +0000 (09:54 +0800)]
Merge branch 'MDL-36897' of git://github.com/timhunt/moodle

8 years agoMDL-37078: Restore - section restore fails with multiple availability conditions
sam marshall [Wed, 12 Dec 2012 10:47:17 +0000 (10:47 +0000)]
MDL-37078: Restore - section restore fails with multiple availability conditions

8 years agoMDL-36897 quiz review: fixup previous commit.
Tim Hunt [Wed, 12 Dec 2012 08:12:16 +0000 (08:12 +0000)]
MDL-36897 quiz review: fixup previous commit.

8 years agoMDL-33448 enrol_manual: Reduced JS get_string calls for the yui widget
Sam Hemelryk [Thu, 1 Nov 2012 21:35:50 +0000 (10:35 +1300)]
MDL-33448 enrol_manual: Reduced JS get_string calls for the yui widget

8 years agoMDL-33448 enrol_manual: Reordered things to improve JS performance when enrolling...
Sam Hemelryk [Wed, 3 Oct 2012 01:38:25 +0000 (14:38 +1300)]
MDL-33448 enrol_manual: Reordered things to improve JS performance when enrolling users

8 years agoMDL-36644 Assignment: prepend the course upload limit to the options array
Cathal O'Riordan [Thu, 15 Nov 2012 12:18:05 +0000 (12:18 +0000)]
MDL-36644 Assignment: prepend the course upload limit to the options array

Ensure that the course upload limit is the first option in the list of available choices for the Maximum submission size select.

8 years agoMerge branch 'master_MDL-35737' of git://github.com/danmarsden/moodle
Dan Poltawski [Wed, 12 Dec 2012 00:43:29 +0000 (08:43 +0800)]
Merge branch 'master_MDL-35737' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-27619_master' of git://github.com/pauln/moodle
Sam Hemelryk [Tue, 11 Dec 2012 22:10:05 +0000 (11:10 +1300)]
Merge branch 'MDL-27619_master' of git://github.com/pauln/moodle

8 years agoMerge branch 'MDL-32880_master_3' of git://github.com/pauln/moodle
Eloy Lafuente (stronk7) [Tue, 11 Dec 2012 21:48:06 +0000 (22:48 +0100)]
Merge branch 'MDL-32880_master_3' of git://github.com/pauln/moodle

8 years agoMerge branch 'm24_MDL-36641_Missing_external_package_HTTP_check' of https://github...
Eloy Lafuente (stronk7) [Tue, 11 Dec 2012 21:42:09 +0000 (22:42 +0100)]
Merge branch 'm24_MDL-36641_Missing_external_package_HTTP_check' of https://github.com/scara/moodle

8 years agoMDL-29805 redirect: added check REQUIRE_CORRECT_ACCESS is true
Sam Hemelryk [Tue, 11 Dec 2012 20:46:45 +0000 (09:46 +1300)]
MDL-29805 redirect: added check REQUIRE_CORRECT_ACCESS is true

8 years agoMerge branch 'MDL-29805-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 11 Dec 2012 20:45:29 +0000 (09:45 +1300)]
Merge branch 'MDL-29805-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-35593-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 11 Dec 2012 20:38:43 +0000 (09:38 +1300)]
Merge branch 'MDL-35593-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'wip_master_mdl-37088_bad_operator_ldap_sync_user' of https://github...
Sam Hemelryk [Tue, 11 Dec 2012 20:35:27 +0000 (09:35 +1300)]
Merge branch 'wip_master_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle

8 years agoMerge branch 'MDL-36321_message_participants' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 11 Dec 2012 20:29:33 +0000 (09:29 +1300)]
Merge branch 'MDL-36321_message_participants' of git://github.com/andyjdavis/moodle

8 years agoMerge branch 'MDL-30700-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 11 Dec 2012 18:56:31 +0000 (19:56 +0100)]
Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle

8 years agoMDL-37032 upgrade: define all the 2.4.0 points
Eloy Lafuente (stronk7) [Tue, 11 Dec 2012 12:11:11 +0000 (13:11 +0100)]
MDL-37032 upgrade: define all the 2.4.0 points

8 years agoMerge branch 'w49_MDL-36447_m25_gdtest' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 11 Dec 2012 09:54:24 +0000 (17:54 +0800)]
Merge branch 'w49_MDL-36447_m25_gdtest' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-37098' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 11 Dec 2012 09:51:50 +0000 (17:51 +0800)]
Merge branch 'MDL-37098' of git://github.com/timhunt/moodle

8 years agoMDL-37098 quiz: event handler fails deleting group with no overrides
Tim Hunt [Tue, 11 Dec 2012 09:02:07 +0000 (09:02 +0000)]
MDL-37098 quiz: event handler fails deleting group with no overrides

This was a regression from MDL-35717.

8 years agoMerge branch 'MDL-36243' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 11 Dec 2012 08:24:10 +0000 (16:24 +0800)]
Merge branch 'MDL-36243' of git://github.com/jmvedrine/moodle

8 years agoMerge branch 'wip-MDL-36108-master' of git://github.com/phalacee/moodle
Dan Poltawski [Tue, 11 Dec 2012 08:03:09 +0000 (16:03 +0800)]
Merge branch 'wip-MDL-36108-master' of git://github.com/phalacee/moodle

8 years agoMDL-36108 - Blocks - Online User block's user image's alt attribute is now empty...
Jason Fowler [Tue, 4 Dec 2012 07:57:30 +0000 (15:57 +0800)]
MDL-36108 - Blocks - Online User block's user image's alt attribute is now empty to prevent repetition of text for screen readers

8 years agoMDL-30700 Assignment 2.2: Added text_sorting function to tablelib
Damyon Wiese [Tue, 11 Dec 2012 06:47:33 +0000 (14:47 +0800)]
MDL-30700 Assignment 2.2: Added text_sorting function to tablelib

Allows oracle to sort by text (clob) columns (should be used sparingly).

8 years agoMerge branch 'wip-MDL-36938-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 11 Dec 2012 07:18:50 +0000 (15:18 +0800)]
Merge branch 'wip-MDL-36938-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-36712-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 11 Dec 2012 06:00:25 +0000 (14:00 +0800)]
Merge branch 'MDL-36712-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-36591-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 11 Dec 2012 05:56:28 +0000 (13:56 +0800)]
Merge branch 'MDL-36591-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-36897' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 11 Dec 2012 05:54:15 +0000 (13:54 +0800)]
Merge branch 'MDL-36897' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-34791-master' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 11 Dec 2012 05:22:42 +0000 (13:22 +0800)]
Merge branch 'MDL-34791-master' of git://git.luns.net.uk/moodle

8 years agoMerge branch 'MDL-36808-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 11 Dec 2012 04:18:12 +0000 (12:18 +0800)]
Merge branch 'MDL-36808-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'w49_MDL-36983_m25_ordertext' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 11 Dec 2012 04:09:10 +0000 (12:09 +0800)]
Merge branch 'w49_MDL-36983_m25_ordertext' of git://github.com/skodak/moodle

8 years agoMerge branch 'w49_MDL-36892_m25_enrolreadme' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 11 Dec 2012 04:07:06 +0000 (12:07 +0800)]
Merge branch 'w49_MDL-36892_m25_enrolreadme' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-36845' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 11 Dec 2012 03:58:44 +0000 (11:58 +0800)]
Merge branch 'MDL-36845' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-36828' of https://github.com/aolley/moodle
Dan Poltawski [Tue, 11 Dec 2012 03:44:11 +0000 (11:44 +0800)]
Merge branch 'MDL-36828' of https://github.com/aolley/moodle

8 years agoMerge branch 'wip-MDL-36110-master' of git://github.com/phalacee/moodle
Dan Poltawski [Tue, 11 Dec 2012 03:32:53 +0000 (11:32 +0800)]
Merge branch 'wip-MDL-36110-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'wip-MDL-35884-master' of git://github.com/phalacee/moodle
Dan Poltawski [Tue, 11 Dec 2012 03:17:29 +0000 (11:17 +0800)]
Merge branch 'wip-MDL-35884-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'MDL-36650' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 11 Dec 2012 03:11:13 +0000 (16:11 +1300)]
Merge branch 'MDL-36650' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-36025-negative-zero' of git://github.com/mpetrowi/moodle
Dan Poltawski [Tue, 11 Dec 2012 03:06:28 +0000 (11:06 +0800)]
Merge branch 'MDL-36025-negative-zero' of git://github.com/mpetrowi/moodle

8 years agoMerge branch 'w49_MDL-36731_m25_uploadestrict' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 11 Dec 2012 03:04:31 +0000 (16:04 +1300)]
Merge branch 'w49_MDL-36731_m25_uploadestrict' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-35476-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 11 Dec 2012 02:49:12 +0000 (10:49 +0800)]
Merge branch 'MDL-35476-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-36905' of git://github.com/rwijaya/moodle
Sam Hemelryk [Tue, 11 Dec 2012 02:44:37 +0000 (15:44 +1300)]
Merge branch 'MDL-36905' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-36916' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 11 Dec 2012 02:42:13 +0000 (15:42 +1300)]
Merge branch 'MDL-36916' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-34052-master' of https://github.com/damyon/moodle
Dan Poltawski [Tue, 11 Dec 2012 02:39:19 +0000 (10:39 +0800)]
Merge branch 'MDL-34052-master' of https://github.com/damyon/moodle

8 years agoMerge branch 'w49_MDL-36936_m25_composerdev' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 11 Dec 2012 02:35:07 +0000 (15:35 +1300)]
Merge branch 'w49_MDL-36936_m25_composerdev' of git://github.com/skodak/moodle

8 years agoMerge branch 'w49_MDL-31424_m25_paypalcase' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 11 Dec 2012 02:31:33 +0000 (10:31 +0800)]
Merge branch 'w49_MDL-31424_m25_paypalcase' of git://github.com/skodak/moodle

8 years agoMerge branch 'w49_MDL-37060_m25_sessinit' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 11 Dec 2012 02:27:26 +0000 (15:27 +1300)]
Merge branch 'w49_MDL-37060_m25_sessinit' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-36942' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 11 Dec 2012 02:04:22 +0000 (15:04 +1300)]
Merge branch 'MDL-36942' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-36954' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 11 Dec 2012 01:59:56 +0000 (14:59 +1300)]
Merge branch 'MDL-36954' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-36773-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Tue, 11 Dec 2012 01:56:40 +0000 (09:56 +0800)]
Merge branch 'MDL-36773-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'wip-mdl-37017' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 11 Dec 2012 01:54:16 +0000 (14:54 +1300)]
Merge branch 'wip-mdl-37017' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'w49_MDL-37061_m25_invalidlang' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 11 Dec 2012 01:44:08 +0000 (14:44 +1300)]
Merge branch 'w49_MDL-37061_m25_invalidlang' of git://github.com/skodak/moodle

8 years agoMerge branch 'w49_MDL-29442_m25_entityutf8' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 10 Dec 2012 21:22:19 +0000 (10:22 +1300)]
Merge branch 'w49_MDL-29442_m25_entityutf8' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-36263-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 10 Dec 2012 21:17:57 +0000 (10:17 +1300)]
Merge branch 'MDL-36263-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-37020-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Mon, 10 Dec 2012 20:48:05 +0000 (09:48 +1300)]
Merge branch 'MDL-37020-master' of https://github.com/mackensen/moodle

8 years agoMerge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Dec 2012 20:42:17 +0000 (09:42 +1300)]
Merge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle

8 years agoMerge branch 'MDL-36805-master' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Dec 2012 20:16:47 +0000 (09:16 +1300)]
Merge branch 'MDL-36805-master' of git://git.luns.net.uk/moodle

8 years agoMerge branch 'wip-MDL-37011' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 10 Dec 2012 19:42:40 +0000 (08:42 +1300)]
Merge branch 'wip-MDL-37011' of git://github.com/abgreeve/moodle

8 years agoMDL-37088 auth_ldap: bad operator in ldap sync_user() method
Iñaki Arenaza [Mon, 10 Dec 2012 15:47:03 +0000 (16:47 +0100)]
MDL-37088 auth_ldap: bad operator in ldap sync_user() method

8 years agoMDL-34791 AJAX Update a graded activity's title in the gradebook on rename
Andrew Robert Nicols [Thu, 22 Nov 2012 12:07:09 +0000 (12:07 +0000)]
MDL-34791 AJAX Update a graded activity's title in the gradebook on rename

8 years agoMDL-36755 course_overview block: fix for fix.
Dan Poltawski [Mon, 10 Dec 2012 11:44:26 +0000 (19:44 +0800)]
MDL-36755 course_overview block: fix for fix.

I will stop commiting now.

8 years agoMDL-36755 course_overview block: fix idiot version
Dan Poltawski [Mon, 10 Dec 2012 11:41:16 +0000 (19:41 +0800)]
MDL-36755 course_overview block: fix idiot version

I will shoot the programmer responsible for this mess.

8 years agoMerge branch 'w49_MDL-36737_m25_glossstrict' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 10 Dec 2012 11:37:24 +0000 (19:37 +0800)]
Merge branch 'w49_MDL-36737_m25_glossstrict' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-36755_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 10 Dec 2012 11:32:10 +0000 (19:32 +0800)]
Merge branch 'MDL-36755_master' of git://github.com/markn86/moodle

Conflicts:
blocks/course_overview/version.php

8 years agoMDL-36167 fix trailing whitespace
Dan Poltawski [Mon, 10 Dec 2012 09:35:58 +0000 (17:35 +0800)]
MDL-36167 fix trailing whitespace

8 years agoMerge branch 'MDL-36167-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 10 Dec 2012 09:31:41 +0000 (17:31 +0800)]
Merge branch 'MDL-36167-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-36732' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 10 Dec 2012 07:17:46 +0000 (15:17 +0800)]
Merge branch 'MDL-36732' of git://github.com/timhunt/moodle

8 years agoMDL-36263 Assignment: Do not count submissions of unenrolled users
Damyon Wiese [Fri, 30 Nov 2012 04:41:23 +0000 (12:41 +0800)]
MDL-36263 Assignment: Do not count submissions of unenrolled users

8 years agoMDL-36908 Assignment: Additional fixes for preventing empty submissions
Damyon Wiese [Thu, 29 Nov 2012 04:26:22 +0000 (12:26 +0800)]
MDL-36908 Assignment: Additional fixes for preventing empty submissions

8 years agoMerge branch 'MDL-36549' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 10 Dec 2012 06:18:32 +0000 (14:18 +0800)]
Merge branch 'MDL-36549' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-36856' of git://github.com/kastashov/moodle
Dan Poltawski [Mon, 10 Dec 2012 06:04:22 +0000 (14:04 +0800)]
Merge branch 'MDL-36856' of git://github.com/kastashov/moodle

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

8 years agoMerge branch 'MDL-36538_webdav_memory' of git://github.com/davosmith/moodle
Dan Poltawski [Mon, 10 Dec 2012 05:06:37 +0000 (13:06 +0800)]
Merge branch 'MDL-36538_webdav_memory' of git://github.com/davosmith/moodle

8 years agoMerge branch 'w49_MDL-35456_m25_paypal' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 10 Dec 2012 04:03:03 +0000 (12:03 +0800)]
Merge branch 'w49_MDL-35456_m25_paypal' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-35404' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 10 Dec 2012 03:36:38 +0000 (11:36 +0800)]
Merge branch 'MDL-35404' of git://github.com/timhunt/moodle

8 years agoMerge branch 'wip-MDL-36939-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 10 Dec 2012 03:08:42 +0000 (11:08 +0800)]
Merge branch 'wip-MDL-36939-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-30961-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 10 Dec 2012 01:59:42 +0000 (14:59 +1300)]
Merge branch 'MDL-30961-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-36680_hidden' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 10 Dec 2012 01:56:09 +0000 (09:56 +0800)]
Merge branch 'MDL-36680_hidden' of git://github.com/andyjdavis/moodle

8 years agoMerge branch 'MDL-36946-master' of git://github.com/micaherne/moodle
Sam Hemelryk [Mon, 10 Dec 2012 01:43:40 +0000 (14:43 +1300)]
Merge branch 'MDL-36946-master' of git://github.com/micaherne/moodle

8 years agoMerge branch 'MDL-34592_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 10 Dec 2012 01:28:44 +0000 (14:28 +1300)]
Merge branch 'MDL-34592_master' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'MDL-36608_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 10 Dec 2012 01:24:39 +0000 (14:24 +1300)]
Merge branch 'MDL-36608_master' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'MDL-36978' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 10 Dec 2012 01:21:37 +0000 (14:21 +1300)]
Merge branch 'MDL-36978' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'MDL-36579_modLtiBackupFields' of git://github.com/moodlerooms/moodle
Sam Hemelryk [Mon, 10 Dec 2012 01:16:00 +0000 (14:16 +1300)]
Merge branch 'MDL-36579_modLtiBackupFields' of git://github.com/moodlerooms/moodle

8 years agoMDL-36607: Improve block drag and drop
Mark Nielsen [Wed, 14 Nov 2012 23:35:14 +0000 (15:35 -0800)]
MDL-36607: Improve block drag and drop

* Adding support for subpage
* Adding support for regions that do not start with "side-"

8 years agoMerge branch 'MDL-35954_master' of git://github.com/markn86/moodle
Sam Hemelryk [Mon, 10 Dec 2012 01:08:06 +0000 (14:08 +1300)]
Merge branch 'MDL-35954_master' of git://github.com/markn86/moodle

8 years agoMDL-37011 - themes: Fixed the alignment of the edit and help icon on the participants...
Adrian Greeve [Wed, 5 Dec 2012 08:37:45 +0000 (16:37 +0800)]
MDL-37011 - themes: Fixed the alignment of the edit and help icon on the participants page.

8 years agoMerge branch 'MDL-36433-master' of git://github.com/itamart/moodle
Sam Hemelryk [Sun, 9 Dec 2012 23:13:32 +0000 (12:13 +1300)]
Merge branch 'MDL-36433-master' of git://github.com/itamart/moodle

8 years agoMerge branch 'MDL-36764' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 9 Dec 2012 22:54:01 +0000 (11:54 +1300)]
Merge branch 'MDL-36764' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-36778' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 9 Dec 2012 22:51:38 +0000 (11:51 +1300)]
Merge branch 'MDL-36778' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-36887' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 9 Dec 2012 22:48:22 +0000 (11:48 +1300)]
Merge branch 'MDL-36887' of git://github.com/danpoltawski/moodle