moodle.git
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-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-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.

8 years agoweekly release 2.3.4+
Eloy Lafuente (stronk7) [Thu, 31 Jan 2013 10:01:47 +0000 (11:01 +0100)]
weekly release 2.3.4+

8 years agoMerge branch 'm23_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
Dan Poltawski [Thu, 31 Jan 2013 02:15:00 +0000 (10:15 +0800)]
Merge branch 'm23_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

8 years agoMDL-34231 SCORM: use correct calculation of attemptsleft
Dan Marsden [Wed, 30 Jan 2013 22:12:43 +0000 (11:12 +1300)]
MDL-34231 SCORM: use correct calculation of attemptsleft

8 years agoMerge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle...
Sam Hemelryk [Wed, 30 Jan 2013 19:45:32 +0000 (08:45 +1300)]
Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoMDL-13805 core_message: fixed some problems caused by a hasty backport
Andrew Davis [Wed, 30 Jan 2013 10:17:57 +0000 (18:17 +0800)]
MDL-13805 core_message: fixed some problems caused by a hasty backport

8 years agoMDL-25853 calendar: Fixed broken previous/next links
Frederic Massart [Wed, 30 Jan 2013 00:59:11 +0000 (08:59 +0800)]
MDL-25853 calendar: Fixed broken previous/next links

8 years agoMerge branch 'w04_MDL-37734_m23_marshack' of git://github.com/skodak/moodle into...
Eloy Lafuente (stronk7) [Wed, 30 Jan 2013 00:23:44 +0000 (01:23 +0100)]
Merge branch 'w04_MDL-37734_m23_marshack' of git://github.com/skodak/moodle into MOODLE_23_STABLE

8 years agoMDL-37767 allow empty host in enrol_database which is required for default pg socket
Petr Škoda [Tue, 29 Jan 2013 23:40:03 +0000 (00:40 +0100)]
MDL-37767 allow empty host in enrol_database which is required for default pg socket

8 years agoMerge branch 'MDL-37533-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 29 Jan 2013 14:35:20 +0000 (15:35 +0100)]
Merge branch 'MDL-37533-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMDL-37734 add one more recordset isolation test
Petr Škoda [Tue, 29 Jan 2013 09:10:40 +0000 (10:10 +0100)]
MDL-37734 add one more recordset isolation test

8 years agoMDL-37734 use prefetching workaround for MARS transaction problems
Petr Škoda [Fri, 25 Jan 2013 21:46:12 +0000 (22:46 +0100)]
MDL-37734 use prefetching workaround for MARS transaction problems

8 years agoMDL-34190 Course: Role with student archtype should be selected as default in user...
Rajesh Taneja [Fri, 18 Jan 2013 02:10:57 +0000 (10:10 +0800)]
MDL-34190 Course: Role with student archtype should be selected as default in user list

8 years agoMDL-29691 Improve numerical format in multianswer
ppichet [Fri, 18 Jan 2013 15:00:34 +0000 (10:00 -0500)]
MDL-29691 Improve numerical format in multianswer

Allow the use of , as decsep in multianswer numerical subquestions

8 years agoMDL-37646 Assign: Quickgrading fix when using grading filters or lots of students.
Damyon Wiese [Tue, 29 Jan 2013 06:36:18 +0000 (14:36 +0800)]
MDL-37646 Assign: Quickgrading fix when using grading filters or lots of students.

8 years agoMerge branch 'MDL-37694_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 29 Jan 2013 03:54:51 +0000 (11:54 +0800)]
Merge branch 'MDL-37694_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37476-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23...
Sam Hemelryk [Tue, 29 Jan 2013 02:23:35 +0000 (15:23 +1300)]
Merge branch 'MDL-37476-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

8 years agoMDL-37696 SCORM css: don't include style.css multiple times
Dan Marsden [Sun, 27 Jan 2013 21:31:08 +0000 (10:31 +1300)]
MDL-37696 SCORM css: don't include style.css multiple times

