Eloy Lafuente (stronk7) [Wed, 10 Aug 2011 00:34:51 +0000 (02:34 +0200)]
Merge branch 'w31_MDL-27597_m22_catlike' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 10 Aug 2011 00:04:55 +0000 (02:04 +0200)]
Merge branch 'MDL-23967' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 9 Aug 2011 23:58:03 +0000 (01:58 +0200)]
Merge branch 'MDL-28059' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 9 Aug 2011 23:10:27 +0000 (01:10 +0200)]
Merge branch 'wip-MDL-28407-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 9 Aug 2011 17:30:54 +0000 (19:30 +0200)]
Merge branch 'w31_MDL-28533_m22_columnperf' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Aug 2011 08:13:18 +0000 (10:13 +0200)]
Merge branch 'MDL-28565_M' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Tue, 9 Aug 2011 07:41:53 +0000 (09:41 +0200)]
Merge branch 'MDL-28604' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 8 Aug 2011 16:15:42 +0000 (18:15 +0200)]
MDL-28493 scorm - fix whitespace
Petr Skoda [Mon, 8 Aug 2011 14:18:08 +0000 (16:18 +0200)]
Merge branch 'master_MDL-28601'
Petr Skoda [Mon, 8 Aug 2011 13:32:29 +0000 (15:32 +0200)]
Merge branch 'MDL-28620' of git://github.com/jbrisland/moodle
Aparup Banerjee [Mon, 8 Aug 2011 09:10:32 +0000 (17:10 +0800)]
MDL-28565 General - updated lang files License link to docs.moodle.org/dev/License
Aparup Banerjee [Tue, 2 Aug 2011 05:51:15 +0000 (13:51 +0800)]
MDL-28565 General - updated License and Credits links
to docs.moodle.org/dev/License and docs.moodle.org/dev/Credits
Sagie Maoz [Sat, 6 Aug 2011 20:46:17 +0000 (21:46 +0100)]
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>
Sam Hemelryk [Mon, 8 Aug 2011 07:05:56 +0000 (15:05 +0800)]
Merge branch 'master_MDL-28311' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 8 Aug 2011 06:22:51 +0000 (14:22 +0800)]
Merge branch 'mdl-28517' of git://github.com/colchambers/moodle
Dan Poltawski [Tue, 2 Aug 2011 12:18:05 +0000 (13:18 +0100)]
MDL-28569 blocks/rss_client - RSS feed autodiscovery fails with ampersands
Simpliepie is quoting urls and we need the url to be unescaped
Sam Hemelryk [Mon, 8 Aug 2011 05:58:10 +0000 (13:58 +0800)]
Merged branch 'MDL-28575_master' of git://github.com/kordan/moodle.git with conflict resolution
Sam Hemelryk [Mon, 8 Aug 2011 05:43:42 +0000 (13:43 +0800)]
Merge branch 'MDL-28587_master' of git://github.com/kordan/moodle
Sam Hemelryk [Mon, 8 Aug 2011 03:18:14 +0000 (11:18 +0800)]
Merge branch 'MDL-28406_block_duplicate' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 8 Aug 2011 03:06:54 +0000 (11:06 +0800)]
Merge branch 'MDL-28602' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 8 Aug 2011 03:04:19 +0000 (11:04 +0800)]
Merge branch 'MDL-28593' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 8 Aug 2011 03:00:38 +0000 (11:00 +0800)]
Merge branch 'MDL-28612' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 8 Aug 2011 02:57:11 +0000 (10:57 +0800)]
Merge branch 'MDL-28618' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 8 Aug 2011 02:46:41 +0000 (10:46 +0800)]
Merge branch 'w31_MDL-27586_m22_browser' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 8 Aug 2011 02:26:20 +0000 (10:26 +0800)]
Merge branch 'w31_MDL-27685_m22_pglike' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 8 Aug 2011 02:20:15 +0000 (10:20 +0800)]
Merge branch 'w31_MDL-28382_m22_iis' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 8 Aug 2011 02:16:23 +0000 (10:16 +0800)]
Merged branch 'w31-MDL-28412_m22_iconv' of git://github.com/skodak/moodle.git with english string improvements
Sam Hemelryk [Mon, 8 Aug 2011 02:09:31 +0000 (10:09 +0800)]
Merge branch 'w31_MDL-28450_m22_defgroup' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 8 Aug 2011 02:06:06 +0000 (10:06 +0800)]
Merge branch 'w31_MDL-28468_m22_cohortassign' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 8 Aug 2011 01:59:42 +0000 (09:59 +0800)]
Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 8 Aug 2011 01:57:11 +0000 (09:57 +0800)]
Merge branch 'w31_MDL-28622_m22_userdel' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 8 Aug 2011 01:50:33 +0000 (09:50 +0800)]
Merge branch 'w31_MDL-28630_m22_cookie' of git://github.com/skodak/moodle
Petr Skoda [Sun, 7 Aug 2011 12:39:00 +0000 (14:39 +0200)]
MDL-28382 work around or detect REQUEST_URI IIS bug
Petr Skoda [Sun, 7 Aug 2011 11:19:02 +0000 (13:19 +0200)]
MDL-27685 fix pg LIKE escape trouble
Petr Skoda [Sun, 7 Aug 2011 11:04:04 +0000 (13:04 +0200)]
MDL-28450 prefer member group for default
Dan Poltawski [Sat, 6 Aug 2011 22:38:49 +0000 (23:38 +0100)]
MDL-23967 admin/cron.php - warn about use on CLI
Admins now need to use the explicit CLI script
Petr Skoda [Sat, 6 Aug 2011 19:11:55 +0000 (21:11 +0200)]
MDL-28412 detect broken iconv
Petr Skoda [Sat, 6 Aug 2011 18:56:57 +0000 (20:56 +0200)]
MDL-28634 fix forgotten references to Moodle 2.0 and old PHP version requirements
Petr Skoda [Sat, 6 Aug 2011 20:22:52 +0000 (22:22 +0200)]
MDL-28630 prevent session breakage caused by incorrect cookie settings
Dan Poltawski [Sat, 6 Aug 2011 20:11:52 +0000 (21:11 +0100)]
MDL-28059 weblib - don't strip mailto: anchors
Petr Skoda [Sat, 6 Aug 2011 13:45:18 +0000 (15:45 +0200)]
MDL-27586 fix file_browser access control
Petr Skoda [Fri, 5 Aug 2011 20:08:58 +0000 (22:08 +0200)]
MDL-28473 fix $instanceids troubles in blocks upgrade
Credit goes to Mateusz Wójcik.
Petr Skoda [Fri, 5 Aug 2011 19:43:29 +0000 (21:43 +0200)]
MDL-28468 fix cohort assign check
Petr Skoda [Fri, 5 Aug 2011 19:33:16 +0000 (21:33 +0200)]
verify where_clause() only in debug mode
Petr Skoda [Fri, 5 Aug 2011 18:13:12 +0000 (20:13 +0200)]
MDL-27597 fix invalid results of get_categories when shallow is false
Petr Skoda [Fri, 5 Aug 2011 17:47:54 +0000 (19:47 +0200)]
MDL-17477 improve session purging when deleting users
Tim Hunt [Fri, 5 Aug 2011 15:45:17 +0000 (16:45 +0100)]
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.
James Brisland [Fri, 5 Aug 2011 15:09:30 +0000 (16:09 +0100)]
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
Tim Hunt [Fri, 5 Aug 2011 07:50:08 +0000 (08:50 +0100)]
MDL-28593 Missing include breaks editing quiz grade item.
Sam Hemelryk [Fri, 29 Jul 2011 05:57:55 +0000 (13:57 +0800)]
MDL-28407 Fixed up calendar preferences form handling
Tim Hunt [Thu, 4 Aug 2011 17:13:29 +0000 (18:13 +0100)]
MDL-28612 Quiz statistics report does not always show the 'Actual response' column when it should
Colin Chambers [Fri, 29 Jul 2011 13:23:01 +0000 (14:23 +0100)]
MDL-28517 question editing fixed duplicate id in hint header field
Tim Hunt [Thu, 4 Aug 2011 13:11:32 +0000 (14:11 +0100)]
MDL-28602 Quiz review reports the wrong duration.
Tim Hunt [Thu, 4 Aug 2011 12:53:02 +0000 (13:53 +0100)]
MDL-28604 Question bank display forgets sort order
Dan Marsden [Thu, 4 Aug 2011 12:41:09 +0000 (00:41 +1200)]
MDL-28601 SCORM remove old js not used since MDL-22951
Andrew Davis (andyjdavis) [Thu, 4 Aug 2011 04:01:52 +0000 (12:01 +0800)]
MDL-28406 blocks: added JS to prevent the addition of duplicate blocks
Dan Marsden [Tue, 2 Aug 2011 12:03:19 +0000 (00:03 +1200)]
MDL-28311 SCORM tidy up php warnings and display warning message to teacher that their manifest is invalid
Petr Skoda [Wed, 3 Aug 2011 16:07:11 +0000 (18:07 +0200)]
weekly release 2.2dev
kordan [Wed, 3 Aug 2011 13:27:18 +0000 (15:27 +0200)]
MDL-28587 fix for master
Sam Hemelryk [Wed, 3 Aug 2011 10:20:01 +0000 (18:20 +0800)]
Revert "MDL-28284 don't load filepicker module for every page"
This reverts commit
9b0843c121d7ece498bdcd3a279e247c7f6f6abf.
Sam Hemelryk [Wed, 3 Aug 2011 07:03:30 +0000 (15:03 +0800)]
Merge branch 'MDL-28520' of git://git.luns.net.uk/moodle
Petr Skoda [Wed, 3 Aug 2011 06:27:52 +0000 (08:27 +0200)]
Merge branch 'master_MDL-28493'
Dan Marsden [Wed, 3 Aug 2011 03:36:52 +0000 (15:36 +1200)]
MDL-28493 - fix version in upgrade - thanks Andrew
kordan [Tue, 2 Aug 2011 21:39:18 +0000 (23:39 +0200)]
MDL-28575 fix for master
Petr Skoda [Tue, 2 Aug 2011 14:35:09 +0000 (16:35 +0200)]
Merge branch 'MDL-28471' of git://github.com/timhunt/moodle
Tim Hunt [Tue, 2 Aug 2011 14:27:06 +0000 (15:27 +0100)]
MDL-28471 better question flag icons.
Transparent background, and higher contrast for better accessibility.
Petr Skoda [Tue, 2 Aug 2011 13:59:42 +0000 (15:59 +0200)]
Merge branch 'master_MDL-10707'
Petr Skoda [Tue, 2 Aug 2011 13:48:20 +0000 (15:48 +0200)]
Merge branch 'wip-MDL-23626-master' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Thu, 28 Jul 2011 07:20:01 +0000 (15:20 +0800)]
MDL-26477 Added a setting to display course sections as links within the navigation
Petr Skoda [Tue, 2 Aug 2011 13:11:42 +0000 (15:11 +0200)]
Merge branch 'wip-mdl-27658' of git://github.com/rajeshtaneja/moodle
Petr Skoda [Tue, 2 Aug 2011 13:08:05 +0000 (15:08 +0200)]
Merge branch 'MDL-28338' of git://github.com/timhunt/moodle
Petr Skoda [Tue, 2 Aug 2011 13:01:15 +0000 (15:01 +0200)]
Merge branch 'master_MDL-28410'
Petr Skoda [Tue, 2 Aug 2011 12:55:18 +0000 (14:55 +0200)]
Merge branch 'MDL-28471' of git://github.com/timhunt/moodle
Petr Skoda [Tue, 2 Aug 2011 12:50:41 +0000 (14:50 +0200)]
Merge branch 'MDL-28507' of git://github.com/timhunt/moodle
Petr Skoda [Tue, 2 Aug 2011 12:35:21 +0000 (14:35 +0200)]
Merge branch 'master_MDL-28535'
Petr Skoda [Tue, 2 Aug 2011 12:30:20 +0000 (14:30 +0200)]
Merge branch 'master_MDL-28542'
Tim Hunt [Thu, 28 Jul 2011 10:16:37 +0000 (11:16 +0100)]
MDL-28507 fix bad lang string uses, and remove two obsolete strings.
Sam Hemelryk [Tue, 2 Aug 2011 09:55:21 +0000 (17:55 +0800)]
Merge branch 'MDL-28490' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 2 Aug 2011 09:48:02 +0000 (17:48 +0800)]
Merge branch 'MDL-28508' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 2 Aug 2011 09:14:04 +0000 (17:14 +0800)]
Merge branch 'MDL-28051' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 2 Aug 2011 09:06:56 +0000 (17:06 +0800)]
Merge branch 'MDL-28515' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 2 Aug 2011 08:59:55 +0000 (16:59 +0800)]
Merge branch 'MDL-28340_advanced_search_other_users' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 2 Aug 2011 08:50:58 +0000 (16:50 +0800)]
Merge branch 'wip-mdl-28504' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 2 Aug 2011 08:46:39 +0000 (16:46 +0800)]
Merge branch 'wip-MDL-19907-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 2 Aug 2011 08:23:45 +0000 (16:23 +0800)]
MDL-27122 admin Improved block protection help string
Sam Hemelryk [Tue, 2 Aug 2011 08:19:08 +0000 (16:19 +0800)]
Merge branch 'wip-MDL-27122-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 2 Aug 2011 06:08:31 +0000 (14:08 +0800)]
Merge branch 'wip-MDL-27754-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 2 Aug 2011 05:42:44 +0000 (13:42 +0800)]
Merge branch 's11_MDL-28284_filepicker_module_master' of git://github.com/dongsheng/moodle
Mark Johnson [Thu, 28 Jul 2011 12:43:38 +0000 (13:43 +0100)]
MDL-28510 repository_youtube Use smaller thumbnails in search results
unknown [Tue, 2 Aug 2011 05:25:44 +0000 (13:25 +0800)]
Merge branch 'master_MDL-27876' of git://github.com/danmarsden/moodle
Piers Harding [Mon, 1 Aug 2011 04:26:43 +0000 (16:26 +1200)]
MDL-27876 SCORM auto-adjust the stage height
Dan Marsden [Tue, 2 Aug 2011 05:00:01 +0000 (17:00 +1200)]
MDL-28542 SCORM tidy up code.
Sam Hemelryk [Tue, 2 Aug 2011 04:22:29 +0000 (12:22 +0800)]
Merge branch 'MDL-28487-typo' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Tue, 2 Aug 2011 04:02:52 +0000 (12:02 +0800)]
Merge branch 'master_MDL-28493' of git://github.com/danmarsden/moodle
Sam Hemelryk [Tue, 2 Aug 2011 03:42:40 +0000 (11:42 +0800)]
MDL-28548 Fixed up misleading comments
Rajesh Taneja [Mon, 1 Aug 2011 04:50:11 +0000 (12:50 +0800)]
MDL-27658 javascript: Typo fixed for toUpperCase
Rajesh Taneja [Mon, 1 Aug 2011 02:18:47 +0000 (10:18 +0800)]
MDL-28504 filter: Typo in css fixed
Mayank Gupa [Sun, 31 Jul 2011 05:44:24 +0000 (11:14 +0530)]
MDL-10707 SCORM Fixing cmi.max_time_allowed returned null
Dan Marsden [Sun, 31 Jul 2011 22:27:39 +0000 (10:27 +1200)]
MDL-28548 allow backup to contain info from multiple plagiarism plugins.
Dan Marsden [Sun, 31 Jul 2011 06:51:39 +0000 (18:51 +1200)]
MDL-28542 SCORM Course format should use skipview setting.
