Commit graph

48899 commits

Author SHA1 Message Date
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
Rossiani Wijaya
03929beaa1 MDL-27752 Calendar export: fixed typo in url parameter 2011-08-08 13:01:09 +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
Petr Skoda
79cfcd3f7d MDL-28473 fix $instanceids troubles in blocks upgrade
Credit goes to Mateusz Wójcik.
2011-08-05 22:08:58 +02:00
Petr Skoda
50584dd3cc MDL-28468 fix cohort assign check 2011-08-05 21:43:29 +02:00
Petr Skoda
bce595034c verify where_clause() only in debug mode 2011-08-05 21:33:16 +02:00
Petr Skoda
618a7f91ec MDL-27597 fix invalid results of get_categories when shallow is false 2011-08-05 20:13:12 +02:00
Petr Skoda
f9fd10e0be MDL-17477 improve session purging when deleting users 2011-08-05 19:47:54 +02:00
Tim Hunt
a23bda41e4 MDL-28618 question combined feedback: inconsistency in file areas.
The (partially|in)?correct feedback fields acutally store their files in a file area with component 'question'. Some code, however, was written as if they were stored in the qtype_whatever area.
2011-08-05 16:45:17 +01:00
James Brisland
a8b2690bff MDL-28620 - Removed admin/generator.php include as it causes issues if this script is included from any other script that is running in the command line 2011-08-05 16:09:30 +01:00
Dan Poltawski
f40bbf7dce MDL-25417 - remove redunant code 2011-08-05 12:06:57 +01:00
M Kassaei
92e6e128ff MDL-27631 question bank Show question text in the question list when top level category is used 2011-08-05 10:40:06 +01:00
Tim Hunt
609c0d6b9a MDL-28593 Missing include breaks editing quiz grade item. 2011-08-05 08:50:08 +01:00
Andrew Davis (andyjdavis)
02f40510e6 MDL-27845 rating: altered the get_ratings() query to avoid possible future duplicate key problems 2011-08-05 11:12:44 +08:00
Sam Hemelryk
683eb07144 MDL-28407 Fixed up calendar preferences form handling 2011-08-05 09:34:27 +08:00
Tim Hunt
e5b0920e48 MDL-28612 Quiz statistics report does not always show the 'Actual response' column when it should 2011-08-04 18:14:31 +01:00
Colin Chambers
43e607ca79 MDL-28517 question editing fixed duplicate id in hint header field 2011-08-04 14:49:31 +01:00
Tim Hunt
b2817f8057 MDL-28602 Quiz review reports the wrong duration. 2011-08-04 14:11:32 +01:00
Tim Hunt
b72b413759 MDL-28604 Question bank display forgets sort order 2011-08-04 13:53:02 +01:00
Dan Marsden
02c1f7e253 MDL-28601 SCORM remove old js not used since MDL-22951 2011-08-05 00:41:09 +12:00
Marina Glancy
50c71e0af6 MDL-26754 Display blocks in 'manage blocks' alphabetically sorted 2011-08-04 14:05:41 +08:00
Andrew Davis (andyjdavis)
8d0845d30a MDL-28406 blocks: added JS to prevent the addition of duplicate blocks 2011-08-04 12:01:52 +08:00
Dan Marsden
03c3488957 MDL-28311 SCORM tidy up php warnings and display warning message to teacher that their manifest is invalid 2011-08-04 11:08:42 +12:00
Petr Skoda
3fdc622697 weekly release 2.2dev 2011-08-03 18:07:11 +02:00
kordan
3f52353016 MDL-28587 fix for master 2011-08-03 15:27:18 +02:00