moodle.git
9 years agoMerge branch 'MDL-38480_m' of git://github.com/andreabix/moodle
Damyon Wiese [Mon, 6 May 2013 13:57:19 +0000 (21:57 +0800)]
Merge branch 'MDL-38480_m' of git://github.com/andreabix/moodle

9 years agoMerge branch 'MDL-39446' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 6 May 2013 13:47:58 +0000 (14:47 +0100)]
Merge branch 'MDL-39446' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-39473-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 6 May 2013 13:32:33 +0000 (14:32 +0100)]
Merge branch 'MDL-39473-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'wip-MDL-39065-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 6 May 2013 12:25:51 +0000 (13:25 +0100)]
Merge branch 'wip-MDL-39065-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'MDL-39491-workshop-media' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 6 May 2013 12:11:46 +0000 (13:11 +0100)]
Merge branch 'MDL-39491-workshop-media' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'MDL-39470_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 6 May 2013 11:39:53 +0000 (12:39 +0100)]
Merge branch 'MDL-39470_master' of https://github.com/markn86/moodle

9 years agoMDL-38443 Assignment: Missing permissions check on downloadall submissions
Damyon Wiese [Wed, 13 Mar 2013 03:07:12 +0000 (11:07 +0800)]
MDL-38443 Assignment: Missing permissions check on downloadall submissions

9 years agoMerge branch 'MDL-39442-copy-addon' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 6 May 2013 09:00:23 +0000 (10:00 +0100)]
Merge branch 'MDL-39442-copy-addon' of git://github.com/mudrd8mz/moodle

Conflicts:
admin/tool/installaddon/version.php

9 years agoMerge branch 'MDL-39484-master-int' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 6 May 2013 07:38:24 +0000 (15:38 +0800)]
Merge branch 'MDL-39484-master-int' of git://github.com/FMCorz/moodle

9 years agoMDL-39143: Version bump and svgfix for ie9
Damyon Wiese [Mon, 6 May 2013 07:31:52 +0000 (15:31 +0800)]
MDL-39143: Version bump and svgfix for ie9

9 years agoMerge branch 'MDL-39143-master' of git://github.com/barbararamiro/moodle
Damyon Wiese [Mon, 6 May 2013 07:31:05 +0000 (15:31 +0800)]
Merge branch 'MDL-39143-master' of git://github.com/barbararamiro/moodle

9 years agoMerge branch 'MDL-39445' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 6 May 2013 07:15:02 +0000 (15:15 +0800)]
Merge branch 'MDL-39445' of git://github.com/timhunt/moodle

9 years agoMDL-39143 usability: New badge icon - monochrome, bigger, clearer
Barbara Ramiro [Mon, 6 May 2013 06:37:04 +0000 (14:37 +0800)]
MDL-39143 usability:  New badge icon - monochrome, bigger, clearer

9 years agoMDL-39470 cache: added missing component to get_string call
Mark Nelson [Mon, 6 May 2013 05:51:00 +0000 (13:51 +0800)]
MDL-39470 cache: added missing component to get_string call

9 years agoMerge branch 'MDL-39412' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 6 May 2013 04:27:19 +0000 (12:27 +0800)]
Merge branch 'MDL-39412' of git://github.com/timhunt/moodle

9 years agoMDL-39399: Version bump for css
Damyon Wiese [Mon, 6 May 2013 04:17:44 +0000 (12:17 +0800)]
MDL-39399: Version bump for css

9 years agoMerge branch 'MDL-39399-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 6 May 2013 04:13:27 +0000 (12:13 +0800)]
Merge branch 'MDL-39399-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

9 years agoMerge branch 'MDL-39480_badge' of git://github.com/andyjdavis/moodle
Damyon Wiese [Mon, 6 May 2013 04:00:34 +0000 (12:00 +0800)]
Merge branch 'MDL-39480_badge' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'wip-MDL-38594-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 6 May 2013 03:43:37 +0000 (11:43 +0800)]
Merge branch 'wip-MDL-38594-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-39484 core: Undefined ostype during installation process
Frederic Massart [Fri, 3 May 2013 06:29:07 +0000 (14:29 +0800)]
MDL-39484 core: Undefined ostype during installation process

