moodle.git
13 years agoMerge branch 'MDL-28186' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 13:20:56 +0000 (15:20 +0200)]
Merge branch 'MDL-28186' of git://git.luns.net.uk/moodle

13 years agoMerge branch 'w27_MDL-28279_m22_flash' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 10:06:22 +0000 (12:06 +0200)]
Merge branch 'w27_MDL-28279_m22_flash' of git://github.com/skodak/moodle

13 years agoMerge branch 'w27_MDL-28280_m22_usesid' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 10:01:34 +0000 (12:01 +0200)]
Merge branch 'w27_MDL-28280_m22_usesid' of git://github.com/skodak/moodle

13 years agoMerge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 11 Jul 2011 08:20:03 +0000 (16:20 +0800)]
Merge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle

13 years agoMerge branch 'w27_MDL-26965_m22_cohortuploaduser' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 11 Jul 2011 08:11:50 +0000 (16:11 +0800)]
Merge branch 'w27_MDL-26965_m22_cohortuploaduser' of git://github.com/skodak/moodle

13 years agoMerge branch 'wip-mdl-27954' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 11 Jul 2011 08:01:26 +0000 (16:01 +0800)]
Merge branch 'wip-mdl-27954' of git://github.com/rajeshtaneja/moodle

13 years agoMerge branch 'w27_MDL-22404_m22_cohortbulk' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 11 Jul 2011 07:40:12 +0000 (15:40 +0800)]
Merge branch 'w27_MDL-22404_m22_cohortbulk' of git://github.com/skodak/moodle

13 years agoMDL-22404 bulk user add to cohort
Petr Skoda [Sat, 9 Jul 2011 21:25:29 +0000 (23:25 +0200)]
MDL-22404 bulk user add to cohort

13 years agoMerge branch 'MDL-28195' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 11 Jul 2011 07:02:03 +0000 (15:02 +0800)]
Merge branch 'MDL-28195' of git://github.com/timhunt/moodle

13 years agoMerge branch 'w27_MDL-28273_m22_cohortremove' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 11 Jul 2011 06:50:56 +0000 (14:50 +0800)]
Merge branch 'w27_MDL-28273_m22_cohortremove' of git://github.com/skodak/moodle

13 years agoMerge branch 'w27_MDL-28278_m22_cohorticons' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 11 Jul 2011 06:18:54 +0000 (14:18 +0800)]
Merge branch 'w27_MDL-28278_m22_cohorticons' of git://github.com/skodak/moodle

13 years agoMerge branch 'wip-MDL-27429-master' of git://github.com/Beedell/moodle
Sam Hemelryk [Mon, 11 Jul 2011 05:54:49 +0000 (13:54 +0800)]
Merge branch 'wip-MDL-27429-master' of git://github.com/Beedell/moodle

13 years agoMerge branch 'MDL-28268' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 11 Jul 2011 05:25:44 +0000 (13:25 +0800)]
Merge branch 'MDL-28268' of git://github.com/timhunt/moodle

13 years agoMerge branch 'MDL-28192' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 11 Jul 2011 05:17:52 +0000 (13:17 +0800)]
Merge branch 'MDL-28192' of git://github.com/timhunt/moodle

13 years agoMerge branch 'master_MDL-27947' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 11 Jul 2011 03:31:13 +0000 (11:31 +0800)]
Merge branch 'master_MDL-27947' of git://github.com/danmarsden/moodle

13 years agoMerge branch 'MDL-27890_master' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 11 Jul 2011 03:25:21 +0000 (11:25 +0800)]
Merge branch 'MDL-27890_master' of git://github.com/stronk7/moodle

13 years agoMerge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 11 Jul 2011 03:14:44 +0000 (11:14 +0800)]
Merge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle

13 years agoMerge branch 'mod_url_decode_master' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 11 Jul 2011 03:02:41 +0000 (11:02 +0800)]
Merge branch 'mod_url_decode_master' of git://github.com/stronk7/moodle

