52166 Commits

Author SHA1 Message Date
Dan Poltawski
149da7724b Merge branch 'w12_MDL-29894_m23_objectparams' of git://github.com/skodak/moodle 2012-03-20 16:40:28 +08:00
Petr Skoda
c2daa41a2e MDL-32094 fix duration test 2012-03-20 09:22:29 +01:00
Aparup Banerjee
0e5c50e29a MDL-29848 glossary: fixed whitespace 2012-03-20 16:12:02 +08:00
Aparup Banerjee
aa4edcf614 Merge branch 'MDL-29848-master' of https://github.com/mackensen/moodle 2012-03-20 16:06:40 +08:00
Aparup Banerjee
7d2b2e808f Merge branch 'MDL-31818_grader_paging' of git://github.com/andyjdavis/moodle 2012-03-20 13:20:03 +08:00
Sam Hemelryk
ef844d0a15 Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle 2012-03-20 16:47:17 +13:00
Sam Hemelryk
0ca579f2cd MDL-11047 mod_quiz: bumped version in upgrade after conflict resolution 2012-03-20 16:46:19 +13:00
Ankit Agarwal
efd6defecb MDL-28592 blocks: changing the arguments to moodle_url::out() 2012-03-20 10:57:12 +08:00
Aparup Banerjee
b36135b66a Merge branch 'wip-MDL-31528-m23' of git://github.com/samhemelryk/moodle 2012-03-20 10:09:43 +08:00
Sam Hemelryk
270bdf5265 Merge branch 'MDL-11047' of git://github.com/mackensen/moodle
Conflicts:
	mod/quiz/version.php
