moodle.git
9 years agoMDL-39482 avoid using get_category_or_system_context() because file might not be...
Marina Glancy [Fri, 3 May 2013 04:45:23 +0000 (14:45 +1000)]
MDL-39482 avoid using get_category_or_system_context() because file might not be included

9 years agoon demand release 2.5beta+
Dan Poltawski [Thu, 2 May 2013 13:34:48 +0000 (14:34 +0100)]
on demand release 2.5beta+

9 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Dan Poltawski [Thu, 2 May 2013 13:32:03 +0000 (14:32 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

9 years agoMerge branch 'MDL-30775-master' of git://github.com/mouneyrac/moodle
Damyon Wiese [Thu, 2 May 2013 08:20:30 +0000 (16:20 +0800)]
Merge branch 'MDL-30775-master' of git://github.com/mouneyrac/moodle

Conflicts:
course/externallib.php

9 years agoMerge branch 'MDL-39401' of git://github.com/rwijaya/moodle
Damyon Wiese [Thu, 2 May 2013 06:50:49 +0000 (14:50 +0800)]
Merge branch 'MDL-39401' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-39207_master' of git://github.com/totara/openbadges
Damyon Wiese [Thu, 2 May 2013 06:44:20 +0000 (14:44 +0800)]
Merge branch 'MDL-39207_master' of git://github.com/totara/openbadges

9 years agoMDL-39401 portfolio: fixed setType() warnings in box.net and flickr portfolios
Rossiani Wijaya [Thu, 2 May 2013 06:20:03 +0000 (14:20 +0800)]
MDL-39401 portfolio: fixed setType() warnings in box.net and flickr portfolios

9 years agoMerge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle
Damyon Wiese [Thu, 2 May 2013 05:54:59 +0000 (13:54 +0800)]
Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

9 years agoMDL-39077 maxbytes - fix warnings for cli install
Damyon Wiese [Thu, 2 May 2013 04:10:05 +0000 (12:10 +0800)]
MDL-39077 maxbytes - fix warnings for cli install

9 years agoMDL-39207 badges: Generate badge assertions using user's backpack email if it is set
Yuliya Bozhko [Sun, 28 Apr 2013 22:15:30 +0000 (10:15 +1200)]
MDL-39207 badges: Generate badge assertions using user's backpack email if it is set

9 years agoMerge branch 'wip-MDL-39432-m25-i' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Thu, 2 May 2013 01:33:35 +0000 (03:33 +0200)]
Merge branch 'wip-MDL-39432-m25-i' of git://github.com/samhemelryk/moodle

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 2 May 2013 00:38:12 +0000 (00:38 +0000)]
Automatically generated installer lang files

9 years agoMDL-39355: Correct the z-index for moodle-dialogue
Andrew Nicols [Wed, 1 May 2013 17:34:04 +0000 (18:34 +0100)]
MDL-39355: Correct the z-index for moodle-dialogue

9 years agoMerge branch 'MDL-39367-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 1 May 2013 16:32:09 +0000 (17:32 +0100)]
Merge branch 'MDL-39367-master-int' of git://github.com/FMCorz/moodle

9 years agoMDL-39434 Bump main version to observe all deps
Eloy Lafuente (stronk7) [Wed, 1 May 2013 16:04:58 +0000 (18:04 +0200)]
MDL-39434 Bump main version to observe all deps

9 years agoMDL-39434 Bump all versions near 2.5 release
Eloy Lafuente (stronk7) [Wed, 1 May 2013 16:03:29 +0000 (18:03 +0200)]
MDL-39434 Bump all versions near 2.5 release

9 years agoMerge branch 'MDL-39444' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 1 May 2013 14:55:36 +0000 (16:55 +0200)]
Merge branch 'MDL-39444' of git://github.com/timhunt/moodle

9 years agoMDL-39077 max_files does not include current option when it is non-standard
Damyon Wiese [Wed, 1 May 2013 06:58:31 +0000 (14:58 +0800)]
MDL-39077 max_files does not include current option when it is non-standard

