moodle.git
8 years agoMerge branch 'MDL-28250-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Damyon Wiese [Fri, 17 May 2013 04:12:01 +0000 (12:12 +0800)]
Merge branch 'MDL-28250-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

8 years agoMDL-39678 fix YUI 20130515 vulnerability
Petr Škoda [Wed, 15 May 2013 20:03:50 +0000 (22:03 +0200)]
MDL-39678 fix YUI 20130515 vulnerability

8 years agoMDL-28250 license: upgrade old versions of cc-nc
Dan Poltawski [Wed, 15 May 2013 09:44:37 +0000 (10:44 +0100)]
MDL-28250 license: upgrade old versions of cc-nc

The url was incorectly defined in previous versions

Conflicts:
version.php
    lib/db/upgrade.php

8 years agoMDL-28250 license: Correct cc-nc url
Wojciech Galiszek [Sun, 7 Apr 2013 15:03:53 +0000 (17:03 +0200)]
MDL-28250 license: Correct cc-nc url

8 years agoMoodle release 2.3.7 v2.3.7
Eloy Lafuente (stronk7) [Mon, 13 May 2013 10:31:59 +0000 (12:31 +0200)]
Moodle release 2.3.7

8 years agoMerge branch 'MDL-39642-en_fix-23' of git://github.com/mudrd8mz/moodle into MOODLE_23...
Eloy Lafuente (stronk7) [Mon, 13 May 2013 09:53:25 +0000 (11:53 +0200)]
Merge branch 'MDL-39642-en_fix-23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

8 years agoMDL-39642 Merge English strings from the en_fix language pack
Helen Foster [Mon, 13 May 2013 09:34:34 +0000 (11:34 +0200)]
MDL-39642 Merge English strings from the en_fix language pack

8 years agoweekly release 2.3.6+
Eloy Lafuente (stronk7) [Fri, 10 May 2013 15:33:28 +0000 (17:33 +0200)]
weekly release 2.3.6+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Eloy Lafuente (stronk7) [Fri, 10 May 2013 15:18:12 +0000 (17:18 +0200)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-39518-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Fri, 10 May 2013 11:18:18 +0000 (13:18 +0200)]
Merge branch 'MDL-39518-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMDL-39518: Change hardcoded string MOOCH to Moodle.net
Damyon Wiese [Fri, 10 May 2013 06:26:10 +0000 (14:26 +0800)]
MDL-39518: Change hardcoded string MOOCH to Moodle.net

8 years agoMerge branch 'MDL-39488_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Sam Hemelryk [Fri, 10 May 2013 04:30:29 +0000 (16:30 +1200)]
Merge branch 'MDL-39488_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMDL-39488: Lesson Module: Fixed the potential variable overwritting for answers
Rossiani Wijaya [Fri, 10 May 2013 03:14:52 +0000 (11:14 +0800)]
MDL-39488: Lesson Module: Fixed the potential variable overwritting for answers

8 years agoMerge branch 'MDL-39535_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
Damyon Wiese [Fri, 10 May 2013 02:38:37 +0000 (10:38 +0800)]
Merge branch 'MDL-39535_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38885-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Fri, 10 May 2013 01:17:55 +0000 (03:17 +0200)]
Merge branch 'MDL-38885-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-29758_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Fri, 10 May 2013 00:54:33 +0000 (02:54 +0200)]
Merge branch 'MDL-29758_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

8 years agoMDL-38885 form: Fix comments and stricter unit test
Frederic Massart [Fri, 10 May 2013 00:34:59 +0000 (08:34 +0800)]
MDL-38885 form: Fix comments and stricter unit test

8 years agoMerge branch 'MDL-39488_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Thu, 9 May 2013 13:49:33 +0000 (15:49 +0200)]
Merge branch 'MDL-39488_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMDL-29758 make Cloze question feedback display more informative
Jean-Michel Vedrine [Mon, 22 Apr 2013 18:41:57 +0000 (20:41 +0200)]
MDL-29758 make Cloze question feedback display more informative
as it was in Moodle 1.9

8 years agoMDL-38885 form: Unit tests for data cleaning
Frederic Massart [Thu, 9 May 2013 04:20:15 +0000 (12:20 +0800)]
MDL-38885 form: Unit tests for data cleaning

8 years agoMDL-38885 form: Recursively clean parameters based on right type
Frederic Massart [Wed, 8 May 2013 07:50:33 +0000 (15:50 +0800)]
MDL-38885 form: Recursively clean parameters based on right type

