moodle.git
8 years agoMerge branch 'MDL-37539-master' of github.com:damyon/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 01:10:47 +0000 (02:10 +0100)]
Merge branch 'MDL-37539-master' of github.com:damyon/moodle

8 years agoMerge branch 'MDL-37358-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Tue, 22 Jan 2013 01:05:46 +0000 (09:05 +0800)]
Merge branch 'MDL-37358-master' of git://github.com/mouneyrac/moodle

8 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.

8 years agoMerge branch 'MDL-36104_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:11:48 +0000 (01:11 +0100)]
Merge branch 'MDL-36104_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-37539-master' of github.com:damyon/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:05:54 +0000 (01:05 +0100)]
Merge branch 'MDL-37539-master' of github.com:damyon/moodle

8 years agoMerge branch 'MDL-28512' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:02:12 +0000 (01:02 +0100)]
Merge branch 'MDL-28512' of git://github.com/timhunt/moodle

8 years agoMerge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 23:52:42 +0000 (00:52 +0100)]
Merge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)]
Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-37563-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 21 Jan 2013 20:10:44 +0000 (09:10 +1300)]
Merge branch 'MDL-37563-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 19:08:12 +0000 (20:08 +0100)]
Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-37577' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 19:01:39 +0000 (20:01 +0100)]
Merge branch 'MDL-37577' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-35924_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 18:41:45 +0000 (19:41 +0100)]
Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-34050' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 15:47:18 +0000 (16:47 +0100)]
Merge branch 'MDL-34050' of git://github.com/rwijaya/moodle

8 years agoMDL-37577 quiz overdue handling: optimise database query
Tim Hunt [Fri, 18 Jan 2013 16:43:48 +0000 (16:43 +0000)]
MDL-37577 quiz overdue handling: optimise database query

This is the standard trick of adding a redundant WHERE clause to a
subquery to help the database realise that it does not have to inspect
so many rows.

8 years agoMerge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Mon, 21 Jan 2013 09:06:09 +0000 (17:06 +0800)]
Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'w03_MDL-37559_m25_otherusers' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 21 Jan 2013 07:26:13 +0000 (15:26 +0800)]
Merge branch 'w03_MDL-37559_m25_otherusers' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-37571' of git://github.com/tmuras/moodle
Aparup Banerjee [Mon, 21 Jan 2013 07:05:46 +0000 (15:05 +0800)]
Merge branch 'MDL-37571' of git://github.com/tmuras/moodle

8 years agoMDL-37541 Wikimedia returns more information about images
Marina Glancy [Wed, 16 Jan 2013 04:19:15 +0000 (15:19 +1100)]
MDL-37541 Wikimedia returns more information about images

8 years agoMDL-36104 mod_assign: added hidden labels to the feedback input fields
Mark Nelson [Tue, 15 Jan 2013 09:03:00 +0000 (17:03 +0800)]
MDL-36104 mod_assign: added hidden labels to the feedback input fields

8 years agoMerge branch 'wip-MDL-37591_master' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Mon, 21 Jan 2013 04:49:15 +0000 (12:49 +0800)]
Merge branch 'wip-MDL-37591_master' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'wip-MDL-37592_master' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Mon, 21 Jan 2013 04:38:13 +0000 (12:38 +0800)]
Merge branch 'wip-MDL-37592_master' of git://github.com/lazydaisy/moodle

8 years agoMDL-37352 core_grade:fixed some ajax display issues
Andrew Davis [Thu, 10 Jan 2013 06:57:32 +0000 (14:57 +0800)]
MDL-37352 core_grade:fixed some ajax display issues

8 years agoMerge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)]
Merge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:53:12 +0000 (10:53 +0800)]
Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle

8 years agoMDL-37432 Calendar: If Calendar url is invalid then remove invalid subscription
Rajesh Taneja [Tue, 15 Jan 2013 08:29:16 +0000 (16:29 +0800)]
MDL-37432 Calendar: If Calendar url is invalid then remove invalid subscription

8 years agoMDL-37432 Calendar: Added check for empty calendar url
Rajesh Taneja [Tue, 15 Jan 2013 03:48:29 +0000 (11:48 +0800)]
MDL-37432 Calendar: Added check for empty calendar url