13 years agoMerge branch 'backup_groups_master' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 11 Jul 2011 02:53:38 +0000 (10:53 +0800)]
Merge branch 'backup_groups_master' of git://github.com/stronk7/moodle

13 years agoMDL-27954 mod_database - fixed search navigation link
Rajesh Taneja [Wed, 6 Jul 2011 06:06:02 +0000 (14:06 +0800)]
MDL-27954 mod_database - fixed search navigation link

13 years agoMDL-28048 glossary - fix double ampersand & missing string
Eloy Lafuente (stronk7) [Sun, 10 Jul 2011 23:23:20 +0000 (01:23 +0200)]
MDL-28048 glossary - fix double ampersand & missing string

13 years agoMDL-28048 glossary - add multilang support to categories
Eloy Lafuente (stronk7) [Sun, 10 Jul 2011 23:02:06 +0000 (01:02 +0200)]
MDL-28048 glossary - add multilang support to categories

13 years agoMDL-28280 remove obsolete unmaintained $CFG->usesid
Petr Skoda [Sun, 10 Jul 2011 11:38:42 +0000 (13:38 +0200)]
MDL-28280 remove obsolete unmaintained $CFG->usesid

13 years agoMDL-28156 restore - fix some notices restoring empty courses
Eloy Lafuente (stronk7) [Sun, 10 Jul 2011 11:12:05 +0000 (13:12 +0200)]
MDL-28156 restore - fix some notices restoring empty courses

13 years agoMDL-28279 remove unused admin setting
Petr Skoda [Sun, 10 Jul 2011 09:06:06 +0000 (11:06 +0200)]
MDL-28279 remove unused admin setting

13 years agoMDL-28279 remove flash client version blocking
Petr Skoda [Sun, 10 Jul 2011 09:03:02 +0000 (11:03 +0200)]
MDL-28279 remove flash client version blocking

Everybody is responsible for upgrades of Flash, there is no excuse any more.

13 years agoMDL-28278 use icons in cohort UI
Petr Skoda [Sun, 10 Jul 2011 08:03:42 +0000 (10:03 +0200)]
MDL-28278 use icons in cohort UI

13 years agoMDL-28156 restore - support restoring files without grade items
Eloy Lafuente (stronk7) [Sat, 9 Jul 2011 17:51:37 +0000 (19:51 +0200)]
MDL-28156 restore - support restoring files without grade items

13 years agoMDL-27438 backup - on course backups add course gropus and groupings
Eloy Lafuente (stronk7) [Sat, 9 Jul 2011 17:27:23 +0000 (19:27 +0200)]
MDL-27438 backup - on course backups add course gropus and groupings

13 years agoMDL-25954 fix cohort navigation issues
Petr Skoda [Sat, 9 Jul 2011 15:18:06 +0000 (17:18 +0200)]
MDL-25954 fix cohort navigation issues

13 years agoMDL-26965 add support for uploading of users to cohorts via csv
Petr Skoda [Sat, 9 Jul 2011 14:32:52 +0000 (16:32 +0200)]
MDL-26965 add support for uploading of users to cohorts via csv

13 years agoMDL-28273 waring that removing user from cohorts may unenrol from courses
Petr Skoda [Sat, 9 Jul 2011 14:23:36 +0000 (16:23 +0200)]
MDL-28273 waring that removing user from cohorts may unenrol from courses

13 years agoMDL-27018 restore - decode links missing url->externalurl support
Eloy Lafuente (stronk7) [Sat, 9 Jul 2011 11:33:50 +0000 (13:33 +0200)]
MDL-27018 restore - decode links missing url->externalurl support

13 years agoMDL-28268 Missing ORDER BY when using extra answer table.
Jamie Pratt [Wed, 6 Jul 2011 10:54:59 +0000 (17:54 +0700)]
MDL-28268 Missing ORDER BY when using extra answer table.

From OU bug #921 "Order of answer fields in Variable numeric keeps changing" Cannot
reproduce this bug on my system but hopefully this will fix the problem. I added
an ORDER BY clause to the sql for fetching answers with extra answer fields.

