moodle.git
10 years agoMDL-29005 blocks : clarified comment
Aparup Banerjee [Tue, 30 Aug 2011 03:17:50 +0000 (11:17 +0800)]
MDL-29005 blocks : clarified comment

10 years agoMerge branch 'MDL-29005' of git://github.com/mouneyrac/moodle
Aparup Banerjee [Tue, 30 Aug 2011 03:07:38 +0000 (11:07 +0800)]
Merge branch 'MDL-29005' of git://github.com/mouneyrac/moodle

10 years agoMerge branch 'MDL-28489_master' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 29 Aug 2011 23:03:38 +0000 (11:03 +1200)]
Merge branch 'MDL-28489_master' of git://github.com/stronk7/moodle

10 years agoMDL-28489 site news forum - support multilang filter
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 12:24:27 +0000 (14:24 +0200)]
MDL-28489 site news forum - support multilang filter

10 years agoMerge branch 'wip-mdl-29104' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 11:29:58 +0000 (13:29 +0200)]
Merge branch 'wip-mdl-29104' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-29141' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 11:00:21 +0000 (13:00 +0200)]
Merge branch 'MDL-29141' of git://github.com/timhunt/moodle

10 years agoMDL-29104 course: Fixed optional_param_array usage for load_selected_users
Rajesh Taneja [Mon, 29 Aug 2011 02:00:00 +0000 (10:00 +0800)]
MDL-29104 course: Fixed optional_param_array usage for load_selected_users

10 years agoMerge branch 'wip-MDL-24202-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 08:23:22 +0000 (10:23 +0200)]
Merge branch 'wip-MDL-24202-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-29144' of git://github.com/timhunt/moodle
Aparup Banerjee [Mon, 29 Aug 2011 04:10:30 +0000 (12:10 +0800)]
Merge branch 'MDL-29144' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28564' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 29 Aug 2011 01:58:05 +0000 (13:58 +1200)]
Merge branch 'MDL-28564' of git://github.com/timhunt/moodle

10 years agoMDL-24202 navigation Fixed bug caused by navigation overriding a CFG setting
Sam Hemelryk [Mon, 29 Aug 2011 01:45:04 +0000 (13:45 +1200)]
MDL-24202 navigation Fixed bug caused by navigation overriding a CFG setting

10 years agoMerge branch 'MDL-28943_manage_message_name' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 01:25:41 +0000 (03:25 +0200)]
Merge branch 'MDL-28943_manage_message_name' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-26302' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 01:22:02 +0000 (03:22 +0200)]
Merge branch 'MDL-26302' of git://github.com/timhunt/moodle

10 years agoMerge branch 'wip-MDL-28596-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 01:15:25 +0000 (03:15 +0200)]
Merge branch 'wip-MDL-28596-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-26819' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 29 Aug 2011 01:05:00 +0000 (13:05 +1200)]
Merge branch 'MDL-26819' of git://github.com/stronk7/moodle

10 years agoMerge branch 'dev_MDL-27289_boxnet_master' of git://github.com/dongsheng/moodle
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

10 years agoMerge branch 'MDL-29064' of git://github.com/timhunt/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

10 years agoMerge branch 'MDL-29062' 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

10 years agoMerge branch 'MDL-29135-mnet-login' of git://github.com/mudrd8mz/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

10 years agoMerged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict...
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

10 years agoMerge branch 'master' of git.moodle.org:/git/integration
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 00:04:46 +0000 (02:04 +0200)]
Merge branch 'master' of git.moodle.org:/git/integration

10 years agoMerge branch 'MDL-29111' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2011 00:01:37 +0000 (02:01 +0200)]
Merge branch 'MDL-29111' of git://github.com/timhunt/moodle

10 years agoMDL-28459 theme-formal_white Added option to specify a special logo for use on the...
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

10 years agoMDL-29148 MNet - improved handling of a verification function return code
David Mudrak [Sat, 27 Aug 2011 23:06:31 +0000 (01:06 +0200)]
MDL-29148 MNet - improved handling of a verification function return code

10 years agoMerge branch 'wip_MDL-16168_HEAD_CAS_crash_if_no_LDAP' of https://github.com/iarenaza...
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

10 years agoMerge branch 'MDL-25872' of git://github.com/bostelm/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

10 years agoMerge branch 'MDL-6397_database_rss_label' of git://github.com/andyjdavis/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

10 years agoMDL-28402 LDAP configuration values being stored in lower case, causing misconfiguration
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.

10 years agoMDL-26819 quiz statistics - use cross-db GROUP BY expression
Eloy Lafuente (stronk7) [Sun, 28 Aug 2011 20:12:40 +0000 (22:12 +0200)]
MDL-26819 quiz statistics - use cross-db GROUP BY expression

10 years agoMDL-16168 auth/cas CAS crashes if no LDAP is set up
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.

10 years agoMDL-27107 auth_mnet - consider all incoming roaming users as confirmed
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.

