moodle.git
8 years agoMerge branch 'MDL-37749_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 19 Feb 2013 04:26:03 +0000 (12:26 +0800)]
Merge branch 'MDL-37749_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38051_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 19 Feb 2013 03:23:56 +0000 (11:23 +0800)]
Merge branch 'MDL-38051_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37934_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 19 Feb 2013 02:56:47 +0000 (10:56 +0800)]
Merge branch 'MDL-37934_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38039_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 18 Feb 2013 08:00:07 +0000 (16:00 +0800)]
Merge branch 'MDL-38039_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37396_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 18 Feb 2013 06:27:51 +0000 (14:27 +0800)]
Merge branch 'MDL-37396_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36380-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 18 Feb 2013 06:18:46 +0000 (14:18 +0800)]
Merge branch 'MDL-36380-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable...
Rossiani Wijaya [Mon, 18 Feb 2013 05:41:13 +0000 (13:41 +0800)]
MDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable in quickenrolment.js

8 years agoMerge branch 'MDL-37939-m23' of https://github.com/andrewnicols/moodle into MOODLE_23...
Damyon Wiese [Mon, 18 Feb 2013 05:31:40 +0000 (13:31 +0800)]
Merge branch 'MDL-37939-m23' of https://github.com/andrewnicols/moodle into MOODLE_23_STABLE

Conflicts:
lib/db/upgrade.php

8 years agoMerge branch 'MDL-35336_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 18 Feb 2013 04:24:23 +0000 (12:24 +0800)]
Merge branch 'MDL-35336_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMDL-35622 files: Add support for SMART Notebook MIME types
Frederic Massart [Sat, 29 Sep 2012 06:33:49 +0000 (08:33 +0200)]
MDL-35622 files: Add support for SMART Notebook MIME types

- The MIME type for Notebook files is: application/x-smarttech-notebook
- The MIME type for Gallery files is also: application/x-smarttech-notebook
Refs: http://exchange-forum.smarttech.com/forums/p/5152/11945.aspx#11945

Original author: Matteo Scaramuccia <moodle@matteoscaramuccia.com>
Fixed by: Paul Holden <pholden@greenhead.ac.uk>

Conflicts:

lib/db/upgrade.php
version.php

8 years agoMerge branch 'MDL-34800_ajax_submit_23' of git://github.com/andyjdavis/moodle into...
Dan Poltawski [Mon, 18 Feb 2013 03:07:48 +0000 (11:07 +0800)]
Merge branch 'MDL-34800_ajax_submit_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoMDL-37396 User Enrollment: fixed missing user from enrolment sub-menu
Rossiani Wijaya [Tue, 12 Feb 2013 09:12:03 +0000 (17:12 +0800)]
MDL-37396 User Enrollment: fixed missing user from enrolment sub-menu

8 years agoMDL-35336 report (course overview): check the setting for enablestats before printing...
Rossiani Wijaya [Wed, 13 Feb 2013 03:04:45 +0000 (11:04 +0800)]
MDL-35336 report (course overview): check the setting for enablestats before printing out the node for setting > site admin > reports

8 years agoMDL-35336 Report (course overview): fixed redirect url to enable statistics setting...
Rossiani Wijaya [Mon, 11 Feb 2013 05:15:58 +0000 (13:15 +0800)]
MDL-35336 Report (course overview): fixed redirect url to enable statistics setting page when statistics is disable

8 years agoMDL-38051 Annihilate all the CRLFs present in some questions/fixtures...
Jean-Michel Vedrine [Fri, 15 Feb 2013 17:26:38 +0000 (18:26 +0100)]
MDL-38051 Annihilate all the CRLFs present in some questions/fixtures...

8 years agoMDL-37939 Course: Add unit test to ensure module moves are correct
Andrew Robert Nicols [Tue, 12 Feb 2013 11:04:20 +0000 (11:04 +0000)]
MDL-37939 Course: Add unit test to ensure module moves are correct