13 years agoMDL-27947 - fix TOC display on skipview - use correct org in TOC title
Dan Marsden [Sun, 3 Jul 2011 22:57:16 +0000 (10:57 +1200)]
MDL-27947 - fix TOC display on skipview - use correct org in TOC title

13 years agoMDL-27429 Adding tabindex and on keypress to the blocks show/hide icon.
John Beedell [Mon, 27 Jun 2011 15:19:47 +0000 (16:19 +0100)]
MDL-27429 Adding tabindex and on keypress to the blocks show/hide icon.

13 years agoweekly release 2.2dev
Eloy Lafuente (stronk7) [Fri, 8 Jul 2011 09:15:49 +0000 (11:15 +0200)]
weekly release 2.2dev

13 years agofix permissions
Eloy Lafuente (stronk7) [Fri, 8 Jul 2011 09:13:19 +0000 (11:13 +0200)]
fix permissions

13 years agoMerge branch 'MDL-28015-workshop-sql' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 23:11:13 +0000 (01:11 +0200)]
Merge branch 'MDL-28015-workshop-sql' of git://github.com/mudrd8mz/moodle

13 years agoMerge branch 'MDL-28168-custommenu' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 22:41:19 +0000 (00:41 +0200)]
Merge branch 'MDL-28168-custommenu' of git://github.com/mudrd8mz/moodle

13 years agoMDL-27890 tinymce - enable 30 as min height within moodle
Tim Hunt [Thu, 16 Jun 2011 16:02:18 +0000 (17:02 +0100)]
MDL-27890 tinymce - enable 30 as min height within moodle

13 years agoMDL-NOBUG tinymce - updated instructions to cover local modifications and other minor...
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 16:21:15 +0000 (18:21 +0200)]
MDL-NOBUG tinymce - updated instructions to cover local modifications and other minor changes

13 years agoMDL-27890 tinymce - allow it to be smaller
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 15:36:59 +0000 (17:36 +0200)]
MDL-27890 tinymce - allow it to be smaller

13 years agoMDL-28015 workshop - fixed unique list of columns in ORDER BY clause
David Mudrak [Thu, 7 Jul 2011 13:02:34 +0000 (15:02 +0200)]
MDL-28015 workshop - fixed unique list of columns in ORDER BY clause

MSSQL requires that the columns in the ORDER BY clause list must be
unique. The patch populates the list of fields by combining an array of
explicit sort definition with an array of implicit (default) sort
definition.

13 years agoMDL-28192 local_qeupgradehelper fix typo.
Tim Hunt [Thu, 7 Jul 2011 10:25:39 +0000 (11:25 +0100)]
MDL-28192 local_qeupgradehelper fix typo.

13 years agoMDL-28168 Multi-language support for custom_menu reimplemented
David Mudrak [Tue, 5 Jul 2011 09:43:09 +0000 (11:43 +0200)]
MDL-28168 Multi-language support for custom_menu reimplemented

This is a reimplementation of the multi-language support for the
custom_menu class. The menu items now accept the forth optional
parameter with the explicit list of languages the item is valid for. If
no languages are listed, the item is valid for any language. The caller
of the custom_menu constructor must provide the user's current language
or null if the multi-language should not be supported (all items are
valid for any language then, regardless the definition).

See the attached unit tests for the examples of usage.

13 years agoMDL-28168 Improved custom_menu constructor
David Mudrak [Tue, 5 Jul 2011 08:13:14 +0000 (10:13 +0200)]
MDL-28168 Improved custom_menu constructor

This improves custom_menu constructor by dropping support for useless
$text parameter and replacing it with the menu definition. This makes
custom_menu instance independent on the place where the menu is defined
($CFG->custommenuitems) and can be unit-tested. Also, multiple instances
of custom_menu can be instantiated now which can be interesting in the
future.