8 years agoMerge branch 'MDL-30769_iframe' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:25:42 +0000 (10:25 +0800)]
Merge branch 'MDL-30769_iframe' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'wip-mdl-36674' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:15:16 +0000 (10:15 +0800)]
Merge branch 'wip-mdl-36674' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-35074_master_2' of git://github.com/pauln/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:07:43 +0000 (10:07 +0800)]
Merge branch 'MDL-35074_master_2' of git://github.com/pauln/moodle

8 years agoMerge branch 'MDL-37527-master' of github.com:damyon/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:03:34 +0000 (10:03 +0800)]
Merge branch 'MDL-37527-master' of github.com:damyon/moodle

8 years agoMerge branch 'MDL-32652_master' of git://github.com/pauln/moodle
Dan Poltawski [Mon, 21 Jan 2013 01:59:35 +0000 (09:59 +0800)]
Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle

8 years agoMerge branch 'w03_MDL-36809_m25_mysqlipers' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 21 Jan 2013 01:04:57 +0000 (09:04 +0800)]
Merge branch 'w03_MDL-36809_m25_mysqlipers' of git://github.com/skodak/moodle

8 years agoMerge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 21 Jan 2013 01:01:00 +0000 (09:01 +0800)]
Merge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle

8 years agoMDL-37592 admin/toot/xmldb/actions/: changed all instances of generalbox class to...
Mary Evans [Sun, 20 Jan 2013 22:23:53 +0000 (22:23 +0000)]
MDL-37592 admin/toot/xmldb/actions/: changed all instances of generalbox class to generaltable class in twelve files as listed.

8 years agoMDL-37591 admin/mnet: replaced generalbox class with generaltable
Mary Evans [Sun, 20 Jan 2013 21:52:09 +0000 (21:52 +0000)]
MDL-37591 admin/mnet: replaced generalbox class with generaltable

8 years agoMerge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 20 Jan 2013 21:18:33 +0000 (10:18 +1300)]
Merge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-35817' of git://github.com/rwijaya/moodle
Sam Hemelryk [Sun, 20 Jan 2013 20:47:00 +0000 (09:47 +1300)]
Merge branch 'MDL-35817' of git://github.com/rwijaya/moodle

8 years agoMDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade...
Andrew Davis [Wed, 19 Dec 2012 01:46:16 +0000 (09:46 +0800)]
MDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade items

8 years agoMDL-37559 fix display of multiple roles of other users
Petr Škoda [Sat, 19 Jan 2013 15:50:38 +0000 (16:50 +0100)]
MDL-37559 fix display of multiple roles of other users

Credit goes to Tyron Delean, thanks.

8 years agoMDL-36809 add support for mysqli persistent connections
Petr Škoda [Sat, 24 Nov 2012 09:47:28 +0000 (10:47 +0100)]
MDL-36809 add support for mysqli persistent connections

8 years agoMDL-36411 make sure asserts in setUp() do not cause problems
Petr Škoda [Sat, 10 Nov 2012 12:09:16 +0000 (13:09 +0100)]
MDL-36411 make sure asserts in setUp() do not cause problems

8 years agoMDL-28512 qtype essay: clean up garbage qtype_essay_options rows.
Tim Hunt [Fri, 18 Jan 2013 12:20:10 +0000 (12:20 +0000)]
MDL-28512 qtype essay: clean up garbage qtype_essay_options rows.

8 years agoMDL-28512 qtype essay: clean up properly when a question is deleted.
Tim Hunt [Fri, 18 Jan 2013 11:27:53 +0000 (11:27 +0000)]
MDL-28512 qtype essay: clean up properly when a question is deleted.

8 years agoMDL-35924 filemanager: added label for the input field when creating a new folder
Mark Nelson [Tue, 15 Jan 2013 10:15:14 +0000 (18:15 +0800)]
MDL-35924 filemanager: added label for the input field when creating a new folder

8 years agoweekly release 2.5dev
Dan Poltawski [Fri, 18 Jan 2013 06:28:36 +0000 (14:28 +0800)]
weekly release 2.5dev