8 years agoMDL-37939 Course: Correct broken sequence data
Andrew Robert Nicols [Tue, 12 Feb 2013 00:20:12 +0000 (00:20 +0000)]
MDL-37939 Course: Correct broken sequence data

8 years agoMDL-37939 Course: Ensure that the cm->section is set when moving modules
Andrew Robert Nicols [Tue, 12 Feb 2013 00:18:59 +0000 (00:18 +0000)]
MDL-37939 Course: Ensure that the cm->section is set when moving modules

8 years agoMDL-36380 stats: No more duplicated entries when viewing monthly stats
Frederic Massart [Thu, 7 Feb 2013 03:11:05 +0000 (11:11 +0800)]
MDL-36380 stats: No more duplicated entries when viewing monthly stats

8 years agoMDL-38040 Clean core from CRLFs
Eloy Lafuente (stronk7) [Fri, 15 Feb 2013 01:25:36 +0000 (02:25 +0100)]
MDL-38040 Clean core from CRLFs

8 years agoMDL-38039 theme_base: Corrected typo fickering to flickering in CSS comment which...
Mary Evans [Fri, 15 Feb 2013 01:13:03 +0000 (01:13 +0000)]
MDL-38039 theme_base: Corrected typo fickering to flickering in CSS comment which blocked IPCOP browser firewall in IE.

8 years agoMDL-37934 Blackboard_six question import fails in some cases
Jean-Michel Vedrine [Mon, 11 Feb 2013 13:51:21 +0000 (14:51 +0100)]
MDL-37934 Blackboard_six question import fails in some cases
Import fails if the same image is used several times
in the same field of the same question.

8 years agoweekly release 2.3.4+
Damyon Wiese [Thu, 14 Feb 2013 06:05:42 +0000 (14:05 +0800)]
weekly release 2.3.4+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Damyon Wiese [Thu, 14 Feb 2013 06:04:18 +0000 (14:04 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 14 Feb 2013 00:49:58 +0000 (00:49 +0000)]
Automatically generated installer lang files

8 years agoMDL-37749 theme_mymobile: Removed redundant JS and CSS code for Collapsed Topic contr...
Mary Evans [Tue, 12 Feb 2013 17:25:53 +0000 (17:25 +0000)]
MDL-37749 theme_mymobile: Removed redundant JS and CSS code for Collapsed Topic contributed  plugin.

8 years agoMDL-37893 Take rid of old comment.
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 09:03:29 +0000 (10:03 +0100)]
MDL-37893 Take rid of old comment.

8 years agoMerge branch 'MDL-37893-grouped-empty_23' of git://github.com/mudrd8mz/moodle into...
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 09:04:40 +0000 (10:04 +0100)]
Merge branch 'MDL-37893-grouped-empty_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-mdl-37633-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Dan Poltawski [Tue, 12 Feb 2013 07:50:10 +0000 (15:50 +0800)]
Merge branch 'wip-mdl-37633-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability...
Rajesh Taneja [Thu, 31 Jan 2013 06:01:41 +0000 (14:01 +0800)]
MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default

Conflicts:

mod/forum/db/upgrade.php
mod/forum/version.php

8 years agoMDL-34800 core_grade:switched from hiding the submit button to disabling it if ajax...
Andrew Davis [Fri, 8 Feb 2013 02:15:17 +0000 (10:15 +0800)]
MDL-34800 core_grade:switched from hiding the submit button to disabling it if ajax is enabled

