moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58031 commits 37 branches 544 tags 1.3 GiB
Commit graph

58031 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
1d762c8aba Merge branch 'MDL-36752-master-2' of git://git.luns.net.uk/moodle 2012-11-28 09:40:24 +08:00
Andrew Davis
30dd9930ba MDL-36680 core_grade: fixed grade_report::blank_hidden_total() and added unit tests 2012-11-28 08:45:20 +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
sam marshall
da6076f1cc MDL-36808 Completion: Incorrect escaping for activity name in completion tickbox 2012-11-27 13:00:59 +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
Kirill Astashov
cc2ed22851 MDL-36856: Fix method name misspelled in two places in mod_assign 2012-11-27 16:15:26 +10:30
Barbara Ramiro
b166d7141e MDL-36782 usability: New icon to mark posts as read on forum 2012-11-27 13:43:05 +08:00
Luke Tucker
fb11a70254 MDL-34052 assignment - Disable submission and feedback plugins based on assign type when upgrading 2012-11-27 13:40:22 +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
Frederic Massart
d2ced94bff MDL-36550 theme: Fixed syntax error in CSS rules 2012-11-27 12:37:13 +08:00
Aparup Banerjee
720ee26d4a Merge branch 'wip-mdl-36767' of git://github.com/rajeshtaneja/moodle 2012-11-27 12:19:52 +08:00
Dan Poltawski
dcb58f9d06 Merge branch 'MDL-36802-master' of git://github.com/FMCorz/moodle 2012-11-27 12:14:05 +08:00
Frederic Massart
58f46a0e66 MDL-36470 usability: Course legacy files uses the folder icon 2012-11-27 12:11:19 +08:00
Aparup Banerjee
ec03ca7272 Merge branch 'MDL-36710-master' of git://github.com/ankitagarwal/moodle 2012-11-27 12:02:14 +08:00
Dan Poltawski
783c4779df Merge branch 'MDL-36636-master' of git://github.com/FMCorz/moodle 2012-11-27 11:55:21 +08:00
Rajesh Taneja
09153efa90 MDL-36767 Administration: user_filter_yesno use different name for sql filter 
user_filter_yesno extends user_filter_simpleselect, so if user bulk action filter has both
user_filter_simpleselect and user_filter_yesno, they use the same filter name but counter is
different as they are different classes. Hence using different filter name will avoid confilts
 2012-11-27 11:52:53 +08:00
Aparup Banerjee
0319316444 Merge branch 'MDL-36305-master' of git://github.com/FMCorz/moodle 2012-11-27 11:52:50 +08:00
Dan Poltawski
f6399f7547 Merge branch 'MDL-36631-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/upgrade.txt
 2012-11-27 11:39:21 +08:00
Dan Poltawski
e8d7f57e8c Merge branch 'MDL-36630-master' of git://github.com/FMCorz/moodle 2012-11-27 11:25:10 +08:00
Peter Bulmer
1c65f683dc MDL-36838 moodle->mahara mnet SSO failure in FF17 
In MDL-36838 Firefox 17 users are unable to sso from moodle to mahara.

Firefox 17 uses a different user agent (UA) string for Moodle sites than it
does for Mahara or other sites.
This patch relaxes the check which previously required that the UA string
being presented to the SP on landing matched the UA string presented to the IP
when jumping.
Likewise, checks associated with logout calls have been relaxed
 2012-11-27 16:17:43 +13:00