8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 9 May 2013 00:37:31 +0000 (00:37 +0000)]
Automatically generated installer lang files

8 years agoMDL-37822 fix checkboxes that were always set to on by default
Jerome Mouneyrac [Tue, 19 Mar 2013 09:06:24 +0000 (17:06 +0800)]
MDL-37822 fix checkboxes that were always set to on by default

8 years agoMDL-37822 move the default code above the set_config to not make the code less confusing
Jerome Mouneyrac [Mon, 18 Mar 2013 08:51:51 +0000 (16:51 +0800)]
MDL-37822 move the default code above the set_config to not make the code less confusing

8 years agoMDL-37822 Moodle send site information to a hub even though it's unchecked
Jerome Mouneyrac [Thu, 7 Feb 2013 05:10:19 +0000 (13:10 +0800)]
MDL-37822 Moodle send site information to a hub even though it's unchecked

8 years agoMerge branch 'MDL-38487_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 8 May 2013 22:55:28 +0000 (00:55 +0200)]
Merge branch 'MDL-38487_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-31193-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
Damyon Wiese [Wed, 8 May 2013 07:28:24 +0000 (15:28 +0800)]
Merge branch 'MDL-31193-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

8 years agoMDL-37245 Blog: Bloglevel is used for checking if blog is enabled
Rajesh Taneja [Wed, 8 May 2013 05:29:59 +0000 (13:29 +0800)]
MDL-37245 Blog: Bloglevel is used for checking if blog is enabled

8 years agoMDL-39488 Lesson Module: Improve code performance
Rossiani Wijaya [Wed, 8 May 2013 03:52:31 +0000 (11:52 +0800)]
MDL-39488 Lesson Module: Improve code performance

8 years agoMDL-39488 Lesson Module: Fixed PHP error matching question,
Rossiani Wijaya [Wed, 8 May 2013 03:49:45 +0000 (11:49 +0800)]
MDL-39488 Lesson Module: Fixed PHP error matching question,
if one or more options have not been selected.

8 years agoMDL-39488 Lesson Module: Fix for "Match question throws PHP error if one or more...
Joseph Rézeau [Fri, 3 May 2013 09:00:43 +0000 (11:00 +0200)]
MDL-39488 Lesson Module: Fix for "Match question throws PHP error if one or more options have not been selected "

Signed-off-by: Joseph Rézeau <moodle@rezeau.org>
8 years agoMerge branch 'MDL-37552-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
Damyon Wiese [Wed, 8 May 2013 04:44:46 +0000 (12:44 +0800)]
Merge branch 'MDL-37552-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

8 years agoMDL-37475 core_grade:fixed the handling of show totals
Andrew Davis [Tue, 5 Mar 2013 04:00:59 +0000 (12:00 +0800)]
MDL-37475 core_grade:fixed the handling of show totals

8 years agoMDL-32301: Allow instructor custom parameters for LTI tools
Mark Nielsen [Tue, 12 Mar 2013 16:36:25 +0000 (09:36 -0700)]
MDL-32301: Allow instructor custom parameters for LTI tools

8 years agoMerge branch 'MDL-34275-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 7 May 2013 17:14:19 +0000 (19:14 +0200)]
Merge branch 'MDL-34275-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36223-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 7 May 2013 14:28:42 +0000 (15:28 +0100)]
Merge branch 'MDL-36223-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMDL-37245 Blog: Fixed comments.
Rajesh Taneja [Tue, 7 May 2013 09:13:44 +0000 (17:13 +0800)]
MDL-37245 Blog: Fixed comments.

Conflicts:

blog/lib.php

Signed-off-by: Rajesh Taneja <rajesh@moodle.com>
Conflicts:

blog/lib.php

8 years agoMDL-37245 Blog: Added permission check for blog comments
Rajesh Taneja [Tue, 7 May 2013 09:12:50 +0000 (17:12 +0800)]
MDL-37245 Blog: Added permission check for blog comments

Conflicts:

blog/index.php

Signed-off-by: Rajesh Taneja <rajesh@moodle.com>
8 years agoMerge branch 'MDL-38500-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 7 May 2013 10:54:32 +0000 (11:54 +0100)]
Merge branch 'MDL-38500-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMDL-37552 external_format_text: missing require_once filelib.php (shared credits...
Jerome Mouneyrac [Tue, 7 May 2013 06:55:55 +0000 (14:55 +0800)]
MDL-37552 external_format_text: missing require_once filelib.php (shared credits to Adam Fredericks for report and patch proposal)