8 years agoMerge branch 'MDL-37697-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Sam Hemelryk [Mon, 28 Jan 2013 20:02:32 +0000 (09:02 +1300)]
Merge branch 'MDL-37697-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37350-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Sam Hemelryk [Mon, 28 Jan 2013 19:54:42 +0000 (08:54 +1300)]
Merge branch 'MDL-37350-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36881-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Sam Hemelryk [Mon, 28 Jan 2013 19:51:20 +0000 (08:51 +1300)]
Merge branch 'MDL-36881-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-34671-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Sam Hemelryk [Mon, 28 Jan 2013 19:39:08 +0000 (08:39 +1300)]
Merge branch 'MDL-34671-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37668-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
Sam Hemelryk [Mon, 28 Jan 2013 19:33:01 +0000 (08:33 +1300)]
Merge branch 'MDL-37668-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'm23_MDL-34321' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 28 Jan 2013 19:27:23 +0000 (08:27 +1300)]
Merge branch 'm23_MDL-34321' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

8 years agoMDL-37668 Accessibility: Help popup should be easy to close using keyboard
sam marshall [Fri, 25 Jan 2013 12:59:11 +0000 (12:59 +0000)]
MDL-37668 Accessibility: Help popup should be easy to close using keyboard

8 years agoMDL-34671 Stop browser receiving escape keydown in modal dialogues
Andrew Robert Nicols [Mon, 28 Jan 2013 10:35:26 +0000 (10:35 +0000)]
MDL-34671 Stop browser receiving escape keydown in modal dialogues

In certain modal dialogues, we listen on the Escape key to close a
dialogue. However, this is still passed to the browser. As a result, if the
browser is in full screen mode and that browser respects the escape key as
a means to exit full screen.

As a result, we need to ensure that we listen for the escape key at keydown
rather than keyup, and additionally prevent the default browser behaviour.

This is a workaround to http://yuilibrary.com/projects/yui3/ticket/2532616
and, should that issue be fixed, it should be removed.

8 years agoMDL-36881 Handle poorly behaved modname_get_types functions better
Sam Chaffee [Thu, 29 Nov 2012 09:27:47 +0000 (09:27 +0000)]
MDL-36881 Handle poorly behaved modname_get_types functions better

The modname_get_types function is not always well implemented by
third-party plugins and some return poor data. This in turn leads to
incorrect module definitions, and can lead to problems in both the
'Add an activity...' dropdowns and the Activity chooser.

This will also prevent display of plugins which legitimately can have
subtypes but where no subtypes were found. Since such plugins cannot be
used in this fashion in any case, this is also beneficial.

Signed-off-by: Andrew Robert Nicols <andrew.nicols@lancaster.ac.uk>
8 years agoMDL-37350 Detach listeners when hiding the 'Add roles' popup
Andrew Robert Nicols [Fri, 4 Jan 2013 00:09:50 +0000 (00:09 +0000)]
MDL-37350 Detach listeners when hiding the 'Add roles' popup

If the submit event listener is not correctly closed, then the submit event
calls the relevant callback multiple times incorrectly.

When hiding the Add role dialogue, we need to detach any event listeners
which are applied to it.

8 years agoMDL-37697 Use the user selected editor format for new course forums
Andrew Robert Nicols [Fri, 25 Jan 2013 12:24:21 +0000 (12:24 +0000)]
MDL-37697 Use the user selected editor format for new course forums

8 years agoMDL-34231 SCORM: Lock after final attempt when using skip content structure or direct...
Dan Marsden [Mon, 28 Jan 2013 08:17:43 +0000 (21:17 +1300)]
MDL-34231 SCORM: Lock after final attempt when using skip content structure or direct navigation to player.php

8 years agoMerge branch 'w04_MDL-37713_m23_testdir' of git://github.com/skodak/moodle into MOODL...
Sam Hemelryk [Mon, 28 Jan 2013 04:53:29 +0000 (17:53 +1300)]
Merge branch 'w04_MDL-37713_m23_testdir' of git://github.com/skodak/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37548-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Sam Hemelryk [Mon, 28 Jan 2013 04:45:50 +0000 (17:45 +1300)]
Merge branch 'MDL-37548-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-MDL-29723_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_...
Sam Hemelryk [Mon, 28 Jan 2013 04:34:40 +0000 (17:34 +1300)]
Merge branch 'wip-MDL-29723_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37172_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 28 Jan 2013 04:28:54 +0000 (17:28 +1300)]
Merge branch 'MDL-37172_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

