51165 Commits

Author SHA1 Message Date
Sam Hemelryk
86e73f8981 Merge branch 'w04_MDL-31182_m23_messprefs' of git://github.com/skodak/moodle 2012-01-23 14:46:05 +08:00
Sam Hemelryk
458e91d8ca Merge branch 'w04_MDL-31186_m23_extprofiles' of git://github.com/skodak/moodle 2012-01-23 14:35:26 +08:00
Sam Hemelryk
e24baafefc Merge branch 'w04_MDL-31202_m23_emailvalidation' of git://github.com/skodak/moodle 2012-01-23 14:23:25 +08:00
Mary Evans
59784b75fa MDL-31269 theme_magazine: fixes login pagelayout in theme_magazine 2012-01-23 13:26:51 +08:00
Sam Hemelryk
8ce9718239 Merge branch 'MDL-31324' of git://github.com/lazydaisy/moodle 2012-01-23 13:13:10 +08:00
Sam Hemelryk
1a20b3494b Merge branch 'MDL-31077' of git://github.com/mouneyrac/moodle 2012-01-23 11:48:59 +08:00
Sam Hemelryk
be9974120e Merge branch 'MDL-31329' of git://github.com/stronk7/moodle 2012-01-23 11:28:17 +08:00
Sam Hemelryk
2bea3cd8d1 Merge branch 'MDL-31333' of git://github.com/stronk7/moodle 2012-01-23 11:22:08 +08:00
Sam Hemelryk
d4de3f22c1 Merge branch 'MDL-31013-master-1' of git://git.luns.net.uk/moodle 2012-01-23 11:08:22 +08:00
Eloy Lafuente (stronk7)
7ef4949d9f MDL-31333 backup: reintroduce missing function lost by MDL-30610 2012-01-23 01:56:43 +01:00
Eloy Lafuente (stronk7)
b10d13e016 Merge branch 'wip-MDL-31179-master' of github.com:marinaglancy/moodle 2012-01-23 01:19:18 +01:00
Eloy Lafuente (stronk7)
14926a50c7 Merge branch 'w04_MDL-31180_m23_closedproperty' of git://github.com/skodak/moodle 2012-01-23 01:10:38 +01:00
Eloy Lafuente (stronk7)
02cb385844 Merge branch 'w04_MDL-31181_m23_fitlertestcfg' of git://github.com/skodak/moodle 2012-01-23 01:04:00 +01:00
Eloy Lafuente (stronk7)
ebf552ca89 Merge branch 'MDL-31058' of git://github.com/timhunt/moodle 2012-01-23 00:56:08 +01:00
Eloy Lafuente (stronk7)
e0f6a239fc Merge branch 'w04_MDL-31185_m23_postscfg' of git://github.com/skodak/moodle 2012-01-23 00:28:08 +01:00
Eloy Lafuente (stronk7)
14f349cb78 MDL-31329 timezones: updated to 2011n 2012-01-22 21:30:06 +01:00
Mary Evans
8f45b69692 MDL-31324 fixes custom css settings in theme_afterburner 2012-01-22 01:43:24 +00:00
Petr Skoda
4ae40aa577 MDL-31180 fix coding error in fake_recordset iterator 2012-01-21 17:13:39 +01:00
Petr Skoda
aeacb7b128 MDL-31181 fix missing global $CFG that was breaking unit test teardown 2012-01-21 17:07:59 +01:00
Petr Skoda
681570b429 MDL-31182 fix fatal error when problem detected in finding messaging defaults 2012-01-21 16:59:16 +01:00
Petr Skoda
b1693caebc MDL-31185 fix missing CFG in forum_get_posts_by_user() 2012-01-21 16:17:06 +01:00
Petr Skoda
ecfc06d88a MDL-31186 fix wrong context preloading sql 2012-01-21 16:08:25 +01:00
Petr Skoda
1c199e29b1 MDL-31202 do not try sending emails to invalid addresses
The use of mtrace() in email_to_user() is most probably incorrect, I am going to use it only in CLI scripts (which includes cron). This should not be considered a security issue because we should be already validating emails when accepting them from untrusted users.
2012-01-21 15:21:08 +01:00
Petr Skoda
daac3835dc MDL-31208 fix obsolete get_record_sql() parameter
Credit goes to Rajesh Taneja.
2012-01-21 11:36:10 +01:00
Tim Hunt
c9b8a56f58 MDL-31058 qtype match 1.9 restore: fix restore of dodgy questions. 2012-01-20 17:27:23 +00:00
Marina Glancy
776d75b9a6 MDL-31179: added missing global 2012-01-20 10:33:27 +08:00
Eloy Lafuente (stronk7)
f6b4ec2b4a weekly release 2.3dev (blame stronk7 for 0202 mistake)
On 20120102 version was incorrectly bumped to 2012-02-02. So,
until then (< 1mo) we are going to be incrementing decimal digits
only and not date ones (first 8).
2012-01-19 13:34:40 +01:00
Eloy Lafuente (stronk7)
aae1ebe999 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-01-19 13:28:00 +01:00
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
AMOS bot
3e2c9a037f Automatically generated installer lang files 2012-01-18 00:31:32 +00: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
Jerome Mouneyrac
2ada59b759 MDL-31077 REST server should return null if nothing fail and if the description function return null. 2012-01-17 15:37:27 +08: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
AMOS bot
c09ca45e96 Automatically generated installer lang files 2012-01-17 00:31:09 +00: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