53221 Commits

Author SHA1 Message Date
Dan Poltawski
b60b839d31 Merge branch 'MDL-32869_master' of git://github.com/kordan/moodle 2012-05-15 15:32:03 +08:00
Dan Poltawski
0a6202232c Merge branch 'MDL-32321_master' of git://github.com/kordan/moodle 2012-05-15 15:30:28 +08:00
Dan Poltawski
1e1931a797 Merge branch 'MDL-32978-master-integration' of git://github.com/FMCorz/moodle 2012-05-15 14:43:31 +08:00
Aparup Banerjee
c459e91789 Merge branch 'MDL-25695-master' of https://github.com/mackensen/moodle 2012-05-15 11:03:07 +08:00
Dan Poltawski
7a76aad7b7 Merge branch 'MDL-32930' of git://github.com/tmuras/moodle 2012-05-14 20:57:14 +08:00
Dan Poltawski
095de3cee6 Merge branch 'MDL-32863' of git://github.com/jonof/moodle 2012-05-14 20:49:05 +08:00
Dan Poltawski
eca95b639d Merge branch 'MDL-32375' of git://github.com/timhunt/moodle 2012-05-14 20:42:12 +08:00
Dan Poltawski
bdd773d565 Merge branch 'MDL-30291' of git://github.com/rwijaya/moodle 2012-05-14 18:08:30 +08:00
Dan Poltawski
36e686a07e MDL-32923 phpunit: make copy/paste easier 2012-05-14 17:38:58 +08:00
Dan Poltawski
225097f75a Merge branch 'MDL-31719_master' of git://github.com/lazydaisy/moodle 2012-05-14 15:53:19 +08:00
Dan Poltawski
7e86180956 MDL-32923 phpunit: be a bit more verbose about re-run cmmand 2012-05-14 15:48:26 +08:00
Dan Poltawski
a5fefe0bbd Merge branch 'w20_MDL-32923_m23_phpunithint' of git://github.com/skodak/moodle 2012-05-14 15:46:23 +08:00
Dan Poltawski
cf037ba049 Merge branch 'w20_MDL-26901_m23_tinymceoptions' of git://github.com/skodak/moodle 2012-05-14 14:44:04 +08:00
Dan Poltawski
bf9b08dd5e Merge branch 'wip-mdl-31941' of git://github.com/rajeshtaneja/moodle 2012-05-14 14:26:29 +08:00
Dan Poltawski
ec3f19bddb Merge branch 'MDL-31951' of git://github.com/rwijaya/moodle 2012-05-14 14:23:41 +08:00
Dan Poltawski
8715472b1d Merge branch 'MDL-32742-master-1' of git://git.luns.net.uk/moodle 2012-05-14 14:21:57 +08:00
Dan Poltawski
1af542ed67 Merge branch 'MDL-31804_ambiguous_sql' of git://github.com/andyjdavis/moodle 2012-05-14 14:20:05 +08:00
Dan Poltawski
a225149c9a Merge branch 'MDL-24401' of git://github.com/rwijaya/moodle 2012-05-14 14:12:30 +08:00
Dan Poltawski
b728070f5d Merge branch 'MDL-32902' of git://github.com/netspotau/moodle-mod_assign 2012-05-14 14:08:27 +08:00
Dan Poltawski
77acdb26f2 Merge branch 'w20_MDL-32915_m23_chatdiv' of git://github.com/skodak/moodle 2012-05-14 14:06:37 +08:00
Dan Poltawski
783669b96b Merge branch 'wip-MDL-32872-m23' of git://github.com/samhemelryk/moodle 2012-05-14 14:00:51 +08:00
Dan Poltawski
3359a6fe07 Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle 2012-05-14 13:36:11 +08:00
Dan Poltawski
ae745307ef Merge branch 'w20_MDL-32960_m23_phpunitref' of git://github.com/skodak/moodle 2012-05-14 13:32:18 +08:00
Frederic Massart
6189c7b4d3 MDL-32978 Gradebook: Fix strict standards notices 2012-05-14 13:27:06 +08:00
Dan Poltawski
a271c57af8 Merge branch 'wip-MDL-32611-m23' of git://github.com/samhemelryk/moodle 2012-05-14 13:12:53 +08:00
Dan Poltawski
950632673b Merge branch 'MDL-32875-master-1' of git://git.luns.net.uk/moodle 2012-05-14 13:08:40 +08:00
Jonathon Fowler
ef8c793d74 MDL-31804 duplicated columns cause Oracle error in grader report 2012-05-14 11:00:29 +07:00
Damyon Wiese
3b6bbd767b MDL-32902: Remove 70% width stylesheet rule for tables on the mod_assign submission screen. 2012-05-14 11:39:42 +08:00
Sam Hemelryk
dfb597b447 Merge branch 'MDL-31134-master' of git://github.com/ankitagarwal/moodle 2012-05-14 15:36:55 +12:00
Jonathon Fowler
0eefca3b66 MDL-32863 question: fix for Oracle ambiguous column error 2012-05-14 12:52:58 +10:00
Sam Hemelryk
86558590a4 Merge branch 'MDL-31944' of git://github.com/ankitagarwal/moodle 2012-05-14 14:52:10 +12:00
Dan Poltawski
bb30328fe1 Merge branch 'w20_MDL-26553_m23_sqlsrvconfig' of git://github.com/skodak/moodle 2012-05-14 10:49:52 +08:00
Sam Hemelryk
edd25271c4 Merge branch 'MDL-30305-master-1' of git://git.luns.net.uk/moodle 2012-05-14 14:48:31 +12:00
Dan Poltawski
e87a7c65f1 Merge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle 2012-05-14 10:41:46 +08:00
Sam Hemelryk
f98a3833b9 Merge branch 'w20_MDL-32659_m23_navcourses' of git://github.com/skodak/moodle 2012-05-14 14:37:51 +12:00
Dan Poltawski
41ea0d3cc2 Merge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle 2012-05-14 10:28:05 +08:00
Rossiani Wijaya
1dedecf260 MDL-30291 outputrenderers: fixed typo for 2012-05-14 10:25:05 +08:00
Dan Poltawski
85c85b8102 Merge branch 'MDL-27322_export' of git://github.com/andyjdavis/moodle 2012-05-14 10:22:21 +08:00
Dan Poltawski
2edce32ad4 Merge branch 'MDL-32910' of git://github.com/timhunt/moodle 2012-05-14 10:10:03 +08:00
Sam Hemelryk
04d7103804 Merge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle 2012-05-14 14:04:21 +12:00
Sam Hemelryk
924c34df8c MDL-32873 course: Fixed up unused global + phpdocs 2012-05-14 13:41:15 +12:00
Sam Hemelryk
1c0441bd6a Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle
Conflicts:
	course/lib.php
2012-05-14 13:39:55 +12:00
Sam Hemelryk
8ec7c2cfd9 Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle 2012-05-14 13:30:16 +12:00
Sam Hemelryk
c96e613c66 Merge branch 'wip-MDL-32126-master' of git://github.com/abgreeve/moodle 2012-05-14 13:20:07 +12:00
Adrian Greeve
0ba303e85f MDL-32126 - data - Fix of an error when sorting by other criteria. 2012-05-14 07:27:01 +08:00
Sam Hemelryk
fe579c15b7 MDL-32611 editcategory: Fixed up navigation error. 2012-05-14 09:16:43 +12:00
Sam Hemelryk
6669b8e91e MDL-32872 tool_roles: Fixed up navigation on user roles page 2012-05-14 08:54:50 +12:00
Mary Evans
b87ac3867e MDL-31719 lang/en/admin.php: changed text in $string['configallowthemechangeonurl'] to make less ambiguous 2012-05-13 14:40:30 +01:00
Petr Skoda
246c8d497c MDL-26553 add sqlsrv to list of available db types in config-dist.php 2012-05-13 14:28:25 +02:00
Petr Skoda
7edfd54fcf MDL-32915 fix bogus open div in basic chat ui 2012-05-13 10:24:43 +02:00