9 years agoMerge branch 'MDL-39348_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Sun, 5 May 2013 23:49:51 +0000 (01:49 +0200)]
Merge branch 'MDL-39348_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-38041_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Sun, 5 May 2013 23:23:49 +0000 (01:23 +0200)]
Merge branch 'MDL-38041_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'brokencalc' of git://github.com/andyjdavis/moodle
Dan Poltawski [Sun, 5 May 2013 10:29:11 +0000 (11:29 +0100)]
Merge branch 'brokencalc' of git://github.com/andyjdavis/moodle

9 years agoMDL-39480 core_badge: prevented a php notice
Andrew Davis [Sat, 4 May 2013 03:44:25 +0000 (11:44 +0800)]
MDL-39480 core_badge: prevented a php notice

9 years agoMerge branch 'MDL-39476-master' of git://github.com/damyon/moodle
Dan Poltawski [Fri, 3 May 2013 15:05:41 +0000 (16:05 +0100)]
Merge branch 'MDL-39476-master' of git://github.com/damyon/moodle

9 years agoMDL-39491 Fix order of Workshop submission text processing
David Mudrák [Fri, 3 May 2013 09:43:03 +0000 (11:43 +0200)]
MDL-39491 Fix order of Workshop submission text processing

The order of format_text() and file_rewrite_pluginfile_urls() is
important to make filters work correctly.

9 years agoMerge branch 'MDL-38714_tmp' of git://github.com/rwijaya/moodle
Damyon Wiese [Fri, 3 May 2013 07:37:57 +0000 (15:37 +0800)]
Merge branch 'MDL-38714_tmp' of git://github.com/rwijaya/moodle

9 years agoMDL-39476 Assign: Cleanup old bad data before adding new index
Damyon Wiese [Fri, 3 May 2013 03:16:15 +0000 (11:16 +0800)]
MDL-39476 Assign: Cleanup old bad data before adding new index

9 years agoMDL-39348 behat: Compatibility with Safari and IE
David Monllao [Thu, 2 May 2013 07:35:23 +0000 (15:35 +0800)]
MDL-39348 behat: Compatibility with Safari and IE

Also changing from SeleniumDriver checking
to GoutteDriver as is less probably to change
goutte than to change selenium.

9 years agoMDL-39348 behat: Switching to wait which does not conflict with IE
David Monllao [Thu, 25 Apr 2013 09:07:57 +0000 (17:07 +0800)]
MDL-39348 behat: Switching to wait which does not conflict with IE

Also solving bug with DOM ready, timeout
was set to self::TIMEOUT miliseconds not
seconds.

9 years agoMDL-39348 behat: Chaining strings instead of splitting strings in lines
David Monllao [Thu, 25 Apr 2013 07:41:24 +0000 (15:41 +0800)]
MDL-39348 behat: Chaining strings instead of splitting strings in lines

9 years agoMDL-39348 behat: Changing to correct activity names
David Monllao [Thu, 25 Apr 2013 06:55:45 +0000 (14:55 +0800)]
MDL-39348 behat: Changing to correct activity names

9 years agoMDL-39348 behat: Removing redundant step
David Monllao [Thu, 25 Apr 2013 06:47:48 +0000 (14:47 +0800)]
MDL-39348 behat: Removing redundant step

This is causing some browsers to fail tests
as they uses the DOM of the current page to
search "You are logged in as".

9 years agoMDL-38041 behat: Also fail tests if there is any other backtrace
David Monllao [Wed, 1 May 2013 07:58:55 +0000 (15:58 +0800)]
MDL-38041 behat: Also fail tests if there is any other backtrace

9 years agoMDL-38041 behat: Capturing also PHP debug messages
David Monllao [Mon, 29 Apr 2013 08:01:32 +0000 (16:01 +0800)]
MDL-38041 behat: Capturing also PHP debug messages

9 years agoMDL-38041 behat: Adding hook
David Monllao [Fri, 22 Feb 2013 03:13:42 +0000 (11:13 +0800)]
MDL-38041 behat: Adding hook