Non-standard means php.ini was set to something not in the default list (like 7MB),
then the config was saved to that specific value, and now the value in php.ini has been changed
again so 7MB does not appear in the list.

9 years agoMDL-39444 get_string: remove unnecessary clean_param
Tim Hunt [Wed, 1 May 2013 08:55:01 +0000 (09:55 +0100)]
MDL-39444 get_string: remove unnecessary clean_param

This clean_param was added as part of MDL-22015. It is a good idea when
developer debug is turned on, but it showed up as a surprisingly
expensive cost in our profiling.

This change:

1. Removes the check during string_extist. This will not change
behaviour, the method returns false if the string does not exist.

2. In get_string, it only does the check if debugging is set to
DEVELOPER level.

9 years agoMerge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 1 May 2013 08:53:18 +0000 (09:53 +0100)]
Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle

9 years agoMDL-39402 fix wrong binarius dependency
Petr Škoda [Wed, 1 May 2013 08:36:30 +0000 (10:36 +0200)]
MDL-39402 fix wrong binarius dependency

Credit goes to Frédéric Massart, thanks.

9 years agoMerge branch 'MDL-39438_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 1 May 2013 07:32:30 +0000 (08:32 +0100)]
Merge branch 'MDL-39438_master' of git://github.com/dmonllao/moodle

9 years agoMDL-39422 course: converted closures to fix eAccelerator issues
Sam Hemelryk [Wed, 1 May 2013 06:42:33 +0000 (18:42 +1200)]
MDL-39422 course: converted closures to fix eAccelerator issues

9 years agoMDL-39207 badges: don't use curl version depedent constant
Dan Poltawski [Wed, 1 May 2013 06:20:10 +0000 (07:20 +0100)]
MDL-39207 badges: don't use curl version depedent constant

It seems that CURLOPT_CONNECTTIMEOUT_MS is depdendent on the version
of curl compiled against. We don't need milliseconds here anyway, so
switch to the seconds value.

9 years agoMDL-39438 behat: Updating tests
David Monllao [Wed, 1 May 2013 05:23:59 +0000 (13:23 +0800)]
MDL-39438 behat: Updating tests

According to MDL-38415 changes.

9 years agoMDL-39312 Cache lock plugins - fix undefined var and language typo
Damyon Wiese [Wed, 1 May 2013 02:51:32 +0000 (10:51 +0800)]
MDL-39312 Cache lock plugins - fix undefined var and language typo

9 years agoMerge branch 'wip-MDL-39312-m25' of git://github.com/samhemelryk/moodle
Damyon Wiese [Wed, 1 May 2013 02:04:50 +0000 (10:04 +0800)]
Merge branch 'wip-MDL-39312-m25' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

9 years agoAutomatically generated installer lang files
AMOS bot [Wed, 1 May 2013 00:39:23 +0000 (00:39 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'wip-MDL-39216-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 1 May 2013 00:29:36 +0000 (02:29 +0200)]
Merge branch 'wip-MDL-39216-m25' of git://github.com/samhemelryk/moodle

9 years agoMDL-39216 url: included test for empty string param
Sam Hemelryk [Wed, 1 May 2013 00:27:36 +0000 (12:27 +1200)]
MDL-39216 url: included test for empty string param

9 years agoMerge branch 'wip-MDL-39432-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 30 Apr 2013 23:33:18 +0000 (01:33 +0200)]
Merge branch 'wip-MDL-39432-m25' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'MDL-39422-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 30 Apr 2013 23:15:24 +0000 (11:15 +1200)]
Merge branch 'MDL-39422-master' of git://github.com/danpoltawski/moodle

Conflicts:
mod/wiki/mod_form.php

9 years agoMerge branch 'wip-MDL-39099_master' of git://github.com/gjb2048/moodle
Sam Hemelryk [Tue, 30 Apr 2013 23:05:05 +0000 (11:05 +1200)]
Merge branch 'wip-MDL-39099_master' of git://github.com/gjb2048/moodle

9 years agoMerge branch 'MDL-39414-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 30 Apr 2013 23:02:25 +0000 (11:02 +1200)]
Merge branch 'MDL-39414-master' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-39232_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 30 Apr 2013 22:47:32 +0000 (00:47 +0200)]
Merge branch 'MDL-39232_master' of git://github.com/dmonllao/moodle

9 years agoMDL-39432 course: converted closures to lambda functions
Sam Hemelryk [Tue, 30 Apr 2013 22:40:54 +0000 (10:40 +1200)]
MDL-39432 course: converted closures to lambda functions

9 years agoMerge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 30 Apr 2013 22:24:13 +0000 (10:24 +1200)]
Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle

