57611 Commits

Author SHA1 Message Date
Michael Aherne
2211f50422 MDL-36946 theme Use server default theme before standard 2012-11-30 12:11:07 +00:00
Aparup Banerjee
020e338dee Merge branch 'w47_MDL-36701_m24_composer' of git://github.com/skodak/moodle 2012-11-22 16:23:20 +08:00
Petr Škoda
07c6fa6ee4 MDL-36701 add composer to phpunit readme
Thanks Aparup for reminding me!
2012-11-22 07:30:11 +01:00
Petr Škoda
4c21b22043 MDL-36753 fix invalid sectionid in backup tests 2012-11-21 12:43:55 +01:00
Dan Poltawski
a9962a8533 Merge branch 'w47_MDL-36743_m24_blognotice' of git://github.com/skodak/moodle 2012-11-21 16:13:21 +08:00
Petr Škoda
ab996aff22 MDL-36743 fix blog notices in installer 2012-11-21 09:00:17 +01:00
Dan Poltawski
2048b8e2c7 Merge branch 'MDL-36470-master' of git://github.com/FMCorz/moodle 2012-11-21 15:58:19 +08:00
Dan Poltawski
5b93fb114c Merge branch 'w47_MDL-36211_m24_sesslocking' of git://github.com/skodak/moodle 2012-11-21 15:44:34 +08:00
Petr Škoda
bef1207302 MDL-36211 prevent session problems in installer 2012-11-21 08:34:28 +01:00
Dan Poltawski
1b01909597 Merge branch 'w47_MDL-36547_m24_sectiongen' of git://github.com/skodak/moodle 2012-11-21 15:26:15 +08:00
Barbara Ramiro
dcb9160579 MDL-36630 usability: 16x16 version of drag and drop icon 2012-11-21 15:22:26 +08:00
Dan Poltawski
3866195155 Merge branch 'MDL-30884' of git://github.com/timhunt/moodle 2012-11-21 15:19:15 +08:00
Dan Poltawski
e5556885eb Merge branch 'MDL-36639-master-int' of git://github.com/FMCorz/moodle 2012-11-21 15:15:23 +08:00
Frederic Massart
58e4233ecb MDL-36639 blog: Resized associated module icon 2012-11-21 13:59:57 +08:00
Dan Poltawski
c9f5160438 Merge branch 'MDL-36720-updates-via-https' of git://github.com/mudrd8mz/moodle 2012-11-21 13:48:04 +08:00
Dan Poltawski
8068fcb5b6 Merge branch 'MDL-35675-master' of git://github.com/FMCorz/moodle 2012-11-21 12:02:48 +08:00
Dan Poltawski
77f948a2f7 Merge branch 'MDL-36289' of git://github.com/netspotau/moodle-mod_assign 2012-11-21 12:00:28 +08:00
Dan Poltawski
31112f3bab Merge branch 'w47_MDL-36211_m24_sesslocking' of git://github.com/skodak/moodle 2012-11-21 11:56:44 +08:00
Dan Poltawski
e4837b8a25 Merge branch 'MDL-30377_master' of git://github.com/markn86/moodle 2012-11-21 11:52:32 +08:00
Dan Poltawski
77307db208 Merge branch 'MDL-36170_master' of https://github.com/jfilip/moodle 2012-11-21 11:47:17 +08:00
Aparup Banerjee
9cae08dac4 MDL-36614 fixed version upgrade conflict (git why you no tell me about conflict!) 2012-11-21 10:49:44 +08:00
Aparup Banerjee
6bf410ed4b Merge branch 'MDL-36614-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	calendar/lib.php (MDL-36615)
	calendar/managesubscriptions_form.php (MDL-36352)
