Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 15:47:18 +0000 (16:47 +0100)]
Merge branch 'MDL-34050' of git://github.com/rwijaya/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
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
Aparup Banerjee [Mon, 21 Jan 2013 07:05:46 +0000 (15:05 +0800)]
Merge branch 'MDL-37571' of git://github.com/tmuras/moodle
Marina Glancy [Wed, 16 Jan 2013 04:19:15 +0000 (15:19 +1100)]
MDL-37541 Wikimedia returns more information about images
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
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
Andrew Davis [Thu, 10 Jan 2013 06:57:32 +0000 (14:57 +0800)]
MDL-37352 core_grade:fixed some ajax display issues
Dan Poltawski [Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)]
Merge branch 'MDL-37458_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
Dan Poltawski [Mon, 21 Jan 2013 02:25:42 +0000 (10:25 +0800)]
Merge branch 'MDL-30769_iframe' of git://github.com/rwijaya/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
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
Dan Poltawski [Mon, 21 Jan 2013 02:03:34 +0000 (10:03 +0800)]
Merge branch 'MDL-37527-master' of github.com:damyon/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
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
Dan Poltawski [Mon, 21 Jan 2013 01:01:00 +0000 (09:01 +0800)]
Merge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle
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.
Mary Evans [Sun, 20 Jan 2013 21:52:09 +0000 (21:52 +0000)]
MDL-37591 admin/mnet: replaced generalbox class with generaltable
Sam Hemelryk [Sun, 20 Jan 2013 21:18:33 +0000 (10:18 +1300)]
Merge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 20 Jan 2013 20:47:00 +0000 (09:47 +1300)]
Merge branch 'MDL-35817' of git://github.com/rwijaya/moodle
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
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.
Petr Škoda [Sat, 24 Nov 2012 09:47:28 +0000 (10:47 +0100)]
MDL-36809 add support for mysqli persistent connections
Dan Poltawski [Fri, 18 Jan 2013 06:28:36 +0000 (14:28 +0800)]
weekly release 2.5dev
Dan Poltawski [Fri, 18 Jan 2013 06:27:21 +0000 (14:27 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
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
David Monllao [Fri, 11 Jan 2013 09:34:24 +0000 (17:34 +0800)]
MDL-37458 testing common methods generalization
Tomasz Muras [Thu, 17 Jan 2013 22:03:27 +0000 (23:03 +0100)]
MDL-37571 Correct form element id.
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
Dan Poltawski [Thu, 17 Jan 2013 07:48:29 +0000 (15:48 +0800)]
MDL-31682 - fix for online text assignments
Marina Glancy [Thu, 17 Jan 2013 03:24:05 +0000 (14:24 +1100)]
MDL-37085 bug fix with glued together class names
David Monllao [Mon, 15 Oct 2012 05:00:16 +0000 (13:00 +0800)]
MDL-37458 testing tests finder externalization
Dan Poltawski [Thu, 17 Jan 2013 05:47:25 +0000 (13:47 +0800)]
Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 17 Jan 2013 05:45:01 +0000 (13:45 +0800)]
MDL-29534 Forum: Fixed userfrom reference problem
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
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
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
Dan Poltawski [Thu, 17 Jan 2013 02:22:55 +0000 (10:22 +0800)]
Merge branch 'MDL-37374' of git://github.com/timhunt/moodle
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
Sam Hemelryk [Thu, 20 Dec 2012 20:43:31 +0000 (09:43 +1300)]
MDL-34398 groups: implemented caching of group information.
Sam Hemelryk [Wed, 16 Jan 2013 20:15:26 +0000 (09:15 +1300)]
MDL-36035 course: fixed typo in function name
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 19:52:47 +0000 (20:52 +0100)]
Merge branch 'MDL-37555' of git://github.com/stronk7/moodle
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.
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 15:15:56 +0000 (16:15 +0100)]
MDL-37555 Apply realpath() 2 CFG->phpunit_dataroot
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 14:57:46 +0000 (15:57 +0100)]
NOBUG: mini-bump to help cache definitions.
Tim Hunt [Wed, 16 Jan 2013 11:13:53 +0000 (11:13 +0000)]
MDL-37374 questions: fix property_exists calls.
Marina Glancy [Wed, 16 Jan 2013 06:58:15 +0000 (17:58 +1100)]
MDL-37207 modchoosertoggle: added checks that user can update course
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
Marina Glancy [Wed, 16 Jan 2013 06:14:51 +0000 (17:14 +1100)]
MDL-37085 changed echo to return - little bug fix
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
Dan Poltawski [Wed, 16 Jan 2013 05:49:34 +0000 (13:49 +0800)]
Merge branch 'MDL-37546-master' of github.com:damyon/moodle
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.
David Monllao [Fri, 11 Jan 2013 05:57:19 +0000 (13:57 +0800)]
MDL-37458 testing lock externalization
Sam Hemelryk [Wed, 16 Jan 2013 05:22:04 +0000 (18:22 +1300)]
Merge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle
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.
Dan Poltawski [Wed, 16 Jan 2013 05:19:36 +0000 (13:19 +0800)]
Merge branch 'MDL-36553' of git://github.com/rwijaya/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
Rossiani Wijaya [Wed, 16 Jan 2013 05:15:40 +0000 (13:15 +0800)]
MDL-36553: Admin settings: remove border attribute from HTML settings table
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
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
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
Dan Poltawski [Wed, 16 Jan 2013 03:39:03 +0000 (11:39 +0800)]
Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
Frederic Massart [Wed, 16 Jan 2013 03:28:14 +0000 (11:28 +0800)]
MDL-36708 files: Fixed missing key in array
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
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
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
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
Dan Poltawski [Wed, 16 Jan 2013 01:54:26 +0000 (09:54 +0800)]
Merge branch 'MDL-36412-master' of git://github.com/sammarshallou/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
Sam Hemelryk [Wed, 16 Jan 2013 01:22:58 +0000 (14:22 +1300)]
MDL-37536 cache: fixed typo
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
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
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
AMOS bot [Wed, 16 Jan 2013 00:43:42 +0000 (00:43 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 00:30:19 +0000 (01:30 +0100)]
MDL-35775 Whitespace fix.
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
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
Sam Hemelryk [Tue, 15 Jan 2013 23:00:37 +0000 (12:00 +1300)]
MDL-23504 admin: fixed whitespace issue
Sam Hemelryk [Tue, 15 Jan 2013 22:06:39 +0000 (11:06 +1300)]
Merge branch 'wip-mdl-23504' of git://github.com/rajeshtaneja/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
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
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
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
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 20:44:38 +0000 (21:44 +0100)]
Merge branch 'MDL-31726' of git://github.com/colchambers/moodle
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.
Petr Škoda [Tue, 15 Jan 2013 20:29:10 +0000 (21:29 +0100)]
MDL-37184 document new general enrolment editing page
Petr Škoda [Tue, 15 Jan 2013 19:45:36 +0000 (20:45 +0100)]
MDL-37429 document zip packer improvements
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 19:14:03 +0000 (20:14 +0100)]
Merge branch 'MDL-31616' of git://github.com/timhunt/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
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.
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 18:09:57 +0000 (19:09 +0100)]
MDL-33117 Whitespace fixes
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
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
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 17:12:20 +0000 (18:12 +0100)]
Merge branch 'MDL-36553' 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
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
Ben Johnson [Tue, 15 Jan 2013 08:42:56 +0000 (21:42 +1300)]
MDL-36421 SCORM: fix SCORM course format new window popups
Dan Poltawski [Tue, 15 Jan 2013 08:36:14 +0000 (16:36 +0800)]
MDL-37313 question: fix trailing whitespace
Dan Poltawski [Tue, 15 Jan 2013 08:35:17 +0000 (16:35 +0800)]
Merge branch 'MDL-37313' of git://github.com/jmvedrine/moodle