9 years agoMerge branch 'MDL-36060-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 30 Apr 2013 22:14:28 +0000 (10:14 +1200)]
Merge branch 'MDL-36060-master' of git://github.com/danpoltawski/moodle

9 years agoMDL-36060: Remove anonymous functions in mod/lti
Mark Nielsen [Tue, 12 Mar 2013 22:28:23 +0000 (15:28 -0700)]
MDL-36060: Remove anonymous functions in mod/lti

This was breaking eaccelerator because it doesn't
support anonymous functions.

9 years agoMDL-39422 mod_forms: prevent long coruse module names
Dan Poltawski [Tue, 30 Apr 2013 16:39:56 +0000 (17:39 +0100)]
MDL-39422 mod_forms: prevent long coruse module names

To prevent ugly DB errors.

9 years agoMDL-39422 course: prevent module names longer 255 chars
Dan Poltawski [Tue, 30 Apr 2013 15:48:53 +0000 (16:48 +0100)]
MDL-39422 course: prevent module names longer 255 chars

To prevent ugly DB errors.

9 years agoMDL-39099 course_format: Allow section_summary() to be overridden.
Gareth J Barnard [Fri, 12 Apr 2013 17:49:13 +0000 (18:49 +0100)]
MDL-39099 course_format: Allow section_summary() to be overridden.

9 years agoMerge branch 'MDL-39270-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 30 Apr 2013 15:13:48 +0000 (16:13 +0100)]
Merge branch 'MDL-39270-master-int' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-39265-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 30 Apr 2013 14:49:41 +0000 (15:49 +0100)]
Merge branch 'MDL-39265-master-int' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-39207_master' of git://github.com/totara/openbadges
Dan Poltawski [Tue, 30 Apr 2013 13:42:44 +0000 (14:42 +0100)]
Merge branch 'MDL-39207_master' of git://github.com/totara/openbadges

9 years agoMerge branch 'MDL-39368-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 30 Apr 2013 13:35:28 +0000 (14:35 +0100)]
Merge branch 'MDL-39368-master-int' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 30 Apr 2013 13:11:34 +0000 (14:11 +0100)]
Merge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-35385_chat' of git://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 30 Apr 2013 13:07:55 +0000 (14:07 +0100)]
Merge branch 'MDL-35385_chat' of git://github.com/andyjdavis/moodle

9 years agoMDL-39343 disables MUC caches in phpunit and behat install/drop
Petr Škoda [Tue, 30 Apr 2013 13:05:53 +0000 (15:05 +0200)]
MDL-39343 disables MUC caches in phpunit and behat install/drop

9 years agoMerge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 30 Apr 2013 12:37:52 +0000 (13:37 +0100)]
Merge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle

9 years agoMDL-39414 portfolio: don't queue google portfolio exports
Dan Poltawski [Tue, 30 Apr 2013 09:16:01 +0000 (10:16 +0100)]
MDL-39414 portfolio: don't queue google portfolio exports

This is a bit of an ugly way of saying 'I dont support queued exports'.

The google plugins need a valid user session in order to export to the
google services, thereforce we are forcing the export to be interactive
and not queued through cron, as this wont work in the current
implmenetation.

It's possible we could add offline access to the plugins, but I don't
believe it is worth the benefit for the additional complexity.

9 years agoMerge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 30 Apr 2013 08:57:29 +0000 (09:57 +0100)]
Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle

9 years agoMDL-39343 disable all caching in install and upgrades
Petr Škoda [Sat, 27 Apr 2013 19:54:06 +0000 (21:54 +0200)]
MDL-39343 disable all caching in install and upgrades

This should resolve all problem on developer machines when switching branches or when restoring previous Moodle databases. It also prevents any potential problems during upgrades such as concurrent DB modification and resolves chicken egg problems in future caching upgrades.

9 years agoMDL-39354 Theme - Keep base and bootstrapbase in-sync
Damyon Wiese [Tue, 30 Apr 2013 08:17:16 +0000 (16:17 +0800)]
MDL-39354 Theme - Keep base and bootstrapbase in-sync

Add 7px margin-right to checkboxes and radio buttons

9 years agoMerge branch 'MDL-39354' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 30 Apr 2013 08:24:07 +0000 (16:24 +0800)]
Merge branch 'MDL-39354' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-39405-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 30 Apr 2013 08:16:31 +0000 (09:16 +0100)]
Merge branch 'MDL-39405-master-int' of git://github.com/FMCorz/moodle

9 years agoMDL-39265 feedback: Language string improvements
Frederic Massart [Tue, 30 Apr 2013 07:09:00 +0000 (15:09 +0800)]
MDL-39265 feedback: Language string improvements

AMOS BEGIN
 MOV [multiple_submit,mod_feedback],[multiplesubmit,mod_feedback]
 MOV [emailnotification_help,mod_feedback],[email_notification_help,mod_feedback]
AMOS END

9 years agoMerge branch 'w17_MDL-39292_m25_enrolicons' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 30 Apr 2013 07:52:49 +0000 (08:52 +0100)]
Merge branch 'w17_MDL-39292_m25_enrolicons' of git://github.com/skodak/moodle

9 years agoMerge branch 'mdl-39335' of git://github.com/vostreltsov/moodle
Damyon Wiese [Tue, 30 Apr 2013 07:51:12 +0000 (15:51 +0800)]
Merge branch 'mdl-39335' of git://github.com/vostreltsov/moodle

9 years agoMDL-39355: Set tooltip zindex for bootstrap theme
Andrew Nicols [Tue, 30 Apr 2013 07:45:53 +0000 (08:45 +0100)]
MDL-39355: Set tooltip zindex for bootstrap theme

9 years agoMerge branch 'MDL-39415-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 30 Apr 2013 07:34:16 +0000 (08:34 +0100)]
Merge branch 'MDL-39415-master' of git://github.com/damyon/moodle

9 years agoMerge branch 'w17_MDL-39077_m25_sizes' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 30 Apr 2013 07:24:31 +0000 (08:24 +0100)]
Merge branch 'w17_MDL-39077_m25_sizes' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-39351' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 30 Apr 2013 06:13:25 +0000 (14:13 +0800)]
Merge branch 'MDL-39351' of git://github.com/timhunt/moodle

9 years agoMDL-30775 get_course_contents: remove warnings when the section is empty
Jerome Mouneyrac [Fri, 26 Apr 2013 07:56:28 +0000 (15:56 +0800)]
MDL-30775 get_course_contents: remove warnings when the section is empty

9 years agoMerge branch 'MDL-39322-master' of https://github.com/mackensen/moodle
Damyon Wiese [Tue, 30 Apr 2013 06:06:42 +0000 (14:06 +0800)]
Merge branch 'MDL-39322-master' of https://github.com/mackensen/moodle

9 years agoMDL-39405 wiki: Reformat forms for better usability
Frederic Massart [Mon, 29 Apr 2013 07:59:47 +0000 (15:59 +0800)]
MDL-39405 wiki: Reformat forms for better usability

9 years agoMerge branch 'MDL-37966' of git://github.com/jonof/moodle
Damyon Wiese [Tue, 30 Apr 2013 04:26:47 +0000 (12:26 +0800)]
Merge branch 'MDL-37966' of git://github.com/jonof/moodle