8 years agoMDL-34275 - Use default copyright license when restoring files
Rex Lorenzo [Wed, 11 Jul 2012 22:15:09 +0000 (15:15 -0700)]
MDL-34275 - Use default copyright license when restoring files

8 years agoMerge branch 'MDL-31713_override_23' of git://github.com/andyjdavis/moodle into MOODL...
Damyon Wiese [Tue, 7 May 2013 07:31:41 +0000 (15:31 +0800)]
Merge branch 'MDL-31713_override_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoMDL-39535 grade: only display grade errors once
Mark Nelson [Tue, 7 May 2013 04:59:58 +0000 (12:59 +0800)]
MDL-39535 grade: only display grade errors once

8 years agoMDL-31713 core_grade: added updating of grade min and max to update_final_grade()
Andrew Davis [Sun, 21 Apr 2013 07:30:13 +0000 (15:30 +0800)]
MDL-31713 core_grade: added updating of grade min and max to update_final_grade()

8 years agoMDL-39169: Now the question's tags are added in backup/restore options
Maria Torres [Fri, 26 Apr 2013 00:12:01 +0000 (12:12 +1200)]
MDL-39169: Now the question's tags are added in backup/restore options

8 years agoMerge branch 'MDL-38315-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
Damyon Wiese [Mon, 6 May 2013 14:06:01 +0000 (22:06 +0800)]
Merge branch 'MDL-38315-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-39446_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 6 May 2013 13:48:23 +0000 (14:48 +0100)]
Merge branch 'MDL-39446_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-39491-workshop-media_23' of git://github.com/mudrd8mz/moodle into...
Dan Poltawski [Mon, 6 May 2013 12:12:23 +0000 (13:12 +0100)]
Merge branch 'MDL-39491-workshop-media_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

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

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

