Dan Poltawski [Thu, 28 Mar 2013 03:44:32 +0000 (11:44 +0800)]
MDL-38731 course: split course group settings header
Allow translators to translate the heading differently.
AMOS BEGIN
CPY [groups,group],[groupsettingsheader,group]
AMOS END
Conflicts:
course/edit_form.php
Damyon Wiese [Thu, 30 May 2013 04:01:57 +0000 (12:01 +0800)]
weekly release 2.3.7+
Damyon Wiese [Thu, 30 May 2013 03:27:00 +0000 (11:27 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
AMOS bot [Thu, 30 May 2013 00:38:26 +0000 (00:38 +0000)]
Automatically generated installer lang files
AMOS bot [Wed, 29 May 2013 00:39:25 +0000 (00:39 +0000)]
Automatically generated installer lang files
Damyon Wiese [Tue, 28 May 2013 01:55:41 +0000 (09:55 +0800)]
Merge branch 'w22_MDL-39802_m23_deletedusers' of git://github.com/skodak/moodle into MOODLE_23_STABLE
AMOS bot [Tue, 28 May 2013 00:38:18 +0000 (00:38 +0000)]
Automatically generated installer lang files
Damyon Wiese [Mon, 27 May 2013 08:17:19 +0000 (16:17 +0800)]
Merge branch 'MDL-39640-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 27 May 2013 06:14:03 +0000 (14:14 +0800)]
Merge branch 'MDL-38239-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 27 May 2013 05:43:55 +0000 (13:43 +0800)]
Merge branch 'w22_MDL-39688_m23_etag' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Petr Škoda [Sat, 25 May 2013 20:16:45 +0000 (22:16 +0200)]
MDL-38408 validate PayPal dates and costs always
Petr Škoda [Sat, 25 May 2013 07:10:24 +0000 (09:10 +0200)]
MDL-39688 do not set Etag when sending http ranges
Petr Škoda [Fri, 24 May 2013 19:14:53 +0000 (21:14 +0200)]
MDL-39802 fix sloppy user deleting and creating in imsenterprise plugin
Petr Škoda [Fri, 24 May 2013 19:01:08 +0000 (21:01 +0200)]
MDL-39802 add cli script for fixing of all deleted users
Use this script if something just set the user.deleted flag instead of calling the delete_user() method.
Damyon Wiese [Fri, 24 May 2013 05:24:03 +0000 (13:24 +0800)]
weekly release 2.3.7+
Damyon Wiese [Fri, 24 May 2013 05:11:32 +0000 (13:11 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Thu, 23 May 2013 14:00:33 +0000 (16:00 +0200)]
Merge branch 'wip-MDL-39177-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Marina Glancy [Thu, 23 May 2013 09:15:47 +0000 (19:15 +1000)]
MDL-39177 make sure we don't remove existing directories when cleaning up unzip
AMOS bot [Wed, 22 May 2013 08:26:06 +0000 (08:26 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 22 May 2013 02:09:10 +0000 (04:09 +0200)]
MDL-36482 Fix slipped error, thanks Petr!
Eloy Lafuente (stronk7) [Wed, 22 May 2013 00:13:27 +0000 (02:13 +0200)]
Merge branch 'wip-MDL-39177-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Gilles-Philippe Leblanc [Thu, 9 May 2013 15:42:20 +0000 (11:42 -0400)]
MDL-38239 gradebook: Importing grades from a .txt file with commas for decimals causes an error
Marina Glancy [Mon, 20 May 2013 04:09:11 +0000 (14:09 +1000)]
MDL-39177 Updating userid when file is overwritten
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.
AMOS bot [Sat, 18 May 2013 00:41:38 +0000 (00:41 +0000)]
Automatically generated installer lang files
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
AMOS bot [Wed, 15 May 2013 00:39:26 +0000 (00:39 +0000)]
Automatically generated installer lang files
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
Marina Glancy [Tue, 14 May 2013 03:21:02 +0000 (13:21 +1000)]
MDL-39177 More comments about confusing files.source field
Marina Glancy [Mon, 13 May 2013 10:15:32 +0000 (20:15 +1000)]
MDL-39177 Ensure files are overwritten correctly on unzip
Marina Glancy [Mon, 13 May 2013 05:48:01 +0000 (15:48 +1000)]
MDL-39177 Perform all checks on draftfile area before saving the files
Marina Glancy [Mon, 13 May 2013 05:31:15 +0000 (15:31 +1000)]
MDL-39177 Remove code duplication
Marina Glancy [Mon, 13 May 2013 05:12:20 +0000 (15:12 +1000)]
MDL-39177 Update file in filearea only if original is present
Now when file was deleted in filemanager and new file with the same file was uploaded the references will be converted to copies exactly like UI warns in filemanager.
Also do not delete original information from draftfiles.
Marina Glancy [Wed, 8 May 2013 12:22:53 +0000 (22:22 +1000)]
MDL-39177 Discard file origin when moving/renaming a file in filemanager
Created one function that handles file update to be used from both JS and nonJS filepicker
Marina Glancy [Wed, 8 May 2013 04:37:29 +0000 (14:37 +1000)]
MDL-39177 Original info is not preserved when overwriting a file in filemanager
original file location is used by filemanager to indicate that file is a source of reference and file the list of referencing files
Marina Glancy [Wed, 8 May 2013 02:48:54 +0000 (12:48 +1000)]
MDL-39177 File reference is not updated when overwriting the file
Marina Glancy [Tue, 7 May 2013 05:16:48 +0000 (15:16 +1000)]
MDL-33719 When overwriting a file the filemanager is not refreshed
AMOS bot [Tue, 14 May 2013 00:37:47 +0000 (00:37 +0000)]
Automatically generated installer lang files
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
Frederic Massart [Mon, 13 May 2013 09:27:42 +0000 (17:27 +0800)]
MDL-39640 repository: Prevent notice when editing an instance
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