8 years agoMerge branch 'MDL-32076_unlimited2_23' of git://github.com/andyjdavis/moodle into...
Dan Poltawski [Tue, 12 Feb 2013 06:42:43 +0000 (14:42 +0800)]
Merge branch 'MDL-32076_unlimited2_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37074-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 12 Feb 2013 05:40:04 +0000 (13:40 +0800)]
Merge branch 'MDL-37074-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37924_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 12 Feb 2013 05:36:15 +0000 (13:36 +0800)]
Merge branch 'MDL-37924_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37964_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 12 Feb 2013 04:27:02 +0000 (12:27 +0800)]
Merge branch 'MDL-37964_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-MDL-34798_M23-2' of git://github.com/gjb2048/moodle into MOODLE_23_...
Dan Poltawski [Tue, 12 Feb 2013 02:34:23 +0000 (10:34 +0800)]
Merge branch 'wip-MDL-34798_M23-2' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37952_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 12 Feb 2013 01:46:28 +0000 (09:46 +0800)]
Merge branch 'MDL-37952_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37943_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 00:21:12 +0000 (01:21 +0100)]
Merge branch 'MDL-37943_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37896_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 00:14:43 +0000 (01:14 +0100)]
Merge branch 'MDL-37896_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-37919 Let PHPUnit display the content of $a even if the error string is not found
David Mudrák [Fri, 8 Feb 2013 00:25:31 +0000 (01:25 +0100)]
MDL-37919 Let PHPUnit display the content of $a even if the error string is not found

8 years agoMerge branch 'MDL-35037-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 00:00:16 +0000 (01:00 +0100)]
Merge branch 'MDL-35037-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

8 years agoMDL-37961 webservice: PARAM_BOOL with PARAM_DEFAULT accepts boolean default
Frederic Massart [Mon, 11 Feb 2013 06:37:19 +0000 (14:37 +0800)]
MDL-37961 webservice: PARAM_BOOL with PARAM_DEFAULT accepts boolean default

8 years agoMDL_34798 format_topics and format_weeks: Adjust section names when moving up.
Gareth J Barnard [Mon, 11 Feb 2013 13:56:54 +0000 (13:56 +0000)]
MDL_34798 format_topics and format_weeks: Adjust section names when moving up.

8 years agoMDL-37964 very basic support for enrolments in data generator
Petr Škoda [Mon, 19 Nov 2012 22:15:29 +0000 (23:15 +0100)]
MDL-37964 very basic support for enrolments in data generator

8 years agoMerge branch 'MDL-37039-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 11 Feb 2013 06:33:36 +0000 (14:33 +0800)]
Merge branch 'MDL-37039-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37797_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 11 Feb 2013 05:58:56 +0000 (13:58 +0800)]
Merge branch 'MDL-37797_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMDL-37774 Do not pass trailing slash if the method does not want it
David Mudrák [Fri, 8 Feb 2013 11:05:44 +0000 (12:05 +0100)]
MDL-37774 Do not pass trailing slash if the method does not want it

8 years agoMDL-37774 Make moodle1_file_manager::migrate_directory() support trailing slash in...
David Mudrák [Fri, 8 Feb 2013 10:45:24 +0000 (11:45 +0100)]
MDL-37774 Make moodle1_file_manager::migrate_directory() support trailing slash in rootpath

As the $rootpath is concatenated with the $relpath, we would end with a
path like course_files//file.txt. Such a path is detected as not-valid
later and an error would be thrown.

So the patch makes sure that the trailing slash is cut off.

8 years agoMDL-37774 Add unit test to illustrate the problem with the trailing slash
David Mudrák [Fri, 8 Feb 2013 10:41:38 +0000 (11:41 +0100)]
MDL-37774 Add unit test to illustrate the problem with the trailing slash

The patch introduces two new tests for moodle1_file_manager::migrate_directory().
The second test with the trailing slash reveals the trouble here.
The expected behaviour is that the method would deal with the trailing
slash. Debugging message for the developer should be displayed though.

8 years agoAutomatically generated installer lang files
AMOS bot [Sun, 10 Feb 2013 00:41:41 +0000 (00:41 +0000)]
Automatically generated installer lang files

8 years agoMDL-37952 make helper descendants abstract
Eloy Lafuente (stronk7) [Sat, 9 Feb 2013 15:19:15 +0000 (16:19 +0100)]
MDL-37952 make helper descendants abstract

8 years agoMDL-37924 quiz settings: change wrong 'fix' => 'adv'.
Tim Hunt [Thu, 7 Feb 2013 17:46:55 +0000 (17:46 +0000)]
MDL-37924 quiz settings: change wrong 'fix' => 'adv'.