10 years agoMDL-29135 Reworded login prompt with SSO over MNet enabled
David Mudrak [Fri, 26 Aug 2011 13:34:37 +0000 (15:34 +0200)]
MDL-29135 Reworded login prompt with SSO over MNet enabled

10 years agoMDL-26302 quiz editing: top move button on the order and paging tab does not work.
Tom Cubanski [Mon, 22 Aug 2011 22:55:46 +0000 (23:55 +0100)]
MDL-26302 quiz editing: top move button on the order and paging tab does not work.

It is strange that processes the submission already handles the submitted data from this change to the HTML.

10 years agoMDL-29064 qtype multianswer, question text should be a required field.
Tim Hunt [Tue, 23 Aug 2011 07:36:52 +0000 (08:36 +0100)]
MDL-29064 qtype multianswer, question text should be a required field.

10 years agoMDL-29062 qtype multianswer refers to old name for the question_delete_questions...
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.

10 years agoMDL-28564 question type importing, improve Jamie's fix.
Tim Hunt [Mon, 22 Aug 2011 22:31:50 +0000 (23:31 +0100)]
MDL-28564 question type importing, improve Jamie's fix.

10 years agoMDL-28564 "implement support for extra answer fields in question export and
Jamie Pratt [Tue, 2 Aug 2011 11:34:47 +0000 (18:34 +0700)]
MDL-28564 "implement support for extra answer fields in question export and
import" implemented support for extra answer fields in questiontype base
export and import functions.

10 years agoMDL-29144 quiz navigation: Screen-readers speak question state twice
M Kassaei [Fri, 26 Aug 2011 18:10:08 +0000 (19:10 +0100)]
MDL-29144 quiz navigation: Screen-readers speak question state twice

10 years agoMDL-29111 quiz was passing 0 to ->review_url when it should have been null.
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.

10 years agoMDL-25872 View assignment submissions: show only students, not teachers
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

10 years agoMDL-29141 question bank show question text checkbox does not match state.
Tim Hunt [Fri, 26 Aug 2011 16:01:06 +0000 (17:01 +0100)]
MDL-29141 question bank show question text checkbox does not match state.

10 years agoweekly release 2.2dev
Eloy Lafuente (stronk7) [Fri, 26 Aug 2011 13:10:15 +0000 (15:10 +0200)]
weekly release 2.2dev

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Fri, 26 Aug 2011 12:56:34 +0000 (14:56 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoMDL-28684 QE2 upgrade: fix undefined $a regression. Thanks Henning!
Eloy Lafuente (stronk7) [Thu, 25 Aug 2011 13:51:57 +0000 (15:51 +0200)]
MDL-28684 QE2 upgrade: fix undefined $a regression. Thanks Henning!

10 years agoMerge branch 'w33_MDL-28554_m22_yui' of github.com:skodak/moodle
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

10 years agoMDL-28554 workaround for http://yuilibrary.com/projects/yui3/ticket/2530999
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.

10 years agoMerge branch 'MDL-27823_bulk_messaging_2' of git://github.com/andyjdavis/moodle
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

10 years agoMDL-28596 course Improved and modernised the production of module editing icons and...
Sam Hemelryk [Thu, 25 Aug 2011 06:02:35 +0000 (18:02 +1200)]
MDL-28596 course Improved and modernised the production of module editing icons and added support for renderable content when rendering action_link components

10 years agoMDL-6397 database: removed an unused string
Andrew Davis (andyjdavis) [Thu, 25 Aug 2011 00:29:32 +0000 (08:29 +0800)]
MDL-6397 database: removed an unused string

10 years agoMDL-29012 custom profile fields - replace some " by '
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 23:39:57 +0000 (01:39 +0200)]
MDL-29012 custom profile fields - replace some " by '

10 years agoMerge branch 'MDL-29012-show_deleted_field' of git://github.com/tmuras/moodle
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

10 years agoMerge branch 'MDL-MDL-28650' of https://github.com/mouneyrac/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

10 years agoMerge branch 'w33_MDL-29027_m22_textlib' of git://github.com/skodak/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

10 years agoMDL-29027 yet more tests
Petr Skoda [Wed, 24 Aug 2011 16:47:05 +0000 (18:47 +0200)]
MDL-29027 yet more tests

10 years agoMDL-29027 support for mail charsets
Petr Skoda [Wed, 24 Aug 2011 16:37:13 +0000 (18:37 +0200)]
MDL-29027 support for mail charsets

10 years agoMDL-29027 fallback to typo and more tests
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.

10 years agoMerge branch 'MDL-28684' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 15:08:31 +0000 (17:08 +0200)]
Merge branch 'MDL-28684' of git://github.com/timhunt/moodle

10 years agoMDL-28684 fix failing unit test - which means fix the acutal code.
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.

10 years agoMerge branch 'w33_MDL-28929_m22_themeplaceholders' of git://github.com/skodak/moodle
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

10 years agoMerge branch 'w33_MDL-26796_m22_arrayparams' 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