13 years agoMDL-28168 Revert "MDL-27073 Support multi-language content in custom menu"
David Mudrak [Tue, 5 Jul 2011 07:08:49 +0000 (09:08 +0200)]
MDL-28168 Revert "MDL-27073 Support multi-language content in custom menu"

This reverts commit 87e0230d0a0f5993111e81e01a9f62713595136a.

13 years agoMDL-27833 Backup - Fix can't search courses with non-latin characters during importing
Sun Zhigang [Mon, 13 Jun 2011 12:08:46 +0000 (20:08 +0800)]
MDL-27833 Backup - Fix can't search courses with non-latin characters during importing

PARAM_ALPHANUMEXT filter out all non-latin characters, including
Chinese, Japanese and etc. Use PARAM_NOTAGS instead.

13 years agoMerge branch 'MDL-28169' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 08:21:32 +0000 (10:21 +0200)]
Merge branch 'MDL-28169' of git://github.com/nebgor/moodle

13 years agoMerge branch 'w26_MDL-28163_m22_customfront' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 08:11:17 +0000 (10:11 +0200)]
Merge branch 'w26_MDL-28163_m22_customfront' of git://github.com/skodak/moodle

13 years agoMDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts.
Aparup Banerjee [Tue, 5 Jul 2011 10:09:40 +0000 (18:09 +0800)]
MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts.

13 years agoMerge branch 'master_MDL-28110' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 01:00:42 +0000 (03:00 +0200)]
Merge branch 'master_MDL-28110' of git://github.com/danmarsden/moodle

14 years agoMerge branch 'master_MDL-28111' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 00:36:28 +0000 (02:36 +0200)]
Merge branch 'master_MDL-28111' of git://github.com/danmarsden/moodle

14 years agoMDL-27989 whitespace fix
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 00:21:44 +0000 (02:21 +0200)]
MDL-27989 whitespace fix

14 years agoMerge branch 'MDL-27989_master' of git://github.com/kordan/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 00:19:15 +0000 (02:19 +0200)]
Merge branch 'MDL-27989_master' of git://github.com/kordan/moodle

14 years agoMerge branch 'MDL-26285' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jul 2011 00:10:13 +0000 (02:10 +0200)]
Merge branch 'MDL-26285' of git://git.luns.net.uk/moodle

14 years agoMerge branch 'w26_MDL-27375_m22_enrolcase' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 23:39:38 +0000 (01:39 +0200)]
Merge branch 'w26_MDL-27375_m22_enrolcase' of git://github.com/skodak/moodle

14 years agoMerge branch 'w26_MDL-28117_m22_dataurlhack' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 23:32:30 +0000 (01:32 +0200)]
Merge branch 'w26_MDL-28117_m22_dataurlhack' of git://github.com/skodak/moodle

14 years agoMerge branch 'MDL-27329' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 22:24:19 +0000 (00:24 +0200)]
Merge branch 'MDL-27329' of git://git.luns.net.uk/moodle

14 years agoMerge branch 'MDL-28100' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 22:12:19 +0000 (00:12 +0200)]
Merge branch 'MDL-28100' of git://git.luns.net.uk/moodle

14 years agoMerge branch 'MDL-27279' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 22:01:08 +0000 (00:01 +0200)]
Merge branch 'MDL-27279' of git://git.luns.net.uk/moodle

14 years agoMDL-26285 block_rss_client - do not disable with enablerssfeeds
Dan Poltawski [Wed, 6 Jul 2011 20:10:43 +0000 (21:10 +0100)]
MDL-26285 block_rss_client - do not disable with enablerssfeeds

This setting was used in 1.9 and below to control feed generation only, not
for RSS consumption.

14 years agoMerge branch 'MDL-28222' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 18:27:52 +0000 (20:27 +0200)]
Merge branch 'MDL-28222' of git://github.com/timhunt/moodle

14 years agoMDL-28222 quiz reports missing context in call to quiz_report_feedback_for_grade.
Tim Hunt [Wed, 6 Jul 2011 18:08:52 +0000 (19:08 +0100)]
MDL-28222 quiz reports missing context in call to quiz_report_feedback_for_grade.