8 years agoMDL-37896 qtype_essay: correct PARAM_CLEANHTML -> PARAM_RAW.
Tim Hunt [Wed, 6 Feb 2013 17:45:58 +0000 (17:45 +0000)]
MDL-37896 qtype_essay: correct PARAM_CLEANHTML -> PARAM_RAW.

It turns out that you should almost never use PARAM_CLEANHTML.

8 years agoMDL-37943 upgrade: logic error in upgrade_plugins_blocks.
Tim Hunt [Fri, 8 Feb 2013 12:40:49 +0000 (12:40 +0000)]
MDL-37943 upgrade: logic error in upgrade_plugins_blocks.

Derek Woolhead tracked down the problem and what needed to be fixed. I
just made the patch.

The problem was that if $plugin->cron had changed in version.php, then
the version number in the database could end up wrong after the upgrade,
and so the upgrade would immediately run a second time.

8 years agoMDL-37039 Assignment - Do not apply filters to grading table for offline assignments
Damyon Wiese [Fri, 8 Feb 2013 07:44:18 +0000 (15:44 +0800)]
MDL-37039 Assignment - Do not apply filters to grading table for offline assignments

Because the filters do not make sense for offline assignments, they are hidden. But if the active filter
prevents you from seeing any assignments you cannot change it. This change makes it so the filters are
also not applied when the assignment is an offline assignment.

8 years agoMDL-37074 Assign theming: Use addClass/removeClass instead of setAttribute to preserv...
Damyon Wiese [Fri, 8 Feb 2013 07:16:47 +0000 (15:16 +0800)]
MDL-37074 Assign theming: Use addClass/removeClass instead of setAttribute to preserve existing classes