Conflicts:
question/format/learnwise/format.php

8 years agoMerge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle...
Sam Hemelryk [Mon, 28 Jan 2013 03:06:49 +0000 (16:06 +1300)]
Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoMDL-13805 core_message: fixed the admin's ability to read another users messages
Andrew Davis [Mon, 12 Nov 2012 07:25:49 +0000 (15:25 +0800)]
MDL-13805 core_message: fixed the admin's ability to read another users messages

8 years agoMerge branch 'MDL-37634_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 28 Jan 2013 00:44:45 +0000 (13:44 +1300)]
Merge branch 'MDL-37634_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37628-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 28 Jan 2013 00:41:44 +0000 (13:41 +1300)]
Merge branch 'MDL-37628-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37629-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 27 Jan 2013 23:02:35 +0000 (12:02 +1300)]
Merge branch 'MDL-37629-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-19069_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 27 Jan 2013 22:32:32 +0000 (11:32 +1300)]
Merge branch 'MDL-19069_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMDL-37713 let phpunit bootstrap create test dataroot if necessary
Petr Škoda [Fri, 25 Jan 2013 22:35:46 +0000 (23:35 +0100)]
MDL-37713 let phpunit bootstrap create test dataroot if necessary

8 years agoMDL-37628 feedback - Coding error in Recent Activity
Andreas Grabs [Tue, 22 Jan 2013 21:35:34 +0000 (22:35 +0100)]
MDL-37628 feedback - Coding error in Recent Activity

8 years agoMDL-37172 Hardcoded strings in some question imports formats
Jean-Michel Vedrine [Sat, 22 Dec 2012 16:02:58 +0000 (17:02 +0100)]
MDL-37172 Hardcoded strings in some question imports formats
AMOS BEGIN
CPY [unknownorunhandledtype,qformat_blackboard_six],[unknownorunhandledtype,question]
AMOS END

8 years agoMDL-37694 move quiz unit tests to the right place.
Tim Hunt [Fri, 25 Jan 2013 12:12:12 +0000 (12:12 +0000)]
MDL-37694 move quiz unit tests to the right place.

Follow-on from MDL-37684.

8 years agoMDL-37684 - phpunit add missing definitions to phpunit.xml.dist
Dan Poltawski [Fri, 25 Jan 2013 08:32:08 +0000 (16:32 +0800)]
MDL-37684 - phpunit add missing definitions to phpunit.xml.dist