2012-11-21 10:29:04 +08:00
Eloy Lafuente (stronk7)
d937f597e7 Merge branch 'w47_MDL-36719_m24_borkedcachingfront' of git://github.com/skodak/moodle 2012-11-21 00:55:18 +01:00
Sam Hemelryk
82053086bc Merge branch 'wip-MDL-28583-master' of git://github.com/marinaglancy/moodle 2012-11-21 09:15:34 +13:00
Sam Hemelryk
d540132fb5 Merge branch 'MDL-25552_master' of git://github.com/markn86/moodle 2012-11-21 09:00:35 +13:00
David Mudrák
40a9c2e531 MDL-36720 Fetch available updates info via HTTPS 2012-11-20 15:51:35 +01:00
Petr Škoda
5689fb0bc8 MDL-36719 try to work around course format caching issue in installer 2012-11-20 15:41:06 +01:00
Petr Škoda
e271f71da4 MDL-36719 update $SITE caches in rebuild_course_cache() 2012-11-20 15:39:43 +01:00
Justin Filip
e08bb715e7 MDL-36170 - mod/data - Don't display the blocks editing button within table HTML, use a standard API to create it. 2012-11-20 09:01:29 -05:00
Tim Hunt
e498f21421 MDL-30884 quiz: ARIA attribute for the coutdown timer. 2012-11-20 13:18:02 +00:00
Petr Škoda
40b9c0694c MDL-36436 use hacky aspect ratio to work around IE9 issues 2012-11-20 13:01:27 +01:00
Petr Škoda
741797453b MDL-36436 add simple svg hacking tool for icon designers
This should solve some IE9 issues with icon cut-off.
2012-11-20 13:00:53 +01:00
Petr Škoda
3a7bc16ad7 MDL-36701 support for PHPUnit installation via Composer packaging system
See http://getcomposer.org/doc/00-intro.md
2012-11-20 11:27:35 +01:00
Mark Nelson
684c3be721 MDL-25552 mod_lesson: changing filepicker element to filemanager to allow the deletion of a file 2012-11-20 17:43:50 +08:00
Aparup Banerjee
4bb2e5c4b2 Merge branch 'wip-mdl-36707' of git://github.com/rajeshtaneja/moodle 2012-11-20 16:22:27 +08:00
Dan Poltawski
c796b506be Merge branch 'MDL-33863' of git://github.com/timhunt/moodle 2012-11-20 16:15:16 +08:00
Dan Poltawski
7a12ad1286 Merge branch 'MDL-36634-master' of git://github.com/FMCorz/moodle 2012-11-20 16:09:49 +08:00
Dan Poltawski
3a31c0349a Merge branch 'MDL-36624-master-int' of git://github.com/FMCorz/moodle 2012-11-20 16:07:59 +08:00
Dan Poltawski
30e0a6e5ba Merge branch 'MDL-36659-master' of git://github.com/FMCorz/moodle 2012-11-20 16:06:08 +08:00
Dan Poltawski
dab8ed3b24 Merge branch 'MDL-36022-master' of git://git.luns.net.uk/moodle 2012-11-20 16:04:08 +08:00
Dan Poltawski
bdd3779064 Merge branch 'w47_MDL-36703_m24_enrolgenerator' of git://github.com/skodak/moodle 2012-11-20 16:01:41 +08:00
Dan Poltawski
109473368d Merge branch 'm24_MDL-36142_Incorrect_query_returns_HTTP_404' of https://github.com/scara/moodle 2012-11-20 15:57:53 +08:00
Dan Poltawski
f132526512 Merge branch 'MDL-30731-master' of git://github.com/FMCorz/moodle 2012-11-20 15:31:27 +08:00
Dan Poltawski
3d51f11c9a Merge branch 'MDL-36679-master' of github.com:damyon/moodle 2012-11-20 15:25:20 +08:00
Dan Poltawski
9d1989daa7 Merge branch 'wip-MDL-35678-master' of git://github.com/abgreeve/moodle 2012-11-20 15:15:43 +08:00
Dan Poltawski
430f5aaac0 Merge branch 'MDL-36646' of git://github.com/timhunt/moodle 2012-11-20 15:06:21 +08:00
Dan Poltawski
941cf79fdc Merge branch 'MDL-36613-master' of git://github.com/FMCorz/moodle 2012-11-20 15:03:39 +08:00
Dan Poltawski
91b0d0b75a Merge branch 'MDL-36571' of git://github.com/timhunt/moodle 2012-11-20 14:59:34 +08:00
Frederic Massart
f19d57e514 MDL-30731 calendar: Fixed display of images in event descriptions 2012-11-20 14:58:33 +08:00
Dan Poltawski
4dc87c7730 Merge branch 'MDL-36564-master-int' of git://github.com/FMCorz/moodle 2012-11-20 14:46:54 +08:00