8 years agoweekly release 2.3.4+
Damyon Wiese [Fri, 8 Feb 2013 03:22:42 +0000 (11:22 +0800)]
weekly release 2.3.4+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Damyon Wiese [Fri, 8 Feb 2013 02:59:37 +0000 (10:59 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoMDL-37893 Always notify pending starts before dispatching chunk
Eloy Lafuente (stronk7) [Thu, 7 Feb 2013 19:52:28 +0000 (20:52 +0100)]
MDL-37893 Always notify pending starts before dispatching chunk

8 years agoMDL-37893 Allow elements with no final tags to form a grouped path
David Mudrák [Wed, 6 Feb 2013 16:37:07 +0000 (17:37 +0100)]
MDL-37893 Allow elements with no final tags to form a grouped path

8 years agoMDL-37893 Add unit test to demonstrate the issue
David Mudrák [Wed, 6 Feb 2013 16:36:30 +0000 (17:36 +0100)]
MDL-37893 Add unit test to demonstrate the issue

8 years agoAutomatically generated installer lang files
AMOS bot [Fri, 8 Feb 2013 00:45:18 +0000 (00:45 +0000)]
Automatically generated installer lang files

8 years agoMDL-35037 tags: dont display blog entries when blogging disabled
Dan Poltawski [Thu, 7 Feb 2013 04:34:07 +0000 (12:34 +0800)]
MDL-35037 tags: dont display blog entries when blogging disabled

8 years agoMDL-37566 AJAX Fix issues with minimum height and centring
Andrew Robert Nicols [Wed, 6 Feb 2013 10:51:40 +0000 (10:51 +0000)]
MDL-37566 AJAX Fix issues with minimum height and centring

Conflicts:
lib/yui/chooserdialogue/chooserdialogue.js

8 years agoMDL-32076 core_grade: fixed handling of unlimited grades
Andrew Davis [Wed, 6 Feb 2013 07:57:48 +0000 (15:57 +0800)]
MDL-32076 core_grade: fixed handling of unlimited grades

8 years agoMDL-30144 Assignmnet 2.2: fixed context retrival
Rajesh Taneja [Wed, 6 Feb 2013 04:36:25 +0000 (12:36 +0800)]
MDL-30144 Assignmnet 2.2: fixed context retrival

8 years agoMerge branch 'MDL-37854_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 5 Feb 2013 10:24:11 +0000 (11:24 +0100)]
Merge branch 'MDL-37854_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMDL-37854 phpunit: replaced occurrence of non-existent function assertFail
Mark Nelson [Tue, 5 Feb 2013 03:57:03 +0000 (11:57 +0800)]
MDL-37854 phpunit: replaced occurrence of non-existent function assertFail

8 years agoMDL-37870 Fix the number of parameters when calling the parent constructor
David Mudrák [Tue, 5 Feb 2013 03:47:41 +0000 (04:47 +0100)]
MDL-37870 Fix the number of parameters when calling the parent constructor

8 years agoMDL-37797 HTML block: add contextid to block_positions query and make it more unique.
Howard Miller [Tue, 5 Feb 2013 08:15:43 +0000 (16:15 +0800)]
MDL-37797 HTML block: add contextid to block_positions query and make it more unique.

8 years agoMDL-36206 Unit tests - Cleanup whitespace issues from previous patch
Damyon Wiese [Tue, 5 Feb 2013 06:05:03 +0000 (14:05 +0800)]
MDL-36206 Unit tests - Cleanup whitespace issues from previous patch

8 years agoMDL-36206 - Unit Test - Create unit test for pagination bar
Jason Fowler [Mon, 26 Nov 2012 02:07:31 +0000 (10:07 +0800)]
MDL-36206 - Unit Test - Create unit test for pagination bar

8 years agoMerge branch 'MDL-37800_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 5 Feb 2013 04:43:24 +0000 (12:43 +0800)]
Merge branch 'MDL-37800_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

8 years agoMDL-37357 - fix trailing whitespace
Dan Poltawski [Tue, 5 Feb 2013 01:57:00 +0000 (09:57 +0800)]
MDL-37357 - fix trailing whitespace

8 years agoMerge branch 'MDL-37357_hidden_rank_23' of git://github.com/andyjdavis/moodle into...
Dan Poltawski [Tue, 5 Feb 2013 01:58:41 +0000 (09:58 +0800)]
Merge branch 'MDL-37357_hidden_rank_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoMDL-37574 - Fix navigation tests: remove title
Dan Poltawski [Tue, 5 Feb 2013 00:35:32 +0000 (08:35 +0800)]
MDL-37574 - Fix navigation tests: remove title

We are no longer setting it, to improve accessibility

8 years agoMerge branch 'MDL-37566-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Eloy Lafuente (stronk7) [Tue, 5 Feb 2013 00:14:27 +0000 (01:14 +0100)]
Merge branch 'MDL-37566-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

8 years agoMDL-37801 mod_glossary - encode / decode links to 'showentry' pages during backup...
Davo Smith [Thu, 31 Jan 2013 12:52:26 +0000 (12:52 +0000)]
MDL-37801 mod_glossary - encode / decode links to 'showentry' pages during backup & restore

8 years agoMerge branch 'MDL-37775_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 23:57:40 +0000 (00:57 +0100)]
Merge branch 'MDL-37775_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37785_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 23:36:24 +0000 (00:36 +0100)]
Merge branch 'MDL-37785_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37523_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 23:28:41 +0000 (00:28 +0100)]
Merge branch 'MDL-37523_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37847_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 21:56:24 +0000 (22:56 +0100)]
Merge branch 'MDL-37847_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-37847 plain text essays were screwing up HTML special chars.
Tim Hunt [Mon, 4 Feb 2013 12:54:10 +0000 (12:54 +0000)]
MDL-37847 plain text essays were screwing up HTML special chars.

This was incorrect use of PARAM_CLEANHTML for these inputs.

This fix also adds some unit tests to try to verify that this does not
break again in future.

8 years agoMDL-37523 theme_mymobile: Removed a renderer from mymobile/renderers.php and added...
Mary Evans [Sun, 3 Feb 2013 23:35:05 +0000 (23:35 +0000)]
MDL-37523 theme_mymobile: Removed a renderer from mymobile/renderers.php and added it to theme/mymobile/renderers/mod_choice_renderer.php. Then added a conditional statement to theme/mymobile/renderers.php in order to call mymobile/renderers/mod_choice_renderer.php.

8 years agoMerge branch 'MDL-37781-workshop-schedule_23' of git://github.com/mudrd8mz/moodle...
Damyon Wiese [Mon, 4 Feb 2013 08:19:51 +0000 (16:19 +0800)]
Merge branch 'MDL-37781-workshop-schedule_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37574-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Dan Poltawski [Mon, 4 Feb 2013 08:14:22 +0000 (16:14 +0800)]
Merge branch 'MDL-37574-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

8 years agoRevert "MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some...
Dan Poltawski [Mon, 4 Feb 2013 07:13:00 +0000 (15:13 +0800)]
Revert "MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests"

This reverts commit f5eaec86468229cc305723bf5f352284e03c3a0a.

8 years agoMerge branch 'MDL-32076_unlimited2_23' of git://github.com/andyjdavis/moodle into...
Dan Poltawski [Mon, 4 Feb 2013 06:31:01 +0000 (14:31 +0800)]
Merge branch 'MDL-32076_unlimited2_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoMDL-30144 Assignment 2.2: Download all as zip should only contain submission from...
Michael Hughes [Fri, 1 Feb 2013 06:49:55 +0000 (14:49 +0800)]
MDL-30144 Assignment 2.2: Download all as zip should only contain submission from active enroled users

8 years agoMerge branch 'MDL-37646-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 4 Feb 2013 05:49:42 +0000 (13:49 +0800)]
Merge branch 'MDL-37646-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37635-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 4 Feb 2013 03:57:25 +0000 (11:57 +0800)]
Merge branch 'MDL-37635-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37746_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 4 Feb 2013 02:17:56 +0000 (10:17 +0800)]
Merge branch 'MDL-37746_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-25853-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 4 Feb 2013 02:14:07 +0000 (10:14 +0800)]
Merge branch 'MDL-25853-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMDL-37574 Remove default link title from navigation items
Andrew Robert Nicols [Mon, 28 Jan 2013 23:30:45 +0000 (23:30 +0000)]
MDL-37574 Remove default link title from navigation items

8 years agoMDL-37566 AJAX Only set max-height for chooser dialogues
Andrew Robert Nicols [Mon, 28 Jan 2013 23:52:48 +0000 (23:52 +0000)]
MDL-37566 AJAX Only set max-height for chooser dialogues

If we set height as well as max-height then there is a potential for
whitespace to be shown at the bottom of the list of choices.

This commit stops removing the height option so that we only rely upon
max-height for dialogue heigh calculation.

8 years agoMDL-37800 mod_feedback - item "information" does not appear correctly
Andreas Grabs [Thu, 31 Jan 2013 23:25:31 +0000 (00:25 +0100)]
MDL-37800 mod_feedback - item "information" does not appear correctly

8 years agoMDL-37635 Assign: Prevent errors when viewing a feedback when there is no grade_item...
Damyon Wiese [Fri, 1 Feb 2013 05:44:46 +0000 (13:44 +0800)]
MDL-37635 Assign: Prevent errors when viewing a feedback when there is no grade_item in the gradebook

8 years agoMDL-37357 core_grade: fixed the showing and hiding of rank on the overview report
Andrew Davis [Thu, 10 Jan 2013 07:58:16 +0000 (15:58 +0800)]
MDL-37357 core_grade: fixed the showing and hiding of rank on the overview report

8 years agoMDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit...
Andrew Davis [Sat, 26 Jan 2013 01:39:48 +0000 (09:39 +0800)]
MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests

8 years agoMDL-37746 qtype_shortanser: avoid normalizer_normalize dangers.
Tim Hunt [Tue, 29 Jan 2013 10:05:28 +0000 (10:05 +0000)]
MDL-37746 qtype_shortanser: avoid normalizer_normalize dangers.

When an error occurs, normalizer_normalize just silently returns null,
which is dangerous. Here, we wrap it in a safe helper function.