Commit graph

57767 commits

Author SHA1 Message Date
Aparup Banerjee
8e1fbc0fe6 Merge branch 'master_MDL-36858' of git://github.com/danmarsden/moodle 2012-11-29 12:53:25 +08:00
Dan Poltawski
88ee671bae Merge branch 'MDL-36718-master' of git://github.com/FMCorz/moodle 2012-11-29 12:51:00 +08:00
Dan Poltawski
694b2e20bb Merge branch 'MDL-36695-master' of git://github.com/FMCorz/moodle 2012-11-29 12:21:03 +08:00
Sam Hemelryk
ad47d02595 MDL-36878 course: fixed issue with module metadata cache
Credit goes to Sam Chaffee.
2012-11-29 12:56:55 +13:00
Dan Poltawski
b58d1b9b1c Merge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle 2012-11-28 17:51:33 +08:00
Frederic Massart
261a89aaa5 MDL-36638 usability: Fix missing padding in forum headers 2012-11-28 17:36:38 +08:00
Dan Poltawski
6f24d3183e Merge branch 'MDL-36838-FF17-MNETSSO-MASTER' of git://github.com/peterbulmer/moodle 2012-11-28 17:35:54 +08:00
Barbara Ramiro
94341a7c50 MDL-36718 usability: New activity completion icons 2012-11-28 16:05:50 +08:00
Dan Marsden
be2d2f6d73 MDL-36858 SCORM: improve lang help for attempts grading to warn about failed status. 2012-11-28 20:54:50 +13:00
Dan Poltawski
0c21bb606b Merge branch 'MDL-35966-master' of git://github.com/damyon/moodle 2012-11-28 14:15:28 +08:00
Dan Poltawski
2e15e63a31 Merge branch 'MDL-36864_master' of git://github.com/markn86/moodle 2012-11-28 14:14:49 +08:00
Mark Nelson
9b06b50719 MDL-36864 blocks: only perform myaddinstance capability check on the My Moodle page, not on any other pages using the user context 2012-11-28 12:47:54 +08:00
Dan Poltawski
8dd6b5f487 MDL-33791 - fix upgrade.txt ordering 2012-11-28 10:28:01 +08:00
Dan Poltawski
bd80fcc357 Merge branch 'wip-MDL-36859-m24' of git://github.com/samhemelryk/moodle 2012-11-28 09:56:59 +08:00
Barbara Ramiro
a37bf4b1dd MDL-36695 usability: New icons for feedback module 2012-11-28 09:48:25 +08:00
Dan Poltawski
1d762c8aba Merge branch 'MDL-36752-master-2' of git://git.luns.net.uk/moodle 2012-11-28 09:40:24 +08:00
Sam Hemelryk
97df015690 Merge branch 'MDL-36336_modLtiRestoreGrade' of git://github.com/moodlerooms/moodle 2012-11-28 11:48:12 +13:00
Sam Hemelryk
6167badf62 Merge branch 'wip-mdl-36238' of git://github.com/rajeshtaneja/moodle 2012-11-28 11:41:42 +13:00
Sam Hemelryk
58014c5621 Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle 2012-11-28 11:25:24 +13:00
Sam Hemelryk
2644c4f33a Merge branch 'MDL-30139_master' of https://github.com/markn86/moodle 2012-11-28 11:14:47 +13:00
Sam Hemelryk
acd51c5217 Merge branch 'MDL-36012-master' of git://github.com/damyon/moodle 2012-11-28 11:12:53 +13:00
Sam Hemelryk
fd6ab92b1d Merge branch 'MDL-35997-wip1' of git://github.com/mouneyrac/moodle
Conflicts:
	version.php
2012-11-28 10:57:09 +13:00
Sam Hemelryk
73321216a1 MDL-36859 cache: removed unused config definition 2012-11-28 10:34:33 +13:00
Andrew Robert Nicols
c44a8dfed5 MDL-36752 Be more specific about tooltip selectors 2012-11-27 14:45:47 +00:00
Aparup Banerjee
e002d5e435 Merge branch 'MDL-36865_master' of git://github.com/markn86/moodle 2012-11-27 16:20:26 +08:00
Damyon Wiese
a732e1f714 MDL-35966 Assignment - Localisation issue - use userdate not strftime
This is causing a database error (reported on MySQL) when strftime returns
non-utf8 characters.  This occurs when sending assignment notifications.