8 years agoweekly release 2.3.4+
Dan Poltawski [Fri, 25 Jan 2013 07:53:52 +0000 (15:53 +0800)]
weekly release 2.3.4+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Dan Poltawski [Fri, 25 Jan 2013 07:58:26 +0000 (15:58 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37473b-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
Dan Poltawski [Fri, 25 Jan 2013 04:36:26 +0000 (12:36 +0800)]
Merge branch 'MDL-37473b-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

8 years agoMDL-37473 completion: Add missing cap checks to tracked users functions
Aaron Barnes [Fri, 11 Jan 2013 01:41:05 +0000 (14:41 +1300)]
MDL-37473 completion: Add missing cap checks to tracked users functions

Namely get_num_tracked_users and is_tracked_user()

8 years agoMDL-37548 Show the incorrect value in a colour picker after validation
Andrew Robert Nicols [Wed, 23 Jan 2013 22:23:29 +0000 (22:23 +0000)]
MDL-37548 Show the incorrect value in a colour picker after validation

8 years agoMDL-37533 Assign: Fix grading filters to show only assignments needing grading
Stephen Bourget [Mon, 21 Jan 2013 17:02:25 +0000 (12:02 -0500)]
MDL-37533 Assign: Fix grading filters to show only assignments needing grading

Conflicts:

mod/assign/gradingtable.php

8 years agoMDL-37533 Assign: Use the constant for the submitted status in the query (and paramet...
Damyon Wiese [Thu, 24 Jan 2013 02:52:20 +0000 (10:52 +0800)]
MDL-37533 Assign: Use the constant for the submitted status in the query (and parameterize the query)

8 years agoMDL-37533 Assign: assign_print_overview does not correctly display assignments that...
Stephen Bourget [Mon, 21 Jan 2013 16:32:04 +0000 (11:32 -0500)]
MDL-37533 Assign: assign_print_overview does not correctly display assignments that need grading

Conflicts:

mod/assign/lib.php

8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 24 Jan 2013 00:46:51 +0000 (00:46 +0000)]
Automatically generated installer lang files

8 years agoMDL-37476 course_create unit test fails if course completion is enabled
Jerome Mouneyrac [Wed, 23 Jan 2013 06:15:00 +0000 (14:15 +0800)]
MDL-37476 course_create unit test fails if course completion is enabled

8 years agoMDL-37634 lesson: readquestion visibility to protected
David Monllao [Wed, 23 Jan 2013 01:52:36 +0000 (09:52 +0800)]
MDL-37634 lesson: readquestion visibility to protected

8 years agoMDL-37629 assign: Fix from regression MDL-37244
Jean-Philippe Gaudreau [Tue, 22 Jan 2013 21:19:44 +0000 (16:19 -0500)]
MDL-37629 assign: Fix from regression MDL-37244

8 years agoMDL-29723 mod/quiz: Modified show/hide button in edit.php and added some extra CSS...
Mary Evans [Tue, 22 Jan 2013 16:17:11 +0000 (16:17 +0000)]
MDL-29723 mod/quiz: Modified show/hide button in edit.php and added some extra CSS rules to styles.css to make Question bank block more compatible/adaptable with themes.

8 years agoMDL-37619 Assign - Fix regression assign_print_overview caused by MDL-37527
Damyon Wiese [Wed, 23 Jan 2013 00:42:02 +0000 (08:42 +0800)]
MDL-37619 Assign - Fix regression assign_print_overview caused by MDL-37527

8 years agoMerge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 22 Jan 2013 22:07:40 +0000 (11:07 +1300)]
Merge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

Conflicts:
version.php

8 years agoMerge branch 'wip-MDL-15930-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 19:40:56 +0000 (20:40 +0100)]
Merge branch 'wip-MDL-15930-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-mdl-37339-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Aparup Banerjee [Tue, 22 Jan 2013 08:28:53 +0000 (16:28 +0800)]
Merge branch 'wip-mdl-37339-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-mdl-32526-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Dan Poltawski [Tue, 22 Jan 2013 06:00:42 +0000 (14:00 +0800)]
Merge branch 'wip-mdl-32526-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-27164-MOODLE_23_STABLE' of git://github.com/micaherne/moodle into...
Dan Poltawski [Tue, 22 Jan 2013 04:52:08 +0000 (12:52 +0800)]
Merge branch 'MDL-27164-MOODLE_23_STABLE' of git://github.com/micaherne/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37275_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 04:46:23 +0000 (12:46 +0800)]
Merge branch 'MDL-37275_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37375_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 04:44:07 +0000 (12:44 +0800)]
Merge branch 'MDL-37375_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37430-23' of github.com:damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 03:53:57 +0000 (11:53 +0800)]
Merge branch 'MDL-37430-23' of github.com:damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35357_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 03:48:26 +0000 (11:48 +0800)]
Merge branch 'MDL-35357_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37599_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 03:40:28 +0000 (11:40 +0800)]
Merge branch 'MDL-37599_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37473-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 03:14:42 +0000 (11:14 +0800)]
Merge branch 'MDL-37473-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37540-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 22 Jan 2013 03:00:05 +0000 (11:00 +0800)]
Merge branch 'MDL-37540-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37543-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 22 Jan 2013 02:56:54 +0000 (10:56 +0800)]
Merge branch 'MDL-37543-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37355-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23...
Dan Poltawski [Tue, 22 Jan 2013 01:06:44 +0000 (09:06 +0800)]
Merge branch 'MDL-37355-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36104_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:20:06 +0000 (01:20 +0100)]
Merge branch 'MDL-36104_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37539-23' of github.com:damyon/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:06:23 +0000 (01:06 +0100)]
Merge branch 'MDL-37539-23' of github.com:damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-28512_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:02:34 +0000 (01:02 +0100)]
Merge branch 'MDL-28512_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-37473 completion: Add missing cap checks to tracked users functions
Aaron Barnes [Fri, 11 Jan 2013 01:41:05 +0000 (14:41 +1300)]
MDL-37473 completion: Add missing cap checks to tracked users functions