9 years agoMDL-39312 cache: interfaces for managing lock instances.
Sam Hemelryk [Tue, 30 Apr 2013 04:26:34 +0000 (16:26 +1200)]
MDL-39312 cache: interfaces for managing lock instances.

Bug: There was no way to create an instance of a lock plugin for use
within Moodle.
Solution: Implemented management interfaces as part of cache/admin.php
to allow for instances to be added and deleted.
This was done in along the same lines of adding store instances.

9 years agoMerge branch 'MDL-39246' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 30 Apr 2013 04:02:36 +0000 (12:02 +0800)]
Merge branch 'MDL-39246' of git://github.com/timhunt/moodle

9 years agoMDL-39232 behat Normalize feature tags according to component names
David Monllao [Tue, 23 Apr 2013 04:56:40 +0000 (12:56 +0800)]
MDL-39232 behat Normalize feature tags according to component names

9 years agoMDL-39232 behat: Adding @_only_local tag
David Monllao [Tue, 23 Apr 2013 03:47:50 +0000 (11:47 +0800)]
MDL-39232 behat: Adding @_only_local tag

Tests which requires files to be uploaded should
be tagged as @_only_local.

9 years agoMDL-39415 Assign: Fix error on saving settings
Damyon Wiese [Tue, 30 Apr 2013 03:44:22 +0000 (11:44 +0800)]
MDL-39415 Assign: Fix error on saving settings

When alwaysshowdescription checkbox is unchecked the form cant be saved.

This is a regression from when the element was changed from a
selectyesno to a checkbox.

9 years agoMerge branch 'wip_MDL_39230_2_5' of http://github.com/jamiepratt/moodle.git
Damyon Wiese [Tue, 30 Apr 2013 03:39:24 +0000 (11:39 +0800)]
Merge branch 'wip_MDL_39230_2_5' of github.com/jamiepratt/moodle.git

9 years agoMDL-39230 Question bank - refactor xml import
Jamie Pratt [Mon, 29 Apr 2013 11:16:04 +0000 (18:16 +0700)]
MDL-39230 Question bank - refactor xml import

Allow for reuse of code to read xml questions.

9 years agoMDL-35385 mod_chat: made sure no message popups display within the chat window
Andrew Davis [Fri, 12 Apr 2013 03:59:08 +0000 (11:59 +0800)]
MDL-35385 mod_chat: made sure no message popups display within the chat window

9 years agoMDL-39265 feedback: Reformat module settings form
Frederic Massart [Mon, 22 Apr 2013 05:26:21 +0000 (13:26 +0800)]
MDL-39265 feedback: Reformat module settings form

9 years agoMDL-39216 url: moodle_url now handles empty param values properly
Sam Hemelryk [Thu, 18 Apr 2013 21:49:44 +0000 (09:49 +1200)]
MDL-39216 url: moodle_url now handles empty param values properly

9 years agoMDL-39216 url: updated tests to show desired outcome
Sam Hemelryk [Thu, 18 Apr 2013 21:48:53 +0000 (09:48 +1200)]
MDL-39216 url: updated tests to show desired outcome

9 years agoMDL-39216 url: new moodle_url tests for valueless params
Sam Hemelryk [Thu, 18 Apr 2013 21:47:22 +0000 (09:47 +1200)]
MDL-39216 url: new moodle_url tests for valueless params

9 years agoMerge branch 'w17_MDL-39386_m25_enroldocs' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 29 Apr 2013 23:00:06 +0000 (11:00 +1200)]
Merge branch 'w17_MDL-39386_m25_enroldocs' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-39366-master-int' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 29 Apr 2013 22:38:38 +0000 (10:38 +1200)]
Merge branch 'MDL-39366-master-int' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-39303_master' of https://github.com/markn86/moodle
Sam Hemelryk [Mon, 29 Apr 2013 22:08:20 +0000 (10:08 +1200)]
Merge branch 'MDL-39303_master' of https://github.com/markn86/moodle