Stops execution when the output contains
an exception, a debugging message or a PHP
debug message.

9 years agoMDL-38041 behat: Adding styles to debugging messages
David Monllao [Fri, 22 Feb 2013 03:12:42 +0000 (11:12 +0800)]
MDL-38041 behat: Adding styles to debugging messages

Only when a simulated user session
is running.

9 years agoMDL-39065 fixed bug with quick jump to category
Marina Glancy [Thu, 2 May 2013 07:27:30 +0000 (17:27 +1000)]
MDL-39065 fixed bug with quick jump to category

9 years agoMDL-38594 Core themes changed for the new course listings styles
Marina Glancy [Thu, 2 May 2013 04:54:36 +0000 (14:54 +1000)]
MDL-38594 Core themes changed for the new course listings styles

9 years agoMDL-39318 CSS bug on mouse hover of paging bar in some themes
Marina Glancy [Thu, 2 May 2013 01:16:21 +0000 (11:16 +1000)]
MDL-39318 CSS bug on mouse hover of paging bar in some themes

9 years agoMDL-39412 question behaviours: hide manual graded option
Tim Hunt [Mon, 29 Apr 2013 18:04:51 +0000 (19:04 +0100)]
MDL-39412 question behaviours: hide manual graded option

The ability to set all your quiz questions to require manual grading is
an interesting possibility, but practically almost useless.

If you set that accidentally, then you are badly stuck. There is no way
to fix it after the students have answered the quiz.

Therefore, we should set the config option to hide that option from the
UI. We do this for all Moodle sites as part of the upgrade, not just for
new installs.

If any admin wants to re-enable this, they can later.

9 years agoMDL-39450 course formats: add static cache to get_format_or_default
Tim Hunt [Wed, 1 May 2013 14:50:09 +0000 (15:50 +0100)]
MDL-39450 course formats: add static cache to get_format_or_default

This function gets called hundreds of times on every page, often with
exactly the same input, so I added a static cache.

9 years agoMDL-39446 calculated qtype: make answer formula input bigger
Tim Hunt [Wed, 1 May 2013 18:28:58 +0000 (19:28 +0100)]
MDL-39446 calculated qtype: make answer formula input bigger

This makes it easier for teachers editing questions.

9 years agoMDL-39445 get_plugin_list clean_param use is slow
Tim Hunt [Wed, 1 May 2013 10:35:14 +0000 (11:35 +0100)]
MDL-39445 get_plugin_list clean_param use is slow

get_plugin_list was calling clean_param($pluginname, PARAM_PLUGIN) a
lot (600+ times per page), and that is much slower than you would guess.
A specific function for this case, (which we then also use from
clean_param) is a performance win.

9 years agoMDL-39472 MUC: Improve parse_key performance
sam marshall [Thu, 2 May 2013 15:00:09 +0000 (16:00 +0100)]
MDL-39472 MUC: Improve parse_key performance

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 agoMDL-39442 Do not use native rename() when moving folders
David Mudrák [Thu, 2 May 2013 11:44:47 +0000 (13:44 +0200)]
MDL-39442 Do not use native rename() when moving folders

The native rename() function does not support moving folders
cross-device. See https://bugs.php.net/bug.php?id=54097 for details. So
instead of trying to move the whole tree, the new installer's method
moves files recursively one by one.

This is consistent with what mdeploy.php already does.

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 agoMDL-38717: Lesson mod: fixed behat script to accomodate the fix of settype()
Rossiani Wijaya [Thu, 2 May 2013 07:26:35 +0000 (15:26 +0800)]
MDL-38717: Lesson mod: fixed behat script to accomodate the fix of settype()

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 agoMDL-32913 core_grade:made it more obvious when the gradebook is broken due to a broke...
Andrew Davis [Mon, 29 Apr 2013 02:15:08 +0000 (10:15 +0800)]
MDL-32913 core_grade:made it more obvious when the gradebook is broken due to a broken calculation

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-38714 Lesson module: add setType for hidden and text inputs
Rossiani Wijaya [Wed, 1 May 2013 03:39:31 +0000 (11:39 +0800)]
MDL-38714 Lesson module: add setType for hidden and text inputs

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