58084 Commits

Author SHA1 Message Date
Sam Hemelryk
0296e662a3 Merge branch 'w49_MDL-29442_m25_entityutf8' of git://github.com/skodak/moodle 2012-12-11 10:22:19 +13:00
Sam Hemelryk
4e0c4ec70d Merge branch 'MDL-36263-master' of git://github.com/damyon/moodle 2012-12-11 10:17:57 +13:00
Sam Hemelryk
a77a8f1e9d Merge branch 'MDL-37020-master' of https://github.com/mackensen/moodle 2012-12-11 09:48:05 +13:00
Sam Hemelryk
3dd842ebfb Merge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle 2012-12-11 09:42:17 +13:00
Sam Hemelryk
5f27d13454 Merge branch 'MDL-36805-master' of git://git.luns.net.uk/moodle 2012-12-11 09:16:47 +13:00
Sam Hemelryk
8ebf086d31 Merge branch 'wip-MDL-37011' of git://github.com/abgreeve/moodle 2012-12-11 08:42:40 +13:00
Iñaki Arenaza
a5428e15b2 MDL-37088 auth_ldap: bad operator in ldap sync_user() method 2012-12-10 16:52:42 +01:00
Andrew Robert Nicols
a71d9a9414 MDL-34791 AJAX Update a graded activity's title in the gradebook on rename 2012-12-10 14:14:28 +00:00
Dan Poltawski
303cccc5a6 MDL-36755 course_overview block: fix for fix.
I will stop commiting now.
2012-12-10 19:45:19 +08:00
Dan Poltawski
36508a201a MDL-36755 course_overview block: fix idiot version
I will shoot the programmer responsible for this mess.
2012-12-10 19:41:16 +08:00
Dan Poltawski
e3b494e379 Merge branch 'w49_MDL-36737_m25_glossstrict' of git://github.com/skodak/moodle 2012-12-10 19:37:24 +08:00
Dan Poltawski
91c5477606 Merge branch 'MDL-36755_master' of git://github.com/markn86/moodle
Conflicts:
	blocks/course_overview/version.php