9 years agoMerge branch 'MDL-38896_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 29 Apr 2013 21:57:00 +0000 (09:57 +1200)]
Merge branch 'MDL-38896_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-39377' of git://github.com/colchambers/moodle
Sam Hemelryk [Mon, 29 Apr 2013 21:48:18 +0000 (09:48 +1200)]
Merge branch 'MDL-39377' of git://github.com/colchambers/moodle

9 years agoMerge branch 'MDL-39365-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 29 Apr 2013 21:36:50 +0000 (09:36 +1200)]
Merge branch 'MDL-39365-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-39398-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 29 Apr 2013 21:31:54 +0000 (09:31 +1200)]
Merge branch 'MDL-39398-master' of git://github.com/FMCorz/moodle

9 years agoMDL-39354 put back a bit of margin on checkboxes.
Tim Hunt [Thu, 25 Apr 2013 15:47:20 +0000 (16:47 +0100)]
MDL-39354 put back a bit of margin on checkboxes.

9 years agoMerge branch 'MDL-39378' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 29 Apr 2013 16:00:53 +0000 (17:00 +0100)]
Merge branch 'MDL-39378' of git://github.com/timhunt/moodle

9 years agoRevert "MDL-39278 - test change to less which is ungenerated"
Dan Poltawski [Mon, 29 Apr 2013 13:33:07 +0000 (14:33 +0100)]
Revert "MDL-39278 - test change to less which is ungenerated"

This reverts commit 0da03bf4e268e38cbb2be8254270ca38538b86e9.

9 years agoMDL-39278 - test change to less which is ungenerated
Dan Poltawski [Mon, 29 Apr 2013 13:22:22 +0000 (14:22 +0100)]
MDL-39278 - test change to less which is ungenerated

My sincere apologies for polluting the history this way, but this
is the best way we can be sure.

TO BE CLEAR: this commit will shorlty be reverted.

9 years agoMerge branch 'MDL-39158-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 29 Apr 2013 13:20:39 +0000 (14:20 +0100)]
Merge branch 'MDL-39158-master' of git://github.com/damyon/moodle

9 years agoMerge branch 'MDL-39389' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 29 Apr 2013 13:15:23 +0000 (14:15 +0100)]
Merge branch 'MDL-39389' of git://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-39390' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 29 Apr 2013 13:12:37 +0000 (14:12 +0100)]
Merge branch 'MDL-39390' of git://github.com/stronk7/moodle

9 years agoMDL-39368 url: Remove advanced parameters from settings form
Frederic Massart [Fri, 26 Apr 2013 06:19:01 +0000 (14:19 +0800)]
MDL-39368 url: Remove advanced parameters from settings form

9 years agoMDL-39368 url: Renaming sections of the settings form
Frederic Massart [Fri, 26 Apr 2013 06:13:30 +0000 (14:13 +0800)]
MDL-39368 url: Renaming sections of the settings form

9 years agoMDL-39398 message: Prevent notice when sending Jabber messages
Frederic Massart [Mon, 29 Apr 2013 06:10:44 +0000 (14:10 +0800)]
MDL-39398 message: Prevent notice when sending Jabber messages

Not tracking the presence prevents a notice to be displayed during disconnect(),
where the the jabber server attempts to subscribe to $CFG->jabberusername presence.
As the server name does not include a resource identifier (stillwit@jabber.org/resource),
an explode('/') fails.

9 years agoMerge branch 'MDL-27071' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 29 Apr 2013 09:27:29 +0000 (10:27 +0100)]
Merge branch 'MDL-27071' of git://github.com/stronk7/moodle

9 years agoMerge branch 'w17_MDL-39356_m25_cacert' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 29 Apr 2013 08:05:08 +0000 (16:05 +0800)]
Merge branch 'w17_MDL-39356_m25_cacert' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-39342' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 29 Apr 2013 07:35:40 +0000 (15:35 +0800)]
Merge branch 'MDL-39342' of git://github.com/timhunt/moodle

9 years agoMDL-39402 add missing theme dependencies
Petr Škoda [Mon, 29 Apr 2013 07:14:23 +0000 (09:14 +0200)]
MDL-39402 add missing theme dependencies