This was reported and a solution provided by Chien Wen-Chang(簡文章).
2012-11-27 16:19:01 +08:00
Mark Nelson
08a6a19d4b MDL-36865 filepicker: ensuring the dnd arrow displays in the center of the filepicker for all supported browsers 2012-11-27 15:59:43 +08:00
Aparup Banerjee
63e2347e1c Merge branch 'MDL-36710-master' of git://github.com/ankitagarwal/moodle 2012-11-27 15:49:32 +08:00
Ankit Agarwal
c34e03097a MDL-36710 calendar: Correcting the validation checks 2012-11-27 15:33:36 +08:00
Dan Poltawski
9c8969a371 Merge branch 'MDL-36629-master' of git://github.com/FMCorz/moodle 2012-11-27 15:26:18 +08:00
Frederic Massart
94972ccae1 MDL-36629 usability: CSS adaptations for Workshop 2012-11-27 15:23:13 +08:00
Barbara Ramiro
01d1bb3a23 MDL-36629 usability: New workshop icons 2012-11-27 15:16:11 +08:00
Aparup Banerjee
a58be8a9f1 Merge branch 'MDL-36841_master' of git://github.com/markn86/moodle 2012-11-27 14:56:03 +08:00
Dan Poltawski
908957bc25 Merge branch 'MDL-34695' of git://github.com/rwijaya/moodle 2012-11-27 14:23:29 +08:00
Mark Nelson
04123f6d85 MDL-36841 portfolio: ensure variables in parent function match those of childs to prevent strict standard error 2012-11-27 14:12:25 +08:00
Dan Poltawski
0fa3d61d20 Merge branch 'MDL-36302-master' of git://github.com/damyon/moodle 2012-11-27 14:09:56 +08:00
Damyon Wiese
736a655135 MDL-36302 course: Set correct URL on settings page for navigation. 2012-11-27 14:02:39 +08:00
Dan Poltawski
a6d3387c3a Merge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle 2012-11-27 14:01:04 +08:00
Dan Poltawski
db0b3c5078 Merge branch 'MDL-36184-master' of git://github.com/damyon/moodle 2012-11-27 13:58:20 +08:00
Dan Poltawski
3546b9f4d2 version bump for lots of theme changes 2012-11-27 13:53:15 +08:00
Frederic Massart
99938034df MDL-36782 usability: Adjustments following new mark as read icon 2012-11-27 13:46:21 +08:00
Barbara Ramiro
b166d7141e MDL-36782 usability: New icon to mark posts as read on forum 2012-11-27 13:43:05 +08:00
Dan Poltawski
4554660c28 Merge branch 'wip-MDL-36466-m24' of git://github.com/samhemelryk/moodle 2012-11-27 13:38:53 +08:00
Dan Poltawski
f95fb4b600 Merge branch 'wip-MDL-36825-m24' of git://github.com/samhemelryk/moodle 2012-11-27 13:37:49 +08:00
Dan Poltawski
e0c9b42ff7 Merge branch 'MDL-36752-master' of git://git.luns.net.uk/moodle 2012-11-27 13:32:34 +08:00
Dan Poltawski
513c64c303 Merge branch 'MDL-36806' of git://github.com/timhunt/moodle 2012-11-27 13:26:38 +08:00
Dan Poltawski
f285889157 Merge branch 'MDL-36442_master' of git://github.com/lazydaisy/moodle 2012-11-27 13:18:20 +08:00
Dan Poltawski
e7705abdde Merge branch 'MDL-36775-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/upgrade.txt
2012-11-27 13:10:27 +08:00
Dan Poltawski
5d6aca6e1a Merge branch 'MDL-36784-master' of git://github.com/FMCorz/moodle 2012-11-27 13:06:32 +08:00
Dan Poltawski
23510ab2e8 Merge branch 'MDL-36550-master' of git://github.com/FMCorz/moodle 2012-11-27 13:00:44 +08:00