2012-03-20 14:04:04 +13:00
Sam Hemelryk
62cf6937f6 Merge branch 'wip-MDL-32037-master' of git://github.com/marinaglancy/moodle 2012-03-20 13:33:30 +13:00
Sam Hemelryk
9340d834f3 Merge branch 'w12_MDL-32050_m23_minify' of git://github.com/skodak/moodle 2012-03-20 12:50:21 +13:00
Sam Hemelryk
e2edc82058 Merge branch 'w12_MDL-32043_m23_webserver' of git://github.com/skodak/moodle 2012-03-20 12:12:44 +13:00
Sam Hemelryk
f40400b91e Merge branch 'w12_MDL-32045_m23_resetnorole' of git://github.com/skodak/moodle 2012-03-20 12:06:07 +13:00
Sam Hemelryk
ef3b34ccc7 Merge branch 'w12_MDL-32052_m23_authtype' of git://github.com/skodak/moodle 2012-03-20 12:02:05 +13:00
Sam Hemelryk
fab344f54b Merge branch 'w12_MDL-32071_m23_dbfamily' of git://github.com/skodak/moodle 2012-03-20 11:46:00 +13:00
Sam Hemelryk
b896c12bca Merge branch 'w12_MDL-32079_m23_folderrev' of git://github.com/skodak/moodle 2012-03-20 11:34:21 +13:00
M Kassaei
e6208ec604 MDL-32053 question: Question bank table displayed inconsistently 2012-03-20 11:00:16 +13:00
M Kassaei
d1a80dd2b2 MDL-32048 mod_quiz: Question bank select/deselect all shows strange behaviour in IE 2012-03-20 10:55:01 +13:00
Sam Hemelryk
f7dbc2814c Merge branch 'MDL-32064' of git://github.com/timhunt/moodle 2012-03-20 10:37:38 +13:00
Sam Hemelryk
6f3570ffec MDL-19125 upgrade: Fixed assignment typo 2012-03-20 10:34:30 +13:00
Mary Evans
4c67628cea MDL-30235 theme_anomaly: change anomaly theme to use san-serif fonts 2012-03-19 13:05:53 +00:00
Sam Hemelryk
2525cee573 Merge branch 'MDL-32084_master' of git://github.com/lazydaisy/moodle 2012-03-19 20:38:28 +13:00
Sam Hemelryk
b31865ce2a Merge branch 'w12_MDL-32090_m23_groupui' of git://github.com/skodak/moodle 2012-03-19 20:33:48 +13:00
Sam Hemelryk
ae89dd8de9 Merge branch 'w12_MDL-32046_m23_lastdbuser' of git://github.com/skodak/moodle 2012-03-19 20:29:39 +13:00
Petr Skoda
0f75e1e627 MDL-27553 admin: Fixed override bug 2012-03-19 20:21:33 +13:00
Sam Hemelryk
2cd97ff3c5 Merge branch 'w12_MDL-31703_m23_rootdirroot' of git://github.com/skodak/moodle 2012-03-19 20:16:34 +13:00
Rajesh Taneja
fdfe706489 MDL-31640 course: removed extra error message, perpage is set properly, modulelink hidden field, and new context call is used. 2012-03-19 15:15:06 +08:00
Sam Hemelryk
47def74bb8 Merge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle 2012-03-19 20:06:40 +13:00
Sam Hemelryk
96e7855298 MDL-31528 navigation: Fixed up missing break and optimised category.php 2012-03-19 19:32:15 +13:00
Sam Hemelryk
11c0eccee4 MDL-31984 Fixed whitespace during integration 2012-03-19 19:12:40 +13:00
Brian Jorgensen
6fc267a07d MDL-31984: add debugging message if theme renderer file is missnamed 2012-03-19 19:12:39 +13:00
Rajesh Taneja
506cbfd749 MDL-31640 course: Move to, edit and search functionality in search.php is fixed with proper permission check 2012-03-19 12:02:02 +08:00
Rajesh Taneja
476aea8d8b MDL-26674 wiki2.0: cleaned wiki event logging patch 2012-03-19 11:15:06 +08:00
Sam Hemelryk
f359fd6fcc Merge branch 'wip-MDL-27064-master' of git://github.com/phalacee/moodle 2012-03-19 15:49:05 +13:00
Tim Lock
186fc53401 MDL-31869: Searching for users in messaging with multiple roles generates a warning 2012-03-19 09:31:46 +07:00
Diane Villemure
b7921fc458 MDL-26674 wiki2.0: Fixed wiki activity log 2012-03-19 10:20:18 +08:00
Sam Hemelryk
1a8ea682ef Merge branch 'MDL-32004-master-2' of git://git.luns.net.uk/moodle 2012-03-19 14:37:49 +13:00
Sam Hemelryk
55652c87a8 Merge branch 'MDL-32008-master-2' of git://git.luns.net.uk/moodle 2012-03-19 14:28:06 +13:00
Sam Hemelryk
6972a9b7b7 Merge branch 'MDL-28187_messaging_nav' of git://github.com/andyjdavis/moodle 2012-03-19 14:14:28 +13:00
Sam Hemelryk
223d02a468 Merge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle 2012-03-19 14:10:37 +13:00
Sam Hemelryk
4354486d30 MDL-19125 upgrade: Fixed typo 2012-03-19 11:01:50 +13:00
Sam Hemelryk
fb1d0388ff Merge branch 'MDL-30890' of git://github.com/rwijaya/moodle 2012-03-19 10:28:14 +13:00
Sam Hemelryk
8149d6240a MDL-19125 lib: Fixed up inline comments during integration 2012-03-19 10:08:47 +13:00
Sam Hemelryk
264743baaf Merge branch 'MDL-19125_module_security' of git://github.com/timhunt/moodle 2012-03-19 10:07:57 +13:00
Petr Skoda
e2bb3c9275 MDL-32094 some more E_STRICT fixes 2012-03-18 20:40:20 +01:00
Petr Skoda
990e4b0ee9 MDL-32094 do not show html markup in cron errors 2012-03-18 18:43:56 +01:00
Petr Skoda
fabbf4398b MDL-32094 some nasty quickforms hacks that should help with E_STRICT
Note: we have stopped tracking our QuickForms hacks long ago.
2012-03-18 18:39:37 +01:00
Petr Skoda
f4b8586a26 MDL-32094 our ageing SimpleTest integration is not going to be compatible with E_STRICT 2012-03-18 18:38:08 +01:00
Petr Skoda
f20edd5208 MDL-32094 fix various E_STRICT compatibility problems 2012-03-18 18:37:24 +01:00