48815 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
7969f1ecf5 weekly release 2.2dev 2011-08-12 00:18:07 +02:00
Eloy Lafuente (stronk7)
76f063fa5d Merge branch 'MDL-27491-master' of git://github.com/sammarshallou/moodle 2011-08-10 23:03:06 +02:00
Eloy Lafuente (stronk7)
89c6def316 Merge branch 'master_MDL-28295' of git://github.com/danmarsden/moodle 2011-08-10 22:46:42 +02:00
sam marshall
05b7cd7ae9 MDL-27491 Add 'complete on view' support to wiki, survey 2011-08-10 10:56:14 +01:00
Sam Hemelryk
92636dfb5a Merge branch 'MDL-20501' of git://github.com/rwijaya/moodle 2011-08-10 14:04:22 +08:00
Sam Hemelryk
751a6d3c29 Merge branch 'MDL_25417' of git://git.luns.net.uk/moodle 2011-08-10 13:39:32 +08:00
Eloy Lafuente (stronk7)
09e35896d4 Merge branch 'MDL-27631' of git://github.com/mkassaei/moodle 2011-08-10 03:00:17 +02:00
Eloy Lafuente (stronk7)
7e988ed160 Merge branch 'MDL-27550-workshop-feedback' of git://github.com/mudrd8mz/moodle 2011-08-10 02:47:57 +02:00
Eloy Lafuente (stronk7)
628e2396af Merge branch 'w31_MDL-27597_m22_catlike' of git://github.com/skodak/moodle 2011-08-10 02:34:51 +02:00
Dan Marsden
6d954dd372 MDL-28295 SCORM change mangement of pop-up windows, load full SCORM API in existing window - this fixes an issue with IE 7 and httpreq communication 2011-08-10 12:19:49 +12:00
Eloy Lafuente (stronk7)
1ddecae7c7 Merge branch 'MDL-23967' of git://git.luns.net.uk/moodle 2011-08-10 02:04:55 +02:00
Eloy Lafuente (stronk7)
6d067fec6f Merge branch 'MDL-28059' of git://git.luns.net.uk/moodle 2011-08-10 01:58:03 +02:00
Eloy Lafuente (stronk7)
b16d8f59ab Merge branch 'wip-MDL-28407-master' of git://github.com/samhemelryk/moodle 2011-08-10 01:10:27 +02:00
Eloy Lafuente (stronk7)
43c88235c5 Merge branch 'w31_MDL-28533_m22_columnperf' of git://github.com/skodak/moodle 2011-08-09 19:30:54 +02:00
Eloy Lafuente (stronk7)
8a015bdb84 Merge branch 'MDL-28565_M' of git://github.com/nebgor/moodle 2011-08-09 10:13:18 +02:00
Eloy Lafuente (stronk7)
1c001177ea Merge branch 'MDL-28604' of git://github.com/timhunt/moodle 2011-08-09 09:41:53 +02:00
Eloy Lafuente (stronk7)
1cdb96319d MDL-28493 scorm - fix whitespace 2011-08-08 18:15:42 +02:00
Petr Skoda
ca39e6d2fd Merge branch 'master_MDL-28601' 2011-08-08 16:18:08 +02:00
Petr Skoda
260cf4c2fd Merge branch 'MDL-28620' of git://github.com/jbrisland/moodle 2011-08-08 15:32:29 +02:00
Aparup Banerjee
e637e76a25 MDL-28565 General - updated lang files License link to docs.moodle.org/dev/License 2011-08-08 17:16:07 +08:00
Aparup Banerjee
9fdab2fe73 MDL-28565 General - updated License and Credits links
to docs.moodle.org/dev/License and docs.moodle.org/dev/Credits
2011-08-08 17:15:57 +08:00
Sagie Maoz
0d5e5644b8 MDL-26721 automated backups - Fix typo
Causing the 'role assignment' backup inclusion to be tied to the users

Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
2011-08-08 15:40:55 +08:00
Sam Hemelryk
01352e33cc Merge branch 'master_MDL-28311' of git://github.com/danmarsden/moodle 2011-08-08 15:05:56 +08:00
Sam Hemelryk
e97584bcf1 Merge branch 'mdl-28517' of git://github.com/colchambers/moodle 2011-08-08 14:22:51 +08:00
Dan Poltawski
d8d1f9e35e MDL-28569 blocks/rss_client - RSS feed autodiscovery fails with ampersands
Simpliepie is quoting urls and we need the url to be unescaped
2011-08-08 14:11:13 +08:00
Sam Hemelryk
0d38abcf38 Merged branch 'MDL-28575_master' of git://github.com/kordan/moodle.git with conflict resolution 2011-08-08 13:58:10 +08:00
Sam Hemelryk
9e4b5b45a4 Merge branch 'MDL-28587_master' of git://github.com/kordan/moodle 2011-08-08 13:43:42 +08:00
Sam Hemelryk
a3ff929807 Merge branch 'MDL-28406_block_duplicate' of git://github.com/andyjdavis/moodle 2011-08-08 11:18:14 +08:00
Sam Hemelryk
16c009c5bf Merge branch 'MDL-28602' of git://github.com/timhunt/moodle 2011-08-08 11:06:54 +08:00
Sam Hemelryk
067b8a5556 Merge branch 'MDL-28593' of git://github.com/timhunt/moodle 2011-08-08 11:04:19 +08:00
Sam Hemelryk
9d85b62c42 Merge branch 'MDL-28612' of git://github.com/timhunt/moodle 2011-08-08 11:00:38 +08:00
Sam Hemelryk
2f86bcfffa Merge branch 'MDL-28618' of git://github.com/timhunt/moodle 2011-08-08 10:57:11 +08:00
Sam Hemelryk
b1251c9008 Merge branch 'w31_MDL-27586_m22_browser' of git://github.com/skodak/moodle 2011-08-08 10:46:41 +08:00
Sam Hemelryk
cb09753feb Merge branch 'w31_MDL-27685_m22_pglike' of git://github.com/skodak/moodle 2011-08-08 10:26:20 +08:00
Sam Hemelryk
9be161c678 Merge branch 'w31_MDL-28382_m22_iis' of git://github.com/skodak/moodle 2011-08-08 10:20:15 +08:00
Sam Hemelryk
7d85a4e226 Merged branch 'w31-MDL-28412_m22_iconv' of git://github.com/skodak/moodle.git with english string improvements 2011-08-08 10:16:23 +08:00
Sam Hemelryk
3b8502658f Merge branch 'w31_MDL-28450_m22_defgroup' of git://github.com/skodak/moodle 2011-08-08 10:09:31 +08:00
Sam Hemelryk
406bf830cd Merge branch 'w31_MDL-28468_m22_cohortassign' of git://github.com/skodak/moodle 2011-08-08 10:06:06 +08:00
Sam Hemelryk
7d405fe7c8 Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle 2011-08-08 09:59:42 +08:00
Sam Hemelryk
639ab4d5c5 Merge branch 'w31_MDL-28622_m22_userdel' of git://github.com/skodak/moodle 2011-08-08 09:57:11 +08:00
Sam Hemelryk
c357b5c6e0 Merge branch 'w31_MDL-28630_m22_cookie' of git://github.com/skodak/moodle 2011-08-08 09:50:33 +08:00
Petr Skoda
37c8259280 MDL-28382 work around or detect REQUEST_URI IIS bug 2011-08-07 14:39:45 +02:00
Petr Skoda
d5b3deecba MDL-27685 fix pg LIKE escape trouble 2011-08-07 13:19:02 +02:00
Petr Skoda
c160da9cb8 MDL-28450 prefer member group for default 2011-08-07 13:06:45 +02:00
Dan Poltawski
6e513b6fde MDL-23967 admin/cron.php - warn about use on CLI
Admins now need to use the explicit CLI script
2011-08-06 23:38:49 +01:00
Petr Skoda
695940df3b MDL-28412 detect broken iconv 2011-08-06 23:04:31 +02:00
Petr Skoda
eab044a083 MDL-28634 fix forgotten references to Moodle 2.0 and old PHP version requirements 2011-08-06 23:00:02 +02:00
Petr Skoda
988fc20eef MDL-28630 prevent session breakage caused by incorrect cookie settings 2011-08-06 22:22:52 +02:00
Dan Poltawski
a276778aea MDL-28059 weblib - don't strip mailto: anchors 2011-08-06 21:14:01 +01:00
Petr Skoda
f6b07c4da5 MDL-27586 fix file_browser access control 2011-08-06 15:45:18 +02:00