Eloy Lafuente (stronk7) [Tue, 21 May 2013 00:28:34 +0000 (02:28 +0200)]
Merge branch 'MDL-36482_23' of https://github.com/mr-russ/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 20 May 2013 22:55:42 +0000 (00:55 +0200)]
Merge branch 'MDL-26120_23' of https://github.com/jacks92/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 20 May 2013 17:05:59 +0000 (19:05 +0200)]
Merge branch 'MDL-31209-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
Petr Škoda [Wed, 15 May 2013 19:37:25 +0000 (21:37 +0200)]
MDL-39374 log only real folder edits
Credit goes to Florian Zillner, thanks.
Dan Poltawski [Mon, 20 May 2013 08:39:12 +0000 (16:39 +0800)]
Merge branch 'MDL-35859_idnumber_23' of https://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 20 May 2013 07:49:09 +0000 (15:49 +0800)]
Merge branch 'MDL-27748_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 20 May 2013 07:29:21 +0000 (15:29 +0800)]
Merge branch 'MDL-39728_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Troy Lee [Thu, 9 May 2013 02:13:46 +0000 (10:13 +0800)]
MDL-36020 overview/report: fix quiz regrade session lock
Damyon Wiese [Mon, 20 May 2013 04:17:19 +0000 (12:17 +0800)]
Merge branch 'MDL-39363-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
Kordan [Thu, 9 May 2013 12:05:08 +0000 (14:05 +0200)]
MDL-39198 theme_formal_white: resized and relocated the "Add..." drop down menu of the "Add a block" pseudo block
Dan Poltawski [Mon, 20 May 2013 02:26:14 +0000 (10:26 +0800)]
Merge branch 'MDL-38369-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Tim Hunt [Sun, 19 May 2013 22:39:23 +0000 (23:39 +0100)]
MDL-27748 question: grade options should be localised.
question_bank::fraction_options should use format_float to display
decimal pionts correctly.
Tim Hunt [Sat, 18 May 2013 08:16:05 +0000 (09:16 +0100)]
MDL-39728 List all the classes in question/type/questionbase.php
This should make it easier for people to understand the type hierarchy.
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
Petr Škoda [Wed, 15 May 2013 20:03:50 +0000 (22:03 +0200)]
MDL-39678 fix YUI
20130515 vulnerability
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
Wojciech Galiszek [Sun, 7 Apr 2013 15:03:53 +0000 (17:03 +0200)]
MDL-28250 license: Correct cc-nc url
Jerome Mouneyrac [Tue, 14 May 2013 07:40:16 +0000 (15:40 +0800)]
MDL-31209 web service error message: Indication about the service not containg the web service function is confusing
Eloy Lafuente (stronk7) [Mon, 13 May 2013 10:31:59 +0000 (12:31 +0200)]
Moodle release 2.3.7
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
Helen Foster [Mon, 13 May 2013 09:34:34 +0000 (11:34 +0200)]
MDL-39642 Merge English strings from the en_fix language pack
Ankit Agarwal [Mon, 29 Apr 2013 08:53:15 +0000 (16:53 +0800)]
MDL-39363 scorm: Accept 0 as a valid score
Andrew Davis [Fri, 26 Apr 2013 02:37:52 +0000 (10:37 +0800)]
MDL-35859 core_grade:fixed an optional parameter call to use the array version
Eloy Lafuente (stronk7) [Fri, 10 May 2013 15:33:28 +0000 (17:33 +0200)]
weekly release 2.3.6+
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
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
Damyon Wiese [Fri, 10 May 2013 06:26:10 +0000 (14:26 +0800)]
MDL-39518: Change hardcoded string MOOCH to Moodle.net
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
Rossiani Wijaya [Fri, 10 May 2013 03:14:52 +0000 (11:14 +0800)]
MDL-39488: Lesson Module: Fixed the potential variable overwritting for answers
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
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
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
Frederic Massart [Fri, 10 May 2013 00:34:59 +0000 (08:34 +0800)]
MDL-38885 form: Fix comments and stricter unit test
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
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
Frederic Massart [Thu, 9 May 2013 04:20:15 +0000 (12:20 +0800)]
MDL-38885 form: Unit tests for data cleaning
Frederic Massart [Wed, 8 May 2013 07:50:33 +0000 (15:50 +0800)]
MDL-38885 form: Recursively clean parameters based on right type
AMOS bot [Thu, 9 May 2013 00:37:31 +0000 (00:37 +0000)]
Automatically generated installer lang files
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
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
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
Russell Smith [Thu, 2 May 2013 00:39:26 +0000 (10:39 +1000)]
MDL-36482 activities block: Allow mod display without intro's
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
Jayesh Anandani [Wed, 8 May 2013 19:22:41 +0000 (00:52 +0530)]
MDL-26120_23 mod_forum: use correct object
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
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
Rossiani Wijaya [Wed, 8 May 2013 03:52:31 +0000 (11:52 +0800)]
MDL-39488 Lesson Module: Improve code performance
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.
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>
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
Andrew Davis [Tue, 5 Mar 2013 04:00:59 +0000 (12:00 +0800)]
MDL-37475 core_grade:fixed the handling of show totals
Mark Nielsen [Tue, 12 Mar 2013 16:36:25 +0000 (09:36 -0700)]
MDL-32301: Allow instructor custom parameters for LTI tools
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
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
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
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>
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
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)
Rex Lorenzo [Wed, 11 Jul 2012 22:15:09 +0000 (15:15 -0700)]
MDL-34275 - Use default copyright license when restoring files
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
Mark Nelson [Tue, 7 May 2013 04:59:58 +0000 (12:59 +0800)]
MDL-39535 grade: only display grade errors once
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()
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
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
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
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
Damyon Wiese [Wed, 13 Mar 2013 03:13:42 +0000 (11:13 +0800)]
MDL-38443 Assignment: Missing permissions check on downloadall submissions
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
AMOS bot [Mon, 6 May 2013 00:40:38 +0000 (00:40 +0000)]
Automatically generated installer lang files
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
AMOS bot [Sat, 4 May 2013 00:40:13 +0000 (00:40 +0000)]
Automatically generated installer lang files
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.
Jerome Mouneyrac [Fri, 3 May 2013 06:09:34 +0000 (14:09 +0800)]
MDL-31193 display the correct and translated token valid until date
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.
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.
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.
Dan Poltawski [Thu, 2 May 2013 13:36:56 +0000 (14:36 +0100)]
weekly release 2.3.6+
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
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
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.
Frederic Massart [Thu, 2 May 2013 04:02:17 +0000 (12:02 +0800)]
MDL-38369 repository: Remove output before redirect
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
AMOS bot [Thu, 2 May 2013 00:38:16 +0000 (00:38 +0000)]
Automatically generated installer lang files
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
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.
Frederic Massart [Wed, 1 May 2013 08:11:44 +0000 (16:11 +0800)]
MDL-38500 repository: Instance names must be unique
AMOS bot [Wed, 1 May 2013 00:39:27 +0000 (00:39 +0000)]
Automatically generated installer lang files
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
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
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
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
Sam Hemelryk [Tue, 30 Apr 2013 22:40:54 +0000 (10:40 +1200)]
MDL-39432 course: converted closures to lambda functions
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
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.
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.
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.
Gareth J Barnard [Fri, 12 Apr 2013 17:52:16 +0000 (18:52 +0100)]
MDL-39099 course_format: Allow section_summary() to be overridden.
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
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.
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