Dan Poltawski [Tue, 11 Dec 2012 06:00:25 +0000 (14:00 +0800)]
Merge branch 'MDL-36712-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
Dan Poltawski [Tue, 11 Dec 2012 05:54:15 +0000 (13:54 +0800)]
Merge branch 'MDL-36897' of git://github.com/timhunt/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
Dan Poltawski [Tue, 11 Dec 2012 04:18:12 +0000 (12:18 +0800)]
Merge branch 'MDL-36808-master' of git://github.com/sammarshallou/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
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
Dan Poltawski [Tue, 11 Dec 2012 03:58:44 +0000 (11:58 +0800)]
Merge branch 'MDL-36845' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 11 Dec 2012 03:44:11 +0000 (11:44 +0800)]
Merge branch 'MDL-36828' of https://github.com/aolley/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
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
Sam Hemelryk [Tue, 11 Dec 2012 03:11:13 +0000 (16:11 +1300)]
Merge branch 'MDL-36650' of git://github.com/timhunt/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
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
Dan Poltawski [Tue, 11 Dec 2012 02:49:12 +0000 (10:49 +0800)]
Merge branch 'MDL-35476-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 11 Dec 2012 02:44:37 +0000 (15:44 +1300)]
Merge branch 'MDL-36905' of git://github.com/rwijaya/moodle
Sam Hemelryk [Tue, 11 Dec 2012 02:42:13 +0000 (15:42 +1300)]
Merge branch 'MDL-36916' of git://github.com/timhunt/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
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
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
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
Sam Hemelryk [Tue, 11 Dec 2012 02:04:22 +0000 (15:04 +1300)]
Merge branch 'MDL-36942' 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
Dan Poltawski [Tue, 11 Dec 2012 01:56:40 +0000 (09:56 +0800)]
Merge branch 'MDL-36773-master' of git://github.com/mouneyrac/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
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
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
Sam Hemelryk [Mon, 10 Dec 2012 21:17:57 +0000 (10:17 +1300)]
Merge branch 'MDL-36263-master' of git://github.com/damyon/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
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
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
Sam Hemelryk [Mon, 10 Dec 2012 19:42:40 +0000 (08:42 +1300)]
Merge branch 'wip-MDL-37011' of git://github.com/abgreeve/moodle
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
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.
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.
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
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
Dan Poltawski [Mon, 10 Dec 2012 09:35:58 +0000 (17:35 +0800)]
MDL-36167 fix trailing whitespace
Dan Poltawski [Mon, 10 Dec 2012 09:31:41 +0000 (17:31 +0800)]
Merge branch 'MDL-36167-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 10 Dec 2012 07:17:46 +0000 (15:17 +0800)]
Merge branch 'MDL-36732' of git://github.com/timhunt/moodle
Damyon Wiese [Fri, 30 Nov 2012 04:41:23 +0000 (12:41 +0800)]
MDL-36263 Assignment: Do not count submissions of unenrolled users
Damyon Wiese [Thu, 29 Nov 2012 04:26:22 +0000 (12:26 +0800)]
MDL-36908 Assignment: Additional fixes for preventing empty submissions
Dan Poltawski [Mon, 10 Dec 2012 06:18:32 +0000 (14:18 +0800)]
Merge branch 'MDL-36549' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 10 Dec 2012 06:04:22 +0000 (14:04 +0800)]
Merge branch 'MDL-36856' of git://github.com/kastashov/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
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
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
Dan Poltawski [Mon, 10 Dec 2012 03:36:38 +0000 (11:36 +0800)]
Merge branch 'MDL-35404' of git://github.com/timhunt/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
Sam Hemelryk [Mon, 10 Dec 2012 01:59:42 +0000 (14:59 +1300)]
Merge branch 'MDL-30961-master' of git://github.com/mouneyrac/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
Sam Hemelryk [Mon, 10 Dec 2012 01:43:40 +0000 (14:43 +1300)]
Merge branch 'MDL-36946-master' of git://github.com/micaherne/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
Sam Hemelryk [Mon, 10 Dec 2012 01:24:39 +0000 (14:24 +1300)]
Merge branch 'MDL-36608_master' 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
Sam Hemelryk [Mon, 10 Dec 2012 01:16:00 +0000 (14:16 +1300)]
Merge branch 'MDL-36579_modLtiBackupFields' of git://github.com/moodlerooms/moodle
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-"
Sam Hemelryk [Mon, 10 Dec 2012 01:08:06 +0000 (14:08 +1300)]
Merge branch 'MDL-35954_master' of git://github.com/markn86/moodle
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.
Sam Hemelryk [Sun, 9 Dec 2012 23:13:32 +0000 (12:13 +1300)]
Merge branch 'MDL-36433-master' of git://github.com/itamart/moodle
Sam Hemelryk [Sun, 9 Dec 2012 22:54:01 +0000 (11:54 +1300)]
Merge branch 'MDL-36764' 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
Sam Hemelryk [Sun, 9 Dec 2012 22:48:22 +0000 (11:48 +1300)]
Merge branch 'MDL-36887' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 9 Dec 2012 22:42:57 +0000 (11:42 +1300)]
Merge branch 'MDL-36640-master' of git://git.luns.net.uk/moodle
Mary Evans [Sun, 9 Dec 2012 22:23:42 +0000 (22:23 +0000)]
MDL-34592 theme_magazine: Fixes the report grader fixed column misalignment in magazine/style/core.css theme, plus fixes all CORE themes with minor adjustment to grade/report/grader/style.css
Andrew Robert Nicols [Mon, 3 Dec 2012 12:18:21 +0000 (12:18 +0000)]
MDL-36918 Decode HTML entities on ajax update title
Sam Hemelryk [Sun, 9 Dec 2012 22:00:17 +0000 (11:00 +1300)]
Merge branch 'message_nav' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Sun, 9 Dec 2012 21:54:32 +0000 (10:54 +1300)]
Merge branch 'MDL-36761_loop' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Sun, 9 Dec 2012 21:49:21 +0000 (10:49 +1300)]
Merge branch 'MDL-34591_master' of git://github.com/grabs/moodle
Sam Hemelryk [Sun, 9 Dec 2012 21:41:35 +0000 (10:41 +1300)]
Merge branch 'wip-MDL-35221-master' of git://github.com/kwiliarty/moodle
Sam Hemelryk [Sun, 9 Dec 2012 21:33:48 +0000 (10:33 +1300)]
Merge branch 'wip-MDL-36906-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Sun, 9 Dec 2012 21:27:25 +0000 (10:27 +1300)]
Merge branch 'wip-MDL-36915-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Sun, 9 Dec 2012 21:23:55 +0000 (10:23 +1300)]
Merge branch 'wip-MDL-37026-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Sun, 9 Dec 2012 21:19:32 +0000 (10:19 +1300)]
Merge branch 'MDL-33125' of git://github.com/aolley/moodle
Andreas Grabs [Wed, 5 Dec 2012 11:24:21 +0000 (12:24 +0100)]
MDL-34591 - paypal does not allow unenrol
Petr Škoda [Sun, 9 Dec 2012 17:21:38 +0000 (18:21 +0100)]
MDL-29442 add missing utf-8 to entity html encoding and decoding
Petr Škoda [Sun, 9 Dec 2012 10:28:36 +0000 (11:28 +0100)]
MDL-37061 always validate lang when setting session user
This should resolve problems with TinyMCE langs and some unknown MUCH caching issue.
Mary Evans [Sat, 8 Dec 2012 22:20:05 +0000 (22:20 +0000)]
MDL-36978 theme_standardold: fixes misplaced block region check in layout/frontpage.php which, with hindsight should have been fixed in MDL-23226.
Petr Škoda [Sat, 8 Dec 2012 13:44:05 +0000 (14:44 +0100)]
MDL-36737 fix random glossary E_STRICT issue
Petr Škoda [Sat, 8 Dec 2012 12:16:04 +0000 (13:16 +0100)]
MDL-31424 compare PayPal emails case-insensitively
Credit goes to Chris Follin, thanks!
Petr Škoda [Sat, 8 Dec 2012 11:31:05 +0000 (12:31 +0100)]
MDL-37060 prevent notice in session_get_instance()
Petr Škoda [Sat, 8 Dec 2012 10:58:05 +0000 (11:58 +0100)]
MDL-35456 use HTTP 1.1 for PayPal IPN
Eloy Lafuente (stronk7) [Sat, 8 Dec 2012 01:58:07 +0000 (02:58 +0100)]
weekly on-sync release 2.5dev
Petr Škoda [Fri, 7 Dec 2012 17:20:03 +0000 (18:20 +0100)]
MDL-36936 require phpunit as composer --dev only
Petr Škoda [Fri, 7 Dec 2012 16:15:39 +0000 (17:15 +0100)]
MDL-36892 delete outdated enrol info
Davo Smith [Mon, 12 Nov 2012 16:51:06 +0000 (16:51 +0000)]
MDL-36538 repository_webdav - save files directly to local filesystem, rather than buffering in memory
Jason Fowler [Tue, 4 Dec 2012 03:29:01 +0000 (11:29 +0800)]
MDL-35884 - Course - Remove text from ALT attribute for activity chooser
Rajesh Taneja [Thu, 6 Dec 2012 01:47:38 +0000 (09:47 +0800)]
MDL-37017 My Moodle: Course name should be fullname of course
Sam Hemelryk [Fri, 30 Nov 2012 01:45:05 +0000 (14:45 +1300)]
MDL-36939 cache: instance form validation now handles errors properly
Petr Škoda [Thu, 6 Dec 2012 13:18:16 +0000 (14:18 +0100)]
MDL-36983 fix incorrect test method name
Credit goes to David Scotson, thanks.
Petr Škoda [Tue, 20 Nov 2012 20:30:26 +0000 (21:30 +0100)]
MDL-36731 fix E_STRICt issue when creating new groups in user upload
Amy Groshek [Wed, 5 Dec 2012 00:07:25 +0000 (18:07 -0600)]
MDL-36960 - fix broken horizontal positioning of titles for docked blocks
David Mudrák [Thu, 6 Dec 2012 01:37:22 +0000 (02:37 +0100)]
MDL-36963 Do not attempt to remove the root folder of a plugin during the update deployment
There is no need to move the root folder of a plugin during the update
deployment. We just need to operate with its contents. So the web server
process can have the write access for the plugin folder only.
David Mudrák [Thu, 6 Dec 2012 01:42:48 +0000 (02:42 +0100)]
MDL-36963 Add unit tests for directory operations in mdeploy.php
David Mudrák [Thu, 6 Dec 2012 01:31:36 +0000 (02:31 +0100)]
MDL-36963 Improve mdeploy worker::remove_directory() method
The additional parameter allows to use this method without actual
removing the root of the path. That is, it is now possible to remove
the content of a folder only.
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.
Adrian Greeve [Thu, 6 Dec 2012 02:52:09 +0000 (10:52 +0800)]
MDL-37026 - lib: The function user_can_assign() returns true for admins.
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
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.
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.