Namely get_num_tracked_users and is_tracked_user()

8 years agoMerge branch 'MDL-37563-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 21 Jan 2013 20:10:23 +0000 (09:10 +1300)]
Merge branch 'MDL-37563-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37577_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 19:01:56 +0000 (20:01 +0100)]
Merge branch 'MDL-37577_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35924_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 18:44:27 +0000 (19:44 +0100)]
Merge branch 'MDL-35924_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-34050_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 15:47:45 +0000 (16:47 +0100)]
Merge branch 'MDL-34050_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMDL-37577 quiz overdue handling: optimise database query
Tim Hunt [Fri, 18 Jan 2013 16:43:48 +0000 (16:43 +0000)]
MDL-37577 quiz overdue handling: optimise database query

This is the standard trick of adding a redundant WHERE clause to a
subquery to help the database realise that it does not have to inspect
so many rows.

8 years agoMDL-37599 question import: add missing string.
Tim Hunt [Mon, 21 Jan 2013 12:07:47 +0000 (12:07 +0000)]
MDL-37599 question import: add missing string.

AMOS BEGIN
 MOV [matcherror,question],[invalidgrade,question]
AMOS END

8 years agoMDL-35357 Lesson Module: fixed undefined property for $answerformat
Michael de Raadt [Mon, 21 Jan 2013 07:34:26 +0000 (15:34 +0800)]
MDL-35357 Lesson Module: fixed undefined property for $answerformat

8 years agoMerge branch 'w03_MDL-37559_m23_otherusers' of git://github.com/skodak/moodle into...
Aparup Banerjee [Mon, 21 Jan 2013 07:26:51 +0000 (15:26 +0800)]
Merge branch 'w03_MDL-37559_m23_otherusers' of git://github.com/skodak/moodle into MOODLE_23_STABLE

8 years agoMDL-37375 Report: fixed blog post link from course activity report
Rossiani Wijaya [Mon, 21 Jan 2013 06:57:05 +0000 (14:57 +0800)]
MDL-37375 Report: fixed blog post link from course activity report

8 years agoMDL-36104 mod_assign: added hidden labels to the feedback input fields
Mark Nelson [Tue, 15 Jan 2013 09:03:00 +0000 (17:03 +0800)]
MDL-36104 mod_assign: added hidden labels to the feedback input fields

8 years agoMDL-37352 core_grade:fixed some ajax display issues
Andrew Davis [Thu, 10 Jan 2013 06:57:32 +0000 (14:57 +0800)]
MDL-37352 core_grade:fixed some ajax display issues

Conflicts:
grade/report/grader/styles.css

8 years agoMDL-19069 RSS feed block: Removed link for remote RSS feeds on navigation
Rossiani Wijaya [Mon, 21 Jan 2013 03:56:42 +0000 (11:56 +0800)]
MDL-19069 RSS feed block: Removed link for remote RSS feeds on navigation

8 years agoMerge branch 'wip-mdl-36674-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Dan Poltawski [Mon, 21 Jan 2013 02:15:31 +0000 (10:15 +0800)]
Merge branch 'wip-mdl-36674-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35074_23_2' of git://github.com/pauln/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 21 Jan 2013 02:09:07 +0000 (10:09 +0800)]
Merge branch 'MDL-35074_23_2' of git://github.com/pauln/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37527-23' of github.com:damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 21 Jan 2013 02:04:04 +0000 (10:04 +0800)]
Merge branch 'MDL-37527-23' of github.com:damyon/moodle into MOODLE_23_STABLE

8 years agoMDL-37563 Assignment upgrade: Upgrade conditional activity settings.
Damyon Wiese [Thu, 17 Jan 2013 06:00:46 +0000 (14:00 +0800)]
MDL-37563 Assignment upgrade: Upgrade conditional activity settings.

Conflicts:

mod/assign/upgradelib.php

8 years agoMerge branch 'm23_MDL-36421' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 21 Jan 2013 01:01:26 +0000 (09:01 +0800)]
Merge branch 'm23_MDL-36421' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

8 years agoAutomatically generated installer lang files
AMOS bot [Mon, 21 Jan 2013 00:44:55 +0000 (00:44 +0000)]
Automatically generated installer lang files