Commit graph

56253 commits

Author SHA1 Message Date
Dan Poltawski
5d9e2ab19e Merge branch 'MDL-34691_assign_overdue_by' of https://github.com/SWiT/moodle 2012-08-21 14:36:41 +08:00
Adrian Greeve
2b7ece005e MDL-6424 - blocks - Adding a warning screen when the user clicks the delete link. 2012-08-21 14:31:24 +08:00
Dan Poltawski
b6476885a4 Merge branch 'wip-mdl-34293' of git://github.com/rajeshtaneja/moodle 2012-08-21 13:56:58 +08:00
Rajesh Taneja
4625404451 MDL-34293 Themes: Added tbody to flexible table 2012-08-21 13:50:38 +08:00
Frederic Massart
ad778c84e8 MDL-34648 Course: Added capability to control sections moving 2012-08-21 13:31:19 +08:00
Dan Poltawski
509b17c71d Merge branch 'MDL-32705' of git://github.com/timhunt/moodle 2012-08-21 12:37:43 +08:00
Dan Poltawski
828ecbaf13 Merge branch 'MDL-34569_accessibility' of git://github.com/rwijaya/moodle 2012-08-21 12:35:05 +08:00
Dan Poltawski
34f5898f5e Merge branch 'MDL-34118' of git://github.com/timhunt/moodle 2012-08-21 12:29:16 +08:00
Dan Poltawski
3a66d4255d MDL-31341 mod_assign: fixup minor coding style issues 2012-08-21 12:18:40 +08:00
Dan Poltawski
94fb9f9fae Merge branch 'MDL-31341' of git://github.com/netspotau/moodle-mod_assign 2012-08-21 12:13:51 +08:00
Dan Poltawski
6c6604350d Merge branch 'w34_MDL-34901_m24_useraccess' of git://github.com/skodak/moodle 2012-08-21 12:02:17 +08:00
Dan Poltawski
74c0bc34d7 Merge branch 'MDL-34742-master' of git://github.com/FMCorz/moodle 2012-08-21 11:59:14 +08:00
Dan Poltawski
92158c9b4a Merge branch 'wip-mdl-32797' of git://github.com/rajeshtaneja/moodle 2012-08-21 11:48:58 +08:00
Dan Poltawski
29e8b15d83 MDL-34808 qformat_examview - increment version 2012-08-21 11:05:22 +08:00
Dan Poltawski
6a721e3ebb Merge branch 'MDL-34808' of git://github.com/jmvedrine/moodle 2012-08-21 11:00:38 +08:00
Dan Poltawski
8cf68e0d5c Merge branch 'MDL-34887' of git://github.com/raymondAntonio/moodle 2012-08-21 10:53:53 +08:00
David Monllao
649ac85dec MDL-31496 mod_data Replacing inline styles for CSS classes in templates and browse view 2012-08-21 10:40:29 +08:00
Paul Charsley
4a52712627 Merge branch 'master' of https://github.com/moodle/moodle 2012-08-21 14:39:26 +12:00
Dan Poltawski
d642260cfe Merge branch 'w34_MDL-34954_m24_subplugins' of git://github.com/skodak/moodle 2012-08-21 10:34:28 +08:00
Dan Poltawski
115728888a MDL-34738 qformat_blackboard - increment version number 2012-08-21 09:56:29 +08:00
Dan Poltawski
2a455e13e7 Merge branch 'MDL-34738' of git://github.com/jmvedrine/moodle 2012-08-21 09:39:50 +08:00
Eloy Lafuente (stronk7)
70d6e4c123 Merge branch 'MDL-34941' of https://github.com/mouneyrac/moodle 2012-08-21 02:42:33 +02:00
Eloy Lafuente (stronk7)
fffb9b9064 Merge branch 'w34_MDL-34912_m24_description' of git://github.com/skodak/moodle 2012-08-21 02:39:10 +02:00
Eloy Lafuente (stronk7)
ee998a687c Merge branch 'MDL-34889' of git://github.com/timhunt/moodle 2012-08-21 02:24:50 +02:00
Eloy Lafuente (stronk7)
2bdbe66264 Merge branch 'MDL-34810' of git://github.com/timhunt/moodle 2012-08-21 01:36:15 +02:00
Eloy Lafuente (stronk7)
afe404068d Merge branch 'MDL-29847' of git://github.com/timhunt/moodle 2012-08-21 01:28:34 +02:00
Eloy Lafuente (stronk7)
57733008c9 Merge branch 'MDL-31957-master' of git://github.com/sammarshallou/moodle 2012-08-21 01:21:18 +02:00
Eric Merrill
13f87cb21e MDL-34985 gradebook Fixing issue where default parent in Full View Add Category could be inconsistent.
Turns out the correct default was already computed, but was not being applied to the setting.
2012-08-20 17:09:40 -04:00
Eloy Lafuente (stronk7)
2672817478 Merge branch 'w34_MDL-34960_m24_gmapsv2drop' of git://github.com/skodak/moodle 2012-08-20 20:34:13 +02:00
Eloy Lafuente (stronk7)
5bed363980 Merge branch 'w34_MDL-34959_m24_gmapsv3' of git://github.com/skodak/moodle 2012-08-20 20:28:59 +02:00
Eloy Lafuente (stronk7)
fae6f7cad0 Merge branch 'w34_MDL-34868_m24_gmapsv2' of git://github.com/skodak/moodle 2012-08-20 20:17:27 +02:00
Eloy Lafuente (stronk7)
040d4c63be Merge branch 'MDL-34756-master' of git://github.com/FMCorz/moodle 2012-08-20 16:34:18 +02:00
Eloy Lafuente (stronk7)
53db05a507 Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle 2012-08-20 16:28:09 +02:00
Jason Ilicic
b3e10b89e9 MDL-34529: Fixed ordering of course sections when performing import/restore by adding the sort parameter. 2012-08-20 14:00:45 +02:00
Nathan Mares
4cb18cb080 MDL-34372: Fix query in backup_cron_helper so it works on Postgres 8.3
Amended by stronk7@moodle.org to use uppercase SQL keywords.
2012-08-20 13:27:32 +02:00
David Monllao
f70a4f124b MDL-31496 mod_data Replacing inline styles for CSS classes in text inputs 2012-08-20 17:17:24 +08:00
David Monllao
0d284a8bd6 MDL-31496 mod_data Replacing inline styles for CSS classes in search containers 2012-08-20 17:16:15 +08:00
Jean-Michel Vedrine
01ef6c815e MDL-34808 load sample xml file from fixtures in tests 2012-08-20 10:44:34 +02:00
David Monllao
b859dc533f MDL-31496 mod_data Replacing inline styles for CSS classes in textarea elements 2012-08-20 16:44:01 +08:00
Dan Poltawski
821aac54b4 Merge branch 'MDL-33362-master' of git://github.com/ankitagarwal/moodle 2012-08-20 16:01:09 +08:00
Dan Poltawski
9522185b3c Merge branch 'MDL-34779-master' of git://github.com/ankitagarwal/moodle 2012-08-20 15:58:22 +08:00
Dan Poltawski
328e4d280c Merge branch 'w34_MDL-34956_m24_pluginlibregression' of git://github.com/skodak/moodle 2012-08-20 15:56:41 +08:00
Michael de Raadt
6e56d9dcb7 MDL-34779 settings: Updating lang string corrposnding to the fullnamedisplay setting 2012-08-20 15:46:54 +08:00
Jean-Michel Vedrine
735702f62c MDL-34738 load sample dat file in tests 2012-08-20 09:41:02 +02:00
Dan Poltawski
9d218eedb5 Merge branch 'w34_MDL-34740_m24_pageclass' of git://github.com/skodak/moodle 2012-08-20 15:33:36 +08:00
Dan Poltawski
e78fa88938 Merge branch 'w34_MDL-34873_m24_tagstrict' of git://github.com/skodak/moodle 2012-08-20 15:18:32 +08:00
Dan Poltawski
20db0a6ff0 Merge branch 'MDL-34934' of git://github.com/stronk7/moodle 2012-08-20 14:46:42 +08:00
Dan Poltawski
eca92c379e Merge branch 'MDL-34957_master' of git://github.com/lazydaisy/moodle 2012-08-20 14:23:22 +08:00
Dan Poltawski
09b07f748c Merge branch 'MDL-34937' of git://github.com/timhunt/moodle 2012-08-20 14:19:22 +08:00
Dan Poltawski
bf2e9ae1e8 Merge branch 'MDL-34377' of git://github.com/raymondAntonio/moodle 2012-08-20 14:11:37 +08:00