2012-12-10 19:32:10 +08:00
Dan Poltawski
6aa4fccc74 MDL-36167 fix trailing whitespace 2012-12-10 17:35:58 +08:00
Dan Poltawski
76089dc378 Merge branch 'MDL-36167-master' of git://github.com/damyon/moodle 2012-12-10 17:31:41 +08:00
Dan Poltawski
69e0b225c1 Merge branch 'MDL-36732' of git://github.com/timhunt/moodle 2012-12-10 15:17:46 +08:00
Damyon Wiese
8f7e1c05af MDL-36263 Assignment: Do not count submissions of unenrolled users 2012-12-10 14:54:24 +08:00
Damyon Wiese
7a9fd6da43 MDL-36908 Assignment: Additional fixes for preventing empty submissions 2012-12-10 14:54:24 +08:00
Dan Poltawski
adce3fa833 Merge branch 'MDL-36549' of git://github.com/rwijaya/moodle 2012-12-10 14:18:32 +08:00
Dan Poltawski
3b49f655b2 Merge branch 'MDL-36856' of git://github.com/kastashov/moodle 2012-12-10 14:04:22 +08:00
Dan Poltawski
9278e2dbef Merge branch 'MDL-36835-master' of git://github.com/damyon/moodle 2012-12-10 14:01:56 +08:00
Dan Poltawski
8df07e5086 Merge branch 'MDL-36538_webdav_memory' of git://github.com/davosmith/moodle 2012-12-10 13:06:37 +08:00
Dan Poltawski
9c714c83b7 Merge branch 'w49_MDL-35456_m25_paypal' of git://github.com/skodak/moodle 2012-12-10 12:03:03 +08:00
Dan Poltawski
2e6aff57e5 Merge branch 'MDL-35404' of git://github.com/timhunt/moodle 2012-12-10 11:36:38 +08:00
Dan Poltawski
7689a5837a Merge branch 'wip-MDL-36939-m25' of git://github.com/samhemelryk/moodle 2012-12-10 11:08:42 +08:00
Sam Hemelryk
845774bf33 Merge branch 'MDL-30961-master' of git://github.com/mouneyrac/moodle 2012-12-10 14:59:42 +13:00
Dan Poltawski
d31c08b698 Merge branch 'MDL-36680_hidden' of git://github.com/andyjdavis/moodle 2012-12-10 09:56:09 +08:00
Sam Hemelryk
754f808546 Merge branch 'MDL-36946-master' of git://github.com/micaherne/moodle 2012-12-10 14:43:40 +13:00
Sam Hemelryk
11e95000bd Merge branch 'MDL-34592_master' of git://github.com/lazydaisy/moodle 2012-12-10 14:28:44 +13:00
Sam Hemelryk
d60ac860ea Merge branch 'MDL-36608_master' of git://github.com/lazydaisy/moodle 2012-12-10 14:24:39 +13:00
Sam Hemelryk
018e659061 Merge branch 'MDL-36978' of git://github.com/lazydaisy/moodle 2012-12-10 14:21:37 +13:00
Sam Hemelryk
9a3e76e01e Merge branch 'MDL-36579_modLtiBackupFields' of git://github.com/moodlerooms/moodle 2012-12-10 14:16:00 +13:00
Mark Nielsen
e893c6d442 MDL-36607: Improve block drag and drop
* Adding support for subpage
* Adding support for regions that do not start with "side-"
2012-12-10 14:12:57 +13:00
Sam Hemelryk
9d8abffc87 Merge branch 'MDL-35954_master' of git://github.com/markn86/moodle 2012-12-10 14:08:06 +13:00
Adrian Greeve
5cc0c73ab2 MDL-37011 - themes: Fixed the alignment of the edit and help icon on the participants page. 2012-12-10 08:58:29 +08:00
Sam Hemelryk
1b4e47e43a Merge branch 'MDL-36433-master' of git://github.com/itamart/moodle 2012-12-10 12:13:32 +13:00
Sam Hemelryk
8b5944b9b9 Merge branch 'MDL-36764' of git://github.com/danpoltawski/moodle 2012-12-10 11:54:01 +13:00
Sam Hemelryk
a429049ce5 Merge branch 'MDL-36778' of git://github.com/danpoltawski/moodle 2012-12-10 11:51:38 +13:00
Sam Hemelryk
7e4dd7f6c2 Merge branch 'MDL-36887' of git://github.com/danpoltawski/moodle 2012-12-10 11:48:22 +13:00
Sam Hemelryk
533469cba4 Merge branch 'MDL-36640-master' of git://git.luns.net.uk/moodle 2012-12-10 11:42:57 +13:00
Mary Evans
e907c68530 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 2012-12-09 22:23:42 +00:00
Andrew Robert Nicols
e275e8c3cd MDL-36918 Decode HTML entities on ajax update title 2012-12-10 11:15:50 +13:00
Sam Hemelryk
fa9b53cdf8 Merge branch 'message_nav' of git://github.com/andyjdavis/moodle 2012-12-10 11:00:17 +13:00
Sam Hemelryk
70d09e7fd6 Merge branch 'MDL-36761_loop' of git://github.com/andyjdavis/moodle 2012-12-10 10:54:32 +13:00
Sam Hemelryk
f6c922e71f Merge branch 'MDL-34591_master' of git://github.com/grabs/moodle 2012-12-10 10:49:21 +13:00
Sam Hemelryk
d72f2212da Merge branch 'wip-MDL-35221-master' of git://github.com/kwiliarty/moodle 2012-12-10 10:41:35 +13:00
Sam Hemelryk
bb682c1ac2 Merge branch 'wip-MDL-36906-master' of git://github.com/abgreeve/moodle 2012-12-10 10:33:48 +13:00
Sam Hemelryk
6d48072205 Merge branch 'wip-MDL-36915-master' of git://github.com/abgreeve/moodle 2012-12-10 10:27:25 +13:00
Sam Hemelryk
d229ac0f0a Merge branch 'wip-MDL-37026-master' of git://github.com/abgreeve/moodle 2012-12-10 10:23:55 +13:00
Sam Hemelryk
13980de16b Merge branch 'MDL-33125' of git://github.com/aolley/moodle 2012-12-10 10:19:32 +13:00
Petr Škoda
65598feb36 MDL-36447 skip file preview test if GD not available 2012-12-09 19:22:01 +01:00