8 years agoAutomatically generated installer lang files
AMOS bot [Mon, 6 May 2013 00:40:38 +0000 (00:40 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'brokencalc_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Dan Poltawski [Sun, 5 May 2013 10:30:40 +0000 (11:30 +0100)]
Merge branch 'brokencalc_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoAutomatically generated installer lang files
AMOS bot [Sat, 4 May 2013 00:40:13 +0000 (00:40 +0000)]
Automatically generated installer lang files

8 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.

8 years agoMDL-31193 display the correct and translated token valid until date
Jerome Mouneyrac [Fri, 3 May 2013 06:09:34 +0000 (14:09 +0800)]
MDL-31193 display the correct and translated token valid until date

8 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.

8 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.

8 years agoMDL-38487 qtype match restore: problem with blank ids.
Tim Hunt [Fri, 15 Mar 2013 12:18:51 +0000 (12:18 +0000)]
MDL-38487 qtype match restore: problem with blank ids.

As it happens, this field is useless, and has been removed from the DB
in 2.5. Therefore, we only need a work-around for stable branches.

8 years agoweekly release 2.3.6+
Dan Poltawski [Thu, 2 May 2013 13:36:56 +0000 (14:36 +0100)]
weekly release 2.3.6+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Dan Poltawski [Thu, 2 May 2013 13:32:32 +0000 (14:32 +0100)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-30775-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
Damyon Wiese [Thu, 2 May 2013 08:22:48 +0000 (16:22 +0800)]
Merge branch 'MDL-30775-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

8 years agoMDL-36223 Assign: User outline report grade display
Damyon Wiese [Thu, 2 May 2013 07:41:43 +0000 (15:41 +0800)]
MDL-36223 Assign: User outline report grade display

Use str_long_grade for user outline report because it handles scales and
no grade.

Thanks to Jean-Daniel Descoteaux for suggesting this fix.

8 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

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

8 years agoMerge branch 'MDL-39444_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 1 May 2013 14:54:06 +0000 (16:54 +0200)]
Merge branch 'MDL-39444_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 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.

8 years agoMDL-38500 repository: Instance names must be unique
Frederic Massart [Wed, 1 May 2013 08:11:44 +0000 (16:11 +0800)]
MDL-38500 repository: Instance names must be unique

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

8 years agoMerge branch 'wip-MDL-39432-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
Eloy Lafuente (stronk7) [Tue, 30 Apr 2013 23:35:24 +0000 (01:35 +0200)]
Merge branch 'wip-MDL-39432-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-39422-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 30 Apr 2013 23:14:12 +0000 (11:14 +1200)]
Merge branch 'MDL-39422-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-MDL-39099_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 30 Apr 2013 23:04:33 +0000 (11:04 +1200)]
Merge branch 'wip-MDL-39099_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-39414-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 30 Apr 2013 23:01:54 +0000 (11:01 +1200)]
Merge branch 'MDL-39414-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

8 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

8 years agoMerge branch 'MDL-36060-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 30 Apr 2013 22:13:51 +0000 (10:13 +1200)]
Merge branch 'MDL-36060-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

8 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.

8 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.

8 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.

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

8 years agoMerge branch 'MDL-35385_chat_23' of git://github.com/andyjdavis/moodle into MOODLE_23...
Dan Poltawski [Tue, 30 Apr 2013 13:08:32 +0000 (14:08 +0100)]
Merge branch 'MDL-35385_chat_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 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.

8 years agoMerge branch 'MDL-39354_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Damyon Wiese [Tue, 30 Apr 2013 08:27:04 +0000 (16:27 +0800)]
Merge branch 'MDL-39354_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-30775 get_course_contents: remove warnings when the section is empty
Jerome Mouneyrac [Tue, 30 Apr 2013 06:13:53 +0000 (14:13 +0800)]
MDL-30775 get_course_contents: remove warnings when the section is empty

8 years agoMDL-31713 core_grade:added a unit test to replicate a raw grade max bug
Andrew Davis [Fri, 19 Apr 2013 13:25:18 +0000 (21:25 +0800)]
MDL-31713 core_grade:added a unit test to replicate a raw grade max bug

8 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

8 years agoAutomatically generated installer lang files
AMOS bot [Tue, 30 Apr 2013 00:43:52 +0000 (00:43 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'w17_MDL-39344_m23_lists' of git://github.com/skodak/moodle into MOODLE_...
Sam Hemelryk [Mon, 29 Apr 2013 22:11:46 +0000 (10:11 +1200)]
Merge branch 'w17_MDL-39344_m23_lists' of git://github.com/skodak/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-39303_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 29 Apr 2013 21:59:32 +0000 (09:59 +1200)]
Merge branch 'MDL-39303_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-39365-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Sam Hemelryk [Mon, 29 Apr 2013 21:36:25 +0000 (09:36 +1200)]
Merge branch 'MDL-39365-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

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

8 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.

8 years agoMerge branch 'MDL-39378_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 29 Apr 2013 16:01:12 +0000 (17:01 +0100)]
Merge branch 'MDL-39378_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-39378 Improve s() performance.
Tim Hunt [Fri, 26 Apr 2013 14:59:53 +0000 (15:59 +0100)]
MDL-39378 Improve s() performance.

These changes give about a 10% speed-up in this function. The significant changes are:
1. Simplify the if logic to remove unnecssary cases.
2. Dont pass default argument values to htmlspecialchars, just using the
   defaults is faster.
3. I can confirm that /i regex is faster than the equivalent regex without the i.

I also added more unit tests to test the edge cases.

8 years agoMDL-39378 s(): fix bad hex regex
Tim Hunt [Fri, 26 Apr 2013 17:38:29 +0000 (18:38 +0100)]
MDL-39378 s(): fix bad hex regex

8 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.

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

8 years agoMDL-27071 Add big IN() unit tests
Eloy Lafuente (stronk7) [Sun, 28 Apr 2013 23:11:10 +0000 (01:11 +0200)]
MDL-27071 Add big IN() unit tests

Let's verify how all databases perform with a big
number of parameters (10000) using IN() SQL clauses.
Both using QM and NAMED parameters.

Ideally only Oracle fails, and only it will need fixing.

8 years agoMDL-27071 Allow Oracle IN() to use > 1000 items
Eloy Lafuente (stronk7) [Sun, 28 Apr 2013 23:14:24 +0000 (01:14 +0200)]
MDL-27071 Allow Oracle IN() to use > 1000 items

By using a pivoting strategy, we modify the list
of params (QM and NAMED supported) into a
subquery, so the 1000 limit in Oracle (ORA-01795)
is not thrown anymore.

Conflicts:
lib/dml/oci_native_moodle_database.php

8 years agoMerge branch 'MDL-39342_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Damyon Wiese [Mon, 29 Apr 2013 07:36:30 +0000 (15:36 +0800)]
Merge branch 'MDL-39342_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-30940-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Damyon Wiese [Mon, 29 Apr 2013 06:04:26 +0000 (14:04 +0800)]
Merge branch 'MDL-30940-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMDL-39365 scorm reports: Return correct track count
Ankit Agarwal [Mon, 29 Apr 2013 05:21:43 +0000 (13:21 +0800)]
MDL-39365 scorm reports: Return correct track count