58001 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Dan Poltawski
02dd021d26 Merge branch 'w49_MDL-36447_m25_gdtest' of git://github.com/skodak/moodle 2012-12-11 17:54:24 +08:00
Dan Poltawski
70f4fddae5 Merge branch 'MDL-37098' of git://github.com/timhunt/moodle 2012-12-11 17:51:50 +08:00
Tim Hunt
1744033ccb MDL-37098 quiz: event handler fails deleting group with no overrides
This was a regression from MDL-35717.
2012-12-11 09:06:19 +00:00
Dan Poltawski
cba50c0088 Merge branch 'MDL-36243' of git://github.com/jmvedrine/moodle 2012-12-11 16:24:10 +08:00
Dan Poltawski
09f5d8344e Merge branch 'wip-MDL-36108-master' of git://github.com/phalacee/moodle 2012-12-11 16:03:09 +08:00
Jason Fowler
4ff849b7db MDL-36108 - Blocks - Online User block's user image's alt attribute is now empty to prevent repetition of text for screen readers 2012-12-11 15:49:50 +08:00
Dan Poltawski
6236442aad Merge branch 'wip-MDL-36938-m25' of git://github.com/samhemelryk/moodle 2012-12-11 15:18:50 +08:00
Dan Poltawski
c3c2fc538a Merge branch 'MDL-36712-master' of git://github.com/damyon/moodle 2012-12-11 14:00:25 +08:00
Dan Poltawski
021504b547 Merge branch 'MDL-36591-master' of git://github.com/damyon/moodle 2012-12-11 13:56:28 +08:00
Dan Poltawski
0fd3fb0c83 Merge branch 'MDL-36897' of git://github.com/timhunt/moodle 2012-12-11 13:54:15 +08:00
Dan Poltawski
4cc8e8cbb1 Merge branch 'MDL-34791-master' of git://git.luns.net.uk/moodle 2012-12-11 13:22:42 +08:00
Dan Poltawski
358414748c Merge branch 'MDL-36808-master' of git://github.com/sammarshallou/moodle 2012-12-11 12:18:12 +08:00
Dan Poltawski
4889da2199 Merge branch 'w49_MDL-36983_m25_ordertext' of git://github.com/skodak/moodle 2012-12-11 12:09:10 +08:00
Dan Poltawski
624b0c3f1d Merge branch 'w49_MDL-36892_m25_enrolreadme' of git://github.com/skodak/moodle 2012-12-11 12:07:06 +08:00
Dan Poltawski
cdb7110f72 Merge branch 'MDL-36845' of git://github.com/timhunt/moodle 2012-12-11 11:58:44 +08:00
Dan Poltawski
fa18df40c1 Merge branch 'MDL-36828' of https://github.com/aolley/moodle 2012-12-11 11:44:11 +08:00
Dan Poltawski
b62f0f8d82 Merge branch 'wip-MDL-36110-master' of git://github.com/phalacee/moodle 2012-12-11 11:32:53 +08:00
Dan Poltawski
595282dfcc Merge branch 'wip-MDL-35884-master' of git://github.com/phalacee/moodle 2012-12-11 11:17:29 +08:00
Sam Hemelryk
6e68a3a93c Merge branch 'MDL-36650' of git://github.com/timhunt/moodle 2012-12-11 16:11:13 +13:00
Dan Poltawski
5d44e45264 Merge branch 'MDL-36025-negative-zero' of git://github.com/mpetrowi/moodle 2012-12-11 11:06:28 +08:00
Sam Hemelryk
0aed7e7d71 Merge branch 'w49_MDL-36731_m25_uploadestrict' of git://github.com/skodak/moodle 2012-12-11 16:04:31 +13:00
Dan Poltawski
74bf44284a Merge branch 'MDL-35476-master' of git://github.com/damyon/moodle 2012-12-11 10:49:12 +08:00
Sam Hemelryk
fc6acfe242 Merge branch 'MDL-36905' of git://github.com/rwijaya/moodle 2012-12-11 15:44:37 +13:00
Sam Hemelryk
9a8b79864a Merge branch 'MDL-36916' of git://github.com/timhunt/moodle 2012-12-11 15:42:13 +13:00
Dan Poltawski
6434a6c76e Merge branch 'MDL-34052-master' of https://github.com/damyon/moodle 2012-12-11 10:39:19 +08:00
Sam Hemelryk
159537f65a Merge branch 'w49_MDL-36936_m25_composerdev' of git://github.com/skodak/moodle 2012-12-11 15:35:07 +13:00
Dan Poltawski
d4b2190728 Merge branch 'w49_MDL-31424_m25_paypalcase' of git://github.com/skodak/moodle 2012-12-11 10:31:33 +08:00
Sam Hemelryk
7a6ef4ee8f Merge branch 'w49_MDL-37060_m25_sessinit' of git://github.com/skodak/moodle 2012-12-11 15:27:26 +13:00
Sam Hemelryk
711e0ad9b7 Merge branch 'MDL-36942' of git://github.com/timhunt/moodle 2012-12-11 15:04:22 +13:00
Sam Hemelryk
6c3b271c3d Merge branch 'MDL-36954' of git://github.com/timhunt/moodle 2012-12-11 14:59:56 +13:00
Dan Poltawski
b3b4fad994 Merge branch 'MDL-36773-master' of git://github.com/mouneyrac/moodle 2012-12-11 09:56:40 +08:00
Sam Hemelryk
46c02a6a91 Merge branch 'wip-mdl-37017' of git://github.com/rajeshtaneja/moodle 2012-12-11 14:54:16 +13:00
Sam Hemelryk
9a2a9b146f Merge branch 'w49_MDL-37061_m25_invalidlang' of git://github.com/skodak/moodle 2012-12-11 14:44:08 +13:00
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
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