51132 Commits

Author SHA1 Message Date
Andrew Robert Nicols
2f76f1019e MDL-31242 Prevent redefinition of MOODLE_INTERNAL when loading multiple YUI modules from Moodle 2012-01-18 15:38:55 +01:00
Eloy Lafuente (stronk7)
7fb7e9835a MDL-31006 revert partially @ get_config()
The change from null to stdClass() in get_config() was leading to:

1) unit tests not passing.
2) non-equivalent evaluation in conditions (null evals false,
   stdClassi() evals true)
2012-01-18 02:09:46 +01:00
Petr Skoda
927010240f MDL-31006 some more PHP54 notices
PHP54 compatibility - PhpStorm IDE is the best tool for this kind of work!!
2012-01-18 01:17:25 +01:00
Petr Skoda
b85b25ebb8 MDL-31006 fix various notices in PHP54
PHP54 compatibility
2012-01-18 01:03:20 +01:00
Eloy Lafuente (stronk7)
ae924874d7 Merge branch 'w03_MDL-31213_m23_attributesmess' of git://github.com/skodak/moodle 2012-01-17 12:32:47 +01:00
Petr Skoda
48cbe43ded MDL-31213 fix incorrect modifications of quickforms attributes 2012-01-17 11:18:56 +01:00
Eloy Lafuente (stronk7)
dc978ceb99 Merge branch 'w03_MDL-31053_m23_contextpreloading' of git://github.com/skodak/moodle 2012-01-17 02:18:46 +01:00
Eloy Lafuente (stronk7)
5f39437ae0 Merge branch 'w03_MDL-31127_m23_switchaccessinit' of git://github.com/skodak/moodle 2012-01-17 02:10:41 +01:00
Eloy Lafuente (stronk7)
679f37e5fe Merge branch 'w03_MDL-31161_m23_reqpluginnotice' of git://github.com/skodak/moodle 2012-01-17 02:05:53 +01:00
Eloy Lafuente (stronk7)
2176ed55e9 Merge branch 'MDL-31080' of git://github.com/timhunt/moodle 2012-01-17 01:58:51 +01:00
Eloy Lafuente (stronk7)
ec43e2267c Merge branch 'MDL-30408-master' of git://github.com/sammarshallou/moodle 2012-01-17 01:43:19 +01:00
Eloy Lafuente (stronk7)
4374d03158 Merge branch 'w03_MDL-31142_m23_slowiconv' of git://github.com/skodak/moodle 2012-01-17 01:36:03 +01:00
Eloy Lafuente (stronk7)
f58e09cbce Merge branch 'w03_MDL-31171_m23_blogattachment' of git://github.com/skodak/moodle 2012-01-17 01:31:59 +01:00
Eloy Lafuente (stronk7)
479932c132 Merge branch 'w03_MDL-31170_m23_blogblocks' of git://github.com/skodak/moodle 2012-01-17 00:55:31 +01:00
Eloy Lafuente (stronk7)
325f3addf2 Merge branch 'MDL-3054' of git://github.com/nebgor/moodle 2012-01-16 12:24:35 +01:00
Eloy Lafuente (stronk7)
b3bc81893e Merge branch 'MDL-31196' of git://github.com/stronk7/moodle 2012-01-16 12:16:42 +01:00
Eloy Lafuente (stronk7)
273a432956 MDL-31196 quiz stats - fix version out of sync introduced recently
Pointing to current master version as requirement (2012020200)
2012-01-16 11:16:59 +01:00
Aparup Banerjee
b3f8559ebc MDL-3054 quiz : correcting currentpage to unsigned 2012-01-16 17:35:57 +08:00
Sam Hemelryk
d36b5d1177 Merge branch 'MDL-31095' of git://github.com/timhunt/moodle 2012-01-16 16:58:32 +08:00
Sam Hemelryk
99eec460d7 Merge branch 'MDL-31135' of https://github.com/timhunt/moodle 2012-01-16 16:40:33 +08:00
Sam Hemelryk
b1baa8a2f2 Merge branch 'MDL-31102' of git://github.com/timhunt/moodle 2012-01-16 16:30:48 +08:00
Aparup Banerjee
12fd545a01 MDL-30929 fixed spelling mistake in string. 2012-01-16 16:24:22 +08:00
Sam Hemelryk
3c7aef3492 Merge remote-tracking branch 'skodak/w03_MDL-27165_m23_confirmed' 2012-01-16 16:17:28 +08:00
Petr Skoda
ca281c51bb MDL-31142 fix textlib::substr() performance, invalid length in iconv_substr; use mbstring by default 2012-01-16 09:16:14 +01:00
Aparup Banerjee
c8be518100 Merge branch 'w03_MDL-30929_m23_stalefiles' of https://github.com/skodak/moodle 2012-01-16 16:15:04 +08:00
Petr Skoda
9008ec1654 MDL-30929 detect incorrect major version upgrades 2012-01-16 09:08:36 +01:00
Aparup Banerjee
025ce406e7 Merge branch 'MDL-31143' of https://github.com/timhunt/moodle 2012-01-16 15:29:05 +08:00
Sam Hemelryk
e9d2492833 Merge remote-tracking branch 'skodak/w03_MDL-29102_m23_autogrouping' 2012-01-16 15:12:02 +08:00
Sam Hemelryk
69136724f6 Merge remote-tracking branch 'skodak/w03_MDL-30891_m23_repository' 2012-01-16 15:01:36 +08:00
Sam Hemelryk
0cfedcbba7 Merge remote-tracking branch 'skodak/w03_MDL-30958_m23_yuissl' 2012-01-16 14:55:52 +08:00
Aparup Banerjee
9208714315 Merge branch 'w03_MDL-31166_m23_clipath' of https://github.com/skodak/moodle 2012-01-16 14:52:23 +08:00
Sam Hemelryk
3ce3bb8861 MDL-31011 course: Fixed typo in comment 2012-01-16 14:49:56 +08:00
Sam Hemelryk
371fa34ecc Merge remote-tracking branch 'skodak/w03_MDL-31011_m23_loglinks' 2012-01-16 14:49:55 +08:00
Aparup Banerjee
cd70d3c4a8 Merge branch 'w03_MDL-21992_m23_customscripts' of https://github.com/skodak/moodle 2012-01-16 14:46:39 +08:00
Aparup Banerjee
9e32834827 Merge branch 'wip-MDL-31025-m23' of https://github.com/samhemelryk/moodle 2012-01-16 14:40:46 +08:00
Sam Hemelryk
6a57cb0cb0 Merge remote-tracking branch 'skodak/w03_MDL-31035_m23_identitynotice' 2012-01-16 14:38:47 +08:00
Sam Hemelryk
1b81892765 Merge remote-tracking branch 'skodak/w03_MDL-31117_m23_grouptodo' 2012-01-16 14:35:30 +08:00
Sam Hemelryk
a2734ca8d1 Merge remote-tracking branch 'skodak/w03_MDL-31109_m23_maintenance' 2012-01-16 14:33:40 +08:00
Sam Hemelryk
7255250c2c Merge remote-tracking branch 'skodak/w03_MDL-31092_m23_emailpass' 2012-01-16 14:30:43 +08:00
Mary Evans
e52c36ddf8 MDL-29724-update login page layout for all themes 2012-01-16 14:02:25 +08:00
Aparup Banerjee
c5fd16826a MDL-3054 quiz : cleaned whitespaces. 2012-01-16 13:41:12 +08:00
Aparup Banerjee
8e9e623e79 Merge branch 'MDL-3054' of git://github.com/mackensen/moodle 2012-01-16 13:38:49 +08:00
Sam Hemelryk
8a4c5170a5 Merge branch 'MDL-31144' of git://github.com/lazydaisy/moodle 2012-01-16 13:16:44 +08:00
Sam Hemelryk
fbdc155360 Merge branch 'MDL-31164' of git://github.com/lazydaisy/moodle 2012-01-16 13:08:39 +08:00
Sam Hemelryk
55cf5f8e75 Merge branch 'wip-MDL-31060-master' of git://github.com/marinaglancy/moodle 2012-01-16 11:58:16 +08:00
Sam Hemelryk
864777cb73 Merge branch 'MDL-31130' of git://github.com/timhunt/moodle 2012-01-16 11:49:33 +08:00
Aparup Banerjee
7ed8dc999f Merge branch 'wip-MDL-31072-master' of github.com:marinaglancy/moodle 2012-01-16 11:39:05 +08:00
Sam Hemelryk
d37d6e2a8e Merge branch 'moodleurl_out_as_local_url' of git://git.luns.net.uk/moodle 2012-01-16 11:31:24 +08:00
Sam Hemelryk
5ba0697050 Merge branch 'MDL-31018-master-1' of git://git.luns.net.uk/moodle 2012-01-16 11:11:17 +08:00
Sam Hemelryk
66fe8d59c8 Merge branch 'MDL-31040-master-2' of git://git.luns.net.uk/moodle 2012-01-16 10:54:08 +08:00