8 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Dan Poltawski [Fri, 18 Jan 2013 06:27:21 +0000 (14:27 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

8 years agoMDL-30769 - URL module: always use iframe instead of problematic object tag
Petr Skoda [Fri, 18 Jan 2013 03:11:49 +0000 (11:11 +0800)]
MDL-30769 - URL module: always use iframe instead of problematic object tag

8 years agoMDL-37458 testing common methods generalization
David Monllao [Fri, 11 Jan 2013 09:34:24 +0000 (17:34 +0800)]
MDL-37458 testing common methods generalization

8 years agoMDL-37571 Correct form element id.
Tomasz Muras [Thu, 17 Jan 2013 22:03:27 +0000 (23:03 +0100)]
MDL-37571 Correct form element id.

8 years agoMDL-37429 hack around zip limitations in PHP versions < 5.3.10
Petr Škoda [Thu, 17 Jan 2013 15:38:47 +0000 (16:38 +0100)]
MDL-37429 hack around zip limitations in PHP versions < 5.3.10

8 years agoMDL-31682 - fix for online text assignments
Dan Poltawski [Thu, 17 Jan 2013 07:48:29 +0000 (15:48 +0800)]
MDL-31682 - fix for online text assignments

8 years agoMDL-37085 bug fix with glued together class names
Marina Glancy [Thu, 17 Jan 2013 03:24:05 +0000 (14:24 +1100)]
MDL-37085 bug fix with glued together class names

8 years agoMDL-37458 testing tests finder externalization
David Monllao [Mon, 15 Oct 2012 05:00:16 +0000 (13:00 +0800)]
MDL-37458 testing tests finder externalization

8 years agoMDL-37563 Assignment upgrade: Upgrade conditional activity settings.
Damyon Wiese [Thu, 17 Jan 2013 06:00:46 +0000 (14:00 +0800)]
MDL-37563 Assignment upgrade: Upgrade conditional activity settings.

8 years agoMerge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Thu, 17 Jan 2013 05:47:25 +0000 (13:47 +0800)]
Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle

8 years agoMDL-29534 Forum: Fixed userfrom reference problem
Rajesh Taneja [Thu, 17 Jan 2013 05:45:01 +0000 (13:45 +0800)]
MDL-29534 Forum: Fixed userfrom reference problem

8 years agoMDL-35817 login: convert html tag to use html_writer and change <a> tag id to be...
Rossiani Wijaya [Thu, 17 Jan 2013 05:01:27 +0000 (13:01 +0800)]
MDL-35817 login: convert html tag to use html_writer and change <a> tag id to be more specific to login

8 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.

8 years agoMDL-35780 Administration: current user email should be always displayed on participan...
Rajesh Taneja [Thu, 17 Jan 2013 03:50:23 +0000 (11:50 +0800)]
MDL-35780 Administration: current user email should be always displayed on participants page

8 years agoMDL-29749 files: Improved params PARAM_PATH and PARAM_FILE
Frederic Massart [Wed, 16 Jan 2013 07:53:10 +0000 (15:53 +0800)]
MDL-29749 files: Improved params PARAM_PATH and PARAM_FILE

The logic change here allows for multiple dots to be part
of a file name or folder name. Most Unit Tests have not
been altered and reflect the exact logic as it was before.

8 years agoMerge branch 'wip-MDL-34398-m25-integration' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 17 Jan 2013 02:36:10 +0000 (10:36 +0800)]
Merge branch 'wip-MDL-34398-m25-integration' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-37374' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 17 Jan 2013 02:22:55 +0000 (10:22 +0800)]
Merge branch 'MDL-37374' of git://github.com/timhunt/moodle

8 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

8 years agoMDL-34398 groups: implemented caching of group information.
Sam Hemelryk [Thu, 20 Dec 2012 20:43:31 +0000 (09:43 +1300)]
MDL-34398 groups: implemented caching of group information.

8 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

8 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

8 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.

8 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

8 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.

8 years agoMDL-37374 questions: fix property_exists calls.
Tim Hunt [Wed, 16 Jan 2013 11:13:53 +0000 (11:13 +0000)]
MDL-37374 questions: fix property_exists calls.

8 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

8 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

8 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

8 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

8 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

8 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.

8 years agoMDL-37458 testing lock externalization
David Monllao [Fri, 11 Jan 2013 05:57:19 +0000 (13:57 +0800)]
MDL-37458 testing lock externalization

8 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

8 years agoMDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)
Damyon Wiese [Wed, 16 Jan 2013 04:26:23 +0000 (12:26 +0800)]
MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)

Reported by Mark Neilsen.

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 16 Jan 2013 00:43:42 +0000 (00:43 +0000)]
Automatically generated installer lang files

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

8 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