14 years agoMerge branch 'MDL-27040' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 17:25:47 +0000 (19:25 +0200)]
Merge branch 'MDL-27040' of git://github.com/timhunt/moodle

14 years agoMerge branch 'MDL-28166' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 17:03:59 +0000 (19:03 +0200)]
Merge branch 'MDL-28166' of git://github.com/timhunt/moodle

14 years agoMDL-28195 confirm_action should allow the button labels to be customised
Tim Hunt [Tue, 5 Jul 2011 12:50:59 +0000 (13:50 +0100)]
MDL-28195 confirm_action should allow the button labels to be customised

14 years agoMDL-28166 fix some more instances of my favourite becuase typo.
Tim Hunt [Wed, 6 Jul 2011 13:19:25 +0000 (14:19 +0100)]
MDL-28166 fix some more instances of my favourite becuase typo.

14 years agoMDL-28166 send quiz event notifications asynchronously.
Tim Hunt [Mon, 4 Jul 2011 17:58:34 +0000 (18:58 +0100)]
MDL-28166 send quiz event notifications asynchronously.

This avoids the problem that you cannot send messages in transactions.

It also means that the quiz submission will not be prevented, and the
message will still be sent eventually, if any part of the messaging
system is giving intermittent errors when the student wants to submit
their quiz.

14 years agoMerge branch 'MDL-27934' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 6 Jul 2011 05:24:47 +0000 (13:24 +0800)]
Merge branch 'MDL-27934' of git://git.luns.net.uk/moodle

14 years agoMerge branch 'MDL-27855' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 6 Jul 2011 05:17:54 +0000 (13:17 +0800)]
Merge branch 'MDL-27855' of git://git.luns.net.uk/moodle

14 years agoMerge branch 'MDL-27168' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 6 Jul 2011 04:03:33 +0000 (12:03 +0800)]
Merge branch 'MDL-27168' of git://git.luns.net.uk/moodle

14 years agoMerge branch 'MDL-26626' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 6 Jul 2011 03:19:27 +0000 (11:19 +0800)]
Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle

14 years agoMerge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 6 Jul 2011 03:06:20 +0000 (11:06 +0800)]
Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle

14 years agoMerge branch 'MDL-28135' of git://github.com/nebgor/moodle
Sam Hemelryk [Wed, 6 Jul 2011 02:53:48 +0000 (10:53 +0800)]
Merge branch 'MDL-28135' of git://github.com/nebgor/moodle

14 years agoMerge branch 'w26_MDL-28147_m22_minify' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 01:13:11 +0000 (03:13 +0200)]
Merge branch 'w26_MDL-28147_m22_minify' of git://github.com/skodak/moodle

14 years agoMerge branch 'MDL-28160' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 01:06:34 +0000 (03:06 +0200)]
Merge branch 'MDL-28160' of git://github.com/timhunt/moodle

14 years agoMerge branch 'w26_MDL-28161_m22_caches' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 00:54:12 +0000 (02:54 +0200)]
Merge branch 'w26_MDL-28161_m22_caches' of git://github.com/skodak/moodle

14 years agoMerge branch 'w26_MDL-28167_m22_exconstructor' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 00:05:20 +0000 (02:05 +0200)]
Merge branch 'w26_MDL-28167_m22_exconstructor' of git://github.com/skodak/moodle

14 years agoMerge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 23:52:32 +0000 (01:52 +0200)]
Merge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle

14 years agoMerge branch 'MDL-28179' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 23:45:15 +0000 (01:45 +0200)]
Merge branch 'MDL-28179' of git://github.com/timhunt/moodle

14 years agoMerge branch 'MDL-28193' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 23:29:27 +0000 (01:29 +0200)]
Merge branch 'MDL-28193' of git://git.luns.net.uk/moodle

14 years agoMDL-28196 quiz calls get_in_or_equal (fixing missing $DB)
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 20:00:51 +0000 (22:00 +0200)]
MDL-28196 quiz calls get_in_or_equal (fixing missing $DB)

