Sam Hemelryk [Mon, 29 Aug 2011 00:53:51 +0000 (12:53 +1200)]
Merge branch 'dev_MDL-27289_boxnet_master' of git://github.com/dongsheng/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 00:52:35 +0000 (02:52 +0200)]
Merge branch 'MDL-29064' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 00:39:42 +0000 (02:39 +0200)]
Merge branch 'MDL-29062' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 29 Aug 2011 00:23:27 +0000 (12:23 +1200)]
Merge branch 'MDL-29135-mnet-login' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 29 Aug 2011 00:13:40 +0000 (12:13 +1200)]
Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict resolution
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 00:04:46 +0000 (02:04 +0200)]
Merge branch 'master' of git.moodle.org:/git/integration
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 00:01:37 +0000 (02:01 +0200)]
Merge branch 'MDL-29111' of git://github.com/timhunt/moodle
Kordan [Sun, 28 Aug 2011 23:52:15 +0000 (11:52 +1200)]
MDL-28459 theme-formal_white Added option to specify a special logo for use on the frontpage
David Mudrak [Sat, 27 Aug 2011 23:06:31 +0000 (01:06 +0200)]
MDL-29148 MNet - improved handling of a verification function return code
Eloy Lafuente (stronk7) [Sun, 28 Aug 2011 23:30:37 +0000 (01:30 +0200)]
Merge branch 'wip_MDL-16168_HEAD_CAS_crash_if_no_LDAP' of https://github.com/iarenaza/moodle
Eloy Lafuente (stronk7) [Sun, 28 Aug 2011 23:22:22 +0000 (01:22 +0200)]
Merge branch 'MDL-25872' of git://github.com/bostelm/moodle
Sam Hemelryk [Sun, 28 Aug 2011 23:11:10 +0000 (11:11 +1200)]
Merge branch 'MDL-6397_database_rss_label' of git://github.com/andyjdavis/moodle
Iñaki Arenaza [Sun, 31 Jul 2011 15:27:57 +0000 (17:27 +0200)]
MDL-28402 LDAP configuration values being stored in lower case, causing misconfiguration
It looks like array_change_key_case() does not work recursively, so we
were not actually lowercasing the expiration attribute key. As the
configuration setting is always lowercase they didn't match.
Iñaki Arenaza [Wed, 8 Jun 2011 15:48:57 +0000 (17:48 +0200)]
MDL-16168 auth/cas CAS crashes if no LDAP is set up
Fix was pending for master. Credit goes to Ivan Dackiewicz.
David Mudrak [Sun, 28 Aug 2011 00:28:12 +0000 (02:28 +0200)]
MDL-27107 auth_mnet - consider all incoming roaming users as confirmed
The 'confirmed' field can't be optional. If the identity provider did
not export it, the new remote user would be created with 'confirmed' set
to default zero and as such could be a subject of scheduled deletion.
David Mudrak [Fri, 26 Aug 2011 13:34:37 +0000 (15:34 +0200)]
MDL-29135 Reworded login prompt with SSO over MNet enabled
Tim Hunt [Tue, 23 Aug 2011 07:36:52 +0000 (08:36 +0100)]
MDL-29064 qtype multianswer, question text should be a required field.
Tim Hunt [Tue, 23 Aug 2011 07:53:32 +0000 (08:53 +0100)]
MDL-29062 qtype multianswer refers to old name for the question_delete_questions function.
Tim Hunt [Thu, 25 Aug 2011 09:50:00 +0000 (10:50 +0100)]
MDL-29111 quiz was passing 0 to ->review_url when it should have been null.
Henning Bostelmann [Sat, 20 Aug 2011 23:30:48 +0000 (00:30 +0100)]
MDL-25872 View assignment submissions: show only students, not teachers
Fixing incorrect capability reference mod/assignment:view to ...:submit
Eloy Lafuente (stronk7) [Fri, 26 Aug 2011 13:10:15 +0000 (15:10 +0200)]
weekly release 2.2dev
Eloy Lafuente (stronk7) [Fri, 26 Aug 2011 12:56:34 +0000 (14:56 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 25 Aug 2011 13:51:57 +0000 (15:51 +0200)]
MDL-28684 QE2 upgrade: fix undefined $a regression. Thanks Henning!
Petr Skoda [Thu, 25 Aug 2011 09:40:07 +0000 (11:40 +0200)]
Merge branch 'w33_MDL-28554_m22_yui' of github.com:skodak/moodle
Petr Skoda [Thu, 25 Aug 2011 09:38:34 +0000 (11:38 +0200)]
MDL-28554 workaround for yuilibrary.com/projects/yui3/ticket/
2530999
Do not load io-xdr and io-upload-iframe on the same page.
Eloy Lafuente (stronk7) [Thu, 25 Aug 2011 08:45:43 +0000 (10:45 +0200)]
Merge branch 'MDL-27823_bulk_messaging_2' of git://github.com/andyjdavis/moodle
Andrew Davis (andyjdavis) [Thu, 25 Aug 2011 00:29:32 +0000 (08:29 +0800)]
MDL-6397 database: removed an unused string
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 23:39:57 +0000 (01:39 +0200)]
MDL-29012 custom profile fields - replace some " by '
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 23:30:41 +0000 (01:30 +0200)]
Merge branch 'MDL-29012-show_deleted_field' of git://github.com/tmuras/moodle
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 23:11:15 +0000 (01:11 +0200)]
Merge branch 'MDL-MDL-28650' of https://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 16:49:05 +0000 (18:49 +0200)]
Merge branch 'w33_MDL-29027_m22_textlib' of git://github.com/skodak/moodle
Petr Skoda [Wed, 24 Aug 2011 16:47:05 +0000 (18:47 +0200)]
MDL-29027 yet more tests
Petr Skoda [Wed, 24 Aug 2011 16:37:13 +0000 (18:37 +0200)]
MDL-29027 support for mail charsets
Petr Skoda [Wed, 24 Aug 2011 15:14:47 +0000 (17:14 +0200)]
MDL-29027 fallback to typo and more tests
Hopefully we now get the same results on all systems.
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 15:08:31 +0000 (17:08 +0200)]
Merge branch 'MDL-28684' of git://github.com/timhunt/moodle
Tim Hunt [Wed, 24 Aug 2011 15:00:37 +0000 (16:00 +0100)]
MDL-28684 fix failing unit test - which means fix the acutal code.
Sorry for the noise.
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 14:24:21 +0000 (16:24 +0200)]
Merge branch 'w33_MDL-28929_m22_themeplaceholders' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 14:12:19 +0000 (16:12 +0200)]
Merge branch 'w33_MDL-26796_m22_arrayparams' of git://github.com/skodak/moodle
Petr Skoda [Wed, 24 Aug 2011 14:09:25 +0000 (16:09 +0200)]
MDL-26796 accept objects that can be converted to string in clean_param()
Petr Skoda [Wed, 24 Aug 2011 13:11:25 +0000 (15:11 +0200)]
MDL-28929 document themes api changes
Petr Skoda [Wed, 24 Aug 2011 13:01:50 +0000 (15:01 +0200)]
Merge branch 'w33_MDL-28554_m22_yui' of github.com:skodak/moodle
Petr Skoda [Wed, 24 Aug 2011 13:00:10 +0000 (15:00 +0200)]
MDL-28554 fix problematic loading of io-upload-frame
This is a bit of a mystery, somehow 'io' module dependency is not enough to load everything, this might be caused by a regression in yui.
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 12:06:22 +0000 (14:06 +0200)]
Merge branch 'w33_MDL-26796_m22_arrayparams' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 11:35:24 +0000 (13:35 +0200)]
NOBUG: Minibump needed here for some automated tests to happen
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 11:31:54 +0000 (13:31 +0200)]
Merge branch 'w33_MDL-28929_m22_themeplaceholders' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 10:57:16 +0000 (12:57 +0200)]
Merge branch 'MDL-28976' of git://github.com/timhunt/moodle
Petr Skoda [Wed, 24 Aug 2011 08:50:22 +0000 (10:50 +0200)]
MDL-28929 add version.php with requirements and copyrights
The data for missing copyrights was taken from other files in the same theme, git history or plugins database.
Aparup Banerjee [Wed, 24 Aug 2011 06:39:46 +0000 (14:39 +0800)]
Revert "MDL-28509 repository_youtube Enable selection of sort order"
This reverts commit
88bf951aa753ff789872c062fe4fa14fb7e39973.
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 01:50:41 +0000 (03:50 +0200)]
Merge branch 'w33_MDL-29020_m22_clidbenrol' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 01:39:23 +0000 (03:39 +0200)]
Merge branch 'MDL-28248b' of https://github.com/totara/moodle
Aaron Barnes [Fri, 19 Aug 2011 02:56:29 +0000 (14:56 +1200)]
MDL-28248 completion: Incorrect SQL for finding enrol start date
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 23:55:45 +0000 (01:55 +0200)]
Merge branch 'MDL-28979' of git://github.com/timhunt/moodle
Tim Hunt [Wed, 17 Aug 2011 11:33:00 +0000 (12:33 +0100)]
MDL-28942 qtype multichoice, multi-response. Avoid computing the wrong random guess score.
It is effectively impossible to compute the right random guess score, so we should not compute anything, rather than computing a number that we know is wrong.
This patch also fixes a multianswer unit test error that was shown up by this fix.
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 23:44:02 +0000 (01:44 +0200)]
Merge branch 'MDL-28975' of git://github.com/timhunt/moodle
Sun Zhigang [Sat, 20 Aug 2011 03:24:04 +0000 (11:24 +0800)]
MDL-29019 enrol - fix a typo
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 23:17:28 +0000 (01:17 +0200)]
Merge branch 'w33_MDL-19380_m22_repoclamav' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 22:56:46 +0000 (00:56 +0200)]
Merge branch 'w33_MDL-29000_m22_forgetcase' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 22:52:56 +0000 (00:52 +0200)]
Merge branch 'w33_MDL-28981_m22_canpost' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 21:35:41 +0000 (23:35 +0200)]
Merge branch 'w33_MDL-27228_m22_labelhide' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 21:26:06 +0000 (23:26 +0200)]
Merge branch 'w33_MDL-28708_m22_f304' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 21:16:29 +0000 (23:16 +0200)]
Merge branch 'w33_MDL-28709_m22_h304' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 21:12:34 +0000 (23:12 +0200)]
Merge branch 'w33_MDL-29011_m22_nomanualenrol' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 20:52:16 +0000 (22:52 +0200)]
MDL-28684 QE2 upgrade: whitespace fix
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 20:50:03 +0000 (22:50 +0200)]
Merge branch 'MDL-28684b' of git://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 20:46:17 +0000 (22:46 +0200)]
Merge branch 'MDL-28444' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 23 Aug 2011 19:03:50 +0000 (03:03 +0800)]
Merge branch 'w33_MDL-28982_m22_sqlfullname' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 23 Aug 2011 18:24:08 +0000 (02:24 +0800)]
Merge branch 'MDL-28687' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 17:04:44 +0000 (19:04 +0200)]
Merge branch 'master_MDL-27624' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 16:39:48 +0000 (18:39 +0200)]
MDL-28962 enrol imsenterprise - whitespace fix
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 16:31:01 +0000 (18:31 +0200)]
Merge branch 'master_MDL-28962' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 16:00:51 +0000 (18:00 +0200)]
Merge branch 'MDL-28957' of git://github.com/colchambers/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 15:17:16 +0000 (17:17 +0200)]
Merge branch 'MDL-28397' of https://github.com/totara/moodle
Petr Skoda [Tue, 23 Aug 2011 13:00:04 +0000 (15:00 +0200)]
MDL-29027 fallback to mb_string on errors if available and simplify charset parsing
This may solve problems with encodings unsupported in iconv and random borked chars are ignored.
Aparup Banerjee [Tue, 23 Aug 2011 10:17:26 +0000 (18:17 +0800)]
Merge branch 'wip-MDL-25636-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 09:03:19 +0000 (11:03 +0200)]
Merge branch 'w33_MDL-28381_m22_cliphpver' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 08:41:17 +0000 (10:41 +0200)]
Merge branch 'MDL-28996' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 08:11:41 +0000 (10:11 +0200)]
Merge branch 'w33_MDL-28554_m22_yui' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 07:59:27 +0000 (09:59 +0200)]
Merge branch 'w33_MDL-28935_m22_calendardays' of git://github.com/skodak/moodle
Petr Skoda [Tue, 23 Aug 2011 06:18:03 +0000 (08:18 +0200)]
MDL-26796 remove unused param
Aparup Banerjee [Tue, 23 Aug 2011 06:07:08 +0000 (14:07 +0800)]
Merge branch 'MDL-28509_master' of git://github.com/marxjohnson/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 00:49:40 +0000 (02:49 +0200)]
Merge branch 'master_MDL-28999' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 00:42:40 +0000 (02:42 +0200)]
Merge branch 'w33_MDL-29016_m22_distropermissions' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 00:35:05 +0000 (02:35 +0200)]
Merge branch 'MDL-28990' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 00:03:19 +0000 (02:03 +0200)]
Merge branch 'w33_MDL-29031_m22_oldblock' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 22 Aug 2011 23:42:05 +0000 (01:42 +0200)]
Merge branch 'MDL-28226' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 22 Aug 2011 23:36:25 +0000 (01:36 +0200)]
Merge branch 'MDL-28481' of git://github.com/aolley/moodle
Eloy Lafuente (stronk7) [Mon, 22 Aug 2011 23:19:52 +0000 (01:19 +0200)]
Merge branch 'w33_MDL-28936_m22_msgstrlen' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 22 Aug 2011 23:16:34 +0000 (01:16 +0200)]
Merge branch 'MDL-28241' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 22 Aug 2011 21:35:05 +0000 (22:35 +0100)]
MDL-28241 editing multianswer questions broken since the fix for MDL-24594.
Aparup Banerjee [Mon, 22 Aug 2011 16:51:28 +0000 (00:51 +0800)]
Merge branch 'wip-mdl-28580' of git://github.com/rajeshtaneja/moodle
Aaron Barnes [Mon, 22 Aug 2011 02:54:41 +0000 (14:54 +1200)]
MDL-28397 completion: Activity completion criteria not showing grading
requirement
Credit goes to Evan Irving-Pease for the patch
Adam Olley [Sun, 21 Aug 2011 23:41:42 +0000 (09:11 +0930)]
MDL-28481: Send headers before any possible output
Petr Skoda [Sun, 21 Aug 2011 19:01:53 +0000 (21:01 +0200)]
MDL-28929 update all themes to use the new placeholders
Petr Skoda [Sun, 21 Aug 2011 19:01:31 +0000 (21:01 +0200)]
MDL-28929 fix incorrect use if static placeholders in theme layouts
Petr Skoda [Sun, 21 Aug 2011 16:17:43 +0000 (18:17 +0200)]
MDL-29011 do not require manual enrol cap on the enrolled users page
Petr Skoda [Sun, 21 Aug 2011 15:43:34 +0000 (17:43 +0200)]
MDL-29031 drop unused block tables
Petr Skoda [Sun, 21 Aug 2011 14:46:01 +0000 (16:46 +0200)]
MDL-27248 remove forgotten unique sortorder index from the course table
Petr Skoda [Sun, 21 Aug 2011 13:50:23 +0000 (15:50 +0200)]
MDL-28981 fix forum_user_can_post() call params
Petr Skoda [Sun, 21 Aug 2011 13:38:46 +0000 (15:38 +0200)]
MDL-28982 fix DML use
Tony Levi [Mon, 18 Apr 2011 04:30:36 +0000 (14:00 +0930)]
MDL-27228: Fix label 'eye' does not match show/hide setting