65309 Commits

Author SHA1 Message Date
Damyon Wiese
dc4c0310ee Merge branch 'MDL-42913a' of https://github.com/srynot4sale/moodle 2013-11-25 13:11:24 +08:00
Dan Poltawski
e7f52df8f6 Merge branch '43016-27' of git://github.com/samhemelryk/moodle 2013-11-25 12:21:20 +08:00
Dan Poltawski
83a97ce6c7 Merge branch 'master_MDL-42992' of git://github.com/danmarsden/moodle 2013-11-25 11:17:47 +08:00
Dan Poltawski
43e72c1f6a Merge branch 'wip-MDL-43024-master' of git://github.com/marinaglancy/moodle 2013-11-25 11:06:39 +08:00
Dan Poltawski
f5bc16cbd1 Merge branch 'MDL-42858' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-25 10:48:33 +08:00
James Pratt
a9e2f21125 MDL-42957 quiz statistics : Hardcoded sql LIMIT clause 2013-11-25 10:43:18 +08:00
Dan Poltawski
a136e16c8e Merge branch 'MDL-42547_master' of https://github.com/markn86/moodle 2013-11-25 10:37:33 +08:00
Marina Glancy
724b00b2b6 MDL-43024 course: fixed bug for accessing section options 2013-11-22 12:41:35 +11:00
Sam Hemelryk
9474b47781 MDL-43016 block_navigation: fixed category link display 2013-11-22 08:55:39 +13:00
Eloy Lafuente (stronk7)
f7434db109 weekly on-sync release 2.7dev 2013-11-21 19:33:52 +01:00
Eloy Lafuente (stronk7)
9d1a546fa0 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-11-21 19:33:47 +01:00
rwijaya
3e57883c5c MDL-42858 Course Management: fix regression for subcategories visibility 2013-11-21 15:32:50 +08:00
Dan Marsden
18a34b07e6 MDL-42992 SCORM: Always allow IE to resize window 2013-11-21 10:22:42 +13:00
Damyon Wiese
b170380a8e MDL-42930 Release upgrade line: Fix ordering for tinymce 2013-11-20 11:47:35 +08:00
Marina Glancy
a99e1ad9ec Merge branch 'MDL-42767-master' of git://github.com/ankitagarwal/moodle 2013-11-20 13:20:17 +11:00
Aaron Barnes
2eaa440c34 MDL-42913 lib/grouplib.php: Avoid cache sometimes for groups_get_all_groups
The new groups cache returns unexpected results when you pass
in a field parameter than would normally change the result array index
2013-11-20 11:56:42 +13:00
Ankit Agarwal
542d3820d1 MDL-42767 events: Remove ob_clean from tests 2013-11-19 16:34:49 +08:00
Ankit Agarwal
cc49a6f7eb MDL-42767 notes: Delete notes on a course delete 2013-11-19 16:32:19 +08:00
Mark Nelson
7ca44a4963 MDL-42547 tool_uploaduser: trim values before uploading users 2013-11-18 20:07:01 -08:00
Dan Poltawski
f7b47f1c0c Merge branch 'wip-mdl-42403' of https://github.com/rajeshtaneja/moodle 2013-11-19 11:43:39 +08:00
Rajesh Taneja
3ea677e39a MDL-42403 course: Added behat to check visibility of bluk move action 2013-11-19 10:52:33 +08:00
Rajesh Taneja
a5888fb591 MDL-42403 course: Show bluk move to category only when something selected 2013-11-19 10:52:32 +08:00
Dan Poltawski
84cd1a2a91 Merge branch '42060-27' of git://github.com/samhemelryk/moodle 2013-11-19 10:39:30 +08:00
Dan Poltawski
2a0a33a6ee Merge branch 'MDL-42504' of git://github.com/timhunt/moodle 2013-11-19 10:30:16 +08:00
Dan Poltawski
0cf4e15baf Merge branch 'MDL-42181' of git://github.com/mkassaei/moodle 2013-11-19 10:04:59 +08:00
Damyon Wiese
86249e9aeb Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle 2013-11-19 09:49:57 +08:00
Sam Hemelryk
417d6f51cc Merge branch 'MDL-42905-master' of git://github.com/sammarshallou/moodle 2013-11-19 14:37:28 +13:00
Sam Hemelryk
8b5e008bc2 Merge branch 'MDL-42553_master' of https://github.com/markn86/moodle 2013-11-19 14:31:51 +13:00
Sam Hemelryk
496692fb9d Merge branch 'wip-MDL-42850-master' of git://github.com/abgreeve/moodle 2013-11-19 14:19:20 +13:00
AMOS bot
0455c4768f Automatically generated installer lang files 2013-11-19 00:40:26 +00:00
Dan Marsden
eef4c4c175 MDL-40223 SCORM: pass limit into function instead of hardcoding to allow cross-db 2013-11-19 13:23:06 +13:00
Sam Hemelryk
40dca7e4d6 Merge branch 'MDL-41316-master' of git://github.com/ankitagarwal/moodle 2013-11-19 12:28:08 +13:00
Sam Hemelryk
35a1978985 Merge branch 'w47_MDL-42612_m27_paypalruble' of https://github.com/skodak/moodle 2013-11-19 12:24:56 +13:00
Sam Hemelryk
40ce744d08 Merge branch 'MDL-42774-master' of git://github.com/andrewnicols/moodle 2013-11-19 12:06:29 +13:00
Sam Hemelryk
074e5686db Merge branch 'MDL-42863' of git://github.com/timhunt/moodle 2013-11-19 12:03:41 +13:00
Sam Hemelryk
04fcb4a96c Merge branch 'MDL-42865' of git://github.com/timhunt/moodle 2013-11-19 11:50:44 +13:00
Sam Hemelryk
3d2dc94bf1 MDL-42852 theme_bootstrapbase: fixed whitespace 2013-11-19 11:45:17 +13:00
Sam Hemelryk
d7a0da37d9 Merge branch 'wip-MDL-42852_master' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-19 11:42:25 +13:00
Sam Hemelryk
1098226524 Merge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle 2013-11-19 10:15:33 +13:00
Sam Hemelryk
34592ffd98 Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-19 10:08:45 +13:00
Damyon Wiese
ef16df1449 Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle 2013-11-18 16:08:57 +08:00
Dan Poltawski
66a02845e9 Merge branch 'MDL-42880b' of git://github.com/timhunt/moodle 2013-11-18 15:37:01 +08:00
Damyon Wiese
79149e85fb Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle 2013-11-18 15:26:52 +08:00
Damyon Wiese
67016a4d39 Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle 2013-11-18 15:12:56 +08:00
Damyon Wiese
7f2c374dcd Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle 2013-11-18 14:55:18 +08:00
Dan Poltawski
b6813d8f6a Merge branch 'MDL-42884_master' of https://github.com/markn86/moodle 2013-11-18 14:41:06 +08:00
Dan Poltawski
728f924ec1 Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle
Conflicts:
	mod/scorm/db/upgrade.php
2013-11-18 14:32:55 +08:00
Damyon Wiese
61cdb947e8 Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle 2013-11-18 14:05:17 +08:00
Petr Škoda
93d31b5d77 MDL-42612 add support for Russian Ruble in PayPal 2013-11-18 11:49:10 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00