14 years agoMerge branch 'MDL-28196' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 17:55:31 +0000 (19:55 +0200)]
Merge branch 'MDL-28196' of git://github.com/timhunt/moodle

14 years agoMerge branch 'MDL-27821' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 17:41:32 +0000 (19:41 +0200)]
Merge branch 'MDL-27821' of git://github.com/timhunt/moodle

14 years agoMerge branch 'MDL-28185_master' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 15:58:55 +0000 (17:58 +0200)]
Merge branch 'MDL-28185_master' of git://github.com/stronk7/moodle

14 years agoMerge branch 'MDL-26618' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 15:46:46 +0000 (17:46 +0200)]
Merge branch 'MDL-26618' of git://github.com/timhunt/moodle

14 years agoMDL-28186 messaging: Fix "Enable messagning setting" infuence on the menus
Ruslan Kabalin [Tue, 5 Jul 2011 14:23:37 +0000 (15:23 +0100)]
MDL-28186 messaging: Fix "Enable messagning setting" infuence on the menus

"Enable messaging system" (Site administration > Advanced features) is
supposed to control messaging between site users only, thus it should not
remove user messging preferences menu item. However, it may remove instant
messging preferences from providers list for the user.

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
14 years agoMDL-28185 upgrade - fix oracle problem upgrading blocks
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 13:37:16 +0000 (15:37 +0200)]
MDL-28185 upgrade - fix oracle problem upgrading blocks

14 years agoMDL-28196 quiz calls get_in_or_equal (not DB->get_in_or_equal) in two places
Tim Hunt [Tue, 5 Jul 2011 13:29:30 +0000 (14:29 +0100)]
MDL-28196 quiz calls get_in_or_equal (not DB->get_in_or_equal) in two places

Also, another minor error in one method call.

14 years agoMDL-28193 Add $external arg to get_driver_instance
Andrew Robert Nicols [Tue, 5 Jul 2011 10:58:14 +0000 (11:58 +0100)]
MDL-28193 Add $external arg to get_driver_instance

Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
14 years agoaddition to previous fix for MDL-27989 in master
Kordan [Tue, 5 Jul 2011 09:32:20 +0000 (11:32 +0200)]
addition to previous fix for MDL-27989 in master

14 years agoMDL-26611 Roles Language - remove reference to 'legacy role type'
Dan Poltawski [Sun, 3 Jul 2011 20:04:04 +0000 (21:04 +0100)]
MDL-26611 Roles Language - remove reference to 'legacy role type'

14 years agoMerge branch 'MDL-25357_wip' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 5 Jul 2011 08:51:49 +0000 (16:51 +0800)]
Merge branch 'MDL-25357_wip' of git://github.com/timhunt/moodle

14 years agoMDL-27989 fix for master
Kordan [Tue, 5 Jul 2011 08:26:01 +0000 (10:26 +0200)]
MDL-27989 fix for master

14 years agoMDL-28135 general Updated broken and typo docs links
Aparup Banerjee [Tue, 5 Jul 2011 06:34:25 +0000 (14:34 +0800)]
MDL-28135 general Updated broken and typo docs links

14 years agoMDL-28135 general Updated the Copyright notice to point to docs.moodle.org/dev/Releas...
Aparup Banerjee [Mon, 4 Jul 2011 08:07:54 +0000 (16:07 +0800)]
MDL-28135 general Updated the Copyright notice to point to docs.moodle.org/dev/Releases instead of en/Release

14 years agoMDL-28135 general Updated doc links related to Release notes to docs.moodle.org/dev...
Aparup Banerjee [Mon, 4 Jul 2011 06:41:34 +0000 (14:41 +0800)]
MDL-28135 general Updated doc links related to Release notes to docs.moodle.org/dev/Releases now

14 years agoMDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc...
Aparup Banerjee [Mon, 4 Jul 2011 03:21:48 +0000 (11:21 +0800)]
MDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc links to "docs.moodle.org/dev/"