10 years agoMDL-26796 accept objects that can be converted to string in clean_param()
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()

10 years agoMDL-28929 document themes api changes
Petr Skoda [Wed, 24 Aug 2011 13:11:25 +0000 (15:11 +0200)]
MDL-28929 document themes api changes

10 years agoMerge branch 'w33_MDL-28554_m22_yui' of github.com:skodak/moodle
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

10 years agoMDL-28554 fix problematic loading of io-upload-frame
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.

10 years agoMerge branch 'w33_MDL-26796_m22_arrayparams' of git://github.com/skodak/moodle
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

10 years agoNOBUG: Minibump needed here for some automated tests to happen
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 11:35:24 +0000 (13:35 +0200)]
NOBUG: Minibump needed here for some automated tests to happen

10 years agoMerge branch 'w33_MDL-28929_m22_themeplaceholders' of git://github.com/skodak/moodle
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

10 years agoMerge branch 'MDL-28976' of git://github.com/timhunt/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

10 years agoMDL-28929 add version.php with requirements and copyrights
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.

10 years agoMDL-29005 display enrollable courses total and downloadable courses total instead...
Jerome Mouneyrac [Wed, 24 Aug 2011 06:40:15 +0000 (14:40 +0800)]
MDL-29005 display enrollable courses total and downloadable courses total instead of courses/sites total

10 years agoRevert "MDL-28509 repository_youtube Enable selection of sort order"
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.

10 years agoMerge branch 'w33_MDL-29020_m22_clidbenrol' of git://github.com/skodak/moodle
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

10 years agoMerge branch 'MDL-28248b' of https://github.com/totara/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

10 years agoMDL-28248 completion: Incorrect SQL for finding enrol start date
Aaron Barnes [Fri, 19 Aug 2011 02:56:29 +0000 (14:56 +1200)]
MDL-28248 completion: Incorrect SQL for finding enrol start date

10 years agoMerge branch 'MDL-28979' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 23:55:45 +0000 (01:55 +0200)]
Merge branch 'MDL-28979' of git://github.com/timhunt/moodle

10 years agoMDL-28942 qtype multichoice, multi-response. Avoid computing the wrong random guess...
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.

10 years agoMerge branch 'MDL-28975' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 23:44:02 +0000 (01:44 +0200)]
Merge branch 'MDL-28975' of git://github.com/timhunt/moodle

10 years agoMDL-29019 enrol - fix a typo
Sun Zhigang [Sat, 20 Aug 2011 03:24:04 +0000 (11:24 +0800)]
MDL-29019 enrol - fix a typo

10 years agoMerge branch 'w33_MDL-19380_m22_repoclamav' of git://github.com/skodak/moodle
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

10 years agoMerge branch 'w33_MDL-29000_m22_forgetcase' 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

10 years agoMerge branch 'w33_MDL-28981_m22_canpost' 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

10 years agoMerge branch 'w33_MDL-27228_m22_labelhide' 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

10 years agoMerge branch 'w33_MDL-28708_m22_f304' 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

10 years agoMerge branch 'w33_MDL-28709_m22_h304' 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

10 years agoMerge branch 'w33_MDL-29011_m22_nomanualenrol' 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

10 years agoMDL-28684 QE2 upgrade: whitespace fix
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 20:52:16 +0000 (22:52 +0200)]
MDL-28684 QE2 upgrade: whitespace fix

10 years agoMerge branch 'MDL-28684b' of git://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 20:50:03 +0000 (22:50 +0200)]
Merge branch 'MDL-28684b' of git://github.com/bostelm/moodle

10 years agoMerge branch 'MDL-28444' of git://github.com/timhunt/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

10 years agoMerge branch 'w33_MDL-28982_m22_sqlfullname' of git://github.com/skodak/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

10 years agoMerge branch 'MDL-28687' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 23 Aug 2011 18:24:08 +0000 (02:24 +0800)]
Merge branch 'MDL-28687' of git://github.com/timhunt/moodle

10 years agoMerge branch 'master_MDL-27624' of git://github.com/danmarsden/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

10 years agoMDL-28962 enrol imsenterprise - whitespace fix
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 16:39:48 +0000 (18:39 +0200)]
MDL-28962 enrol imsenterprise - whitespace fix

10 years agoMerge branch 'master_MDL-28962' of git://github.com/danmarsden/moodle
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

10 years agoMerge branch 'MDL-28957' of git://github.com/colchambers/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

10 years agoMerge branch 'MDL-28397' of https://github.com/totara/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

10 years agoMDL-29027 fallback to mb_string on errors if available and simplify charset parsing
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.

10 years agoMerge branch 'wip-MDL-25636-master' of git://github.com/samhemelryk/moodle
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

10 years agoMerge branch 'w33_MDL-28381_m22_cliphpver' of git://github.com/skodak/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

10 years agoMerge branch 'MDL-28996' of git://github.com/timhunt/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

10 years agoMerge branch 'w33_MDL-28554_m22_yui' of git://github.com/skodak/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