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
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
Dan Marsden [Sun, 27 Jan 2013 21:31:08 +0000 (10:31 +1300)]
MDL-37696 SCORM css: don't include style.css multiple times
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
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
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
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
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
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
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
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.
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>
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.
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
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
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
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
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
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
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
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
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
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
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
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
Petr Škoda [Fri, 25 Jan 2013 22:35:46 +0000 (23:35 +0100)]
MDL-37713 let phpunit bootstrap create test dataroot if necessary
Andreas Grabs [Tue, 22 Jan 2013 21:35:34 +0000 (22:35 +0100)]
MDL-37628 feedback - Coding error in Recent Activity
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
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.
Dan Poltawski [Fri, 25 Jan 2013 08:32:08 +0000 (16:32 +0800)]
MDL-37684 - phpunit add missing definitions to phpunit.xml.dist
Dan Poltawski [Fri, 25 Jan 2013 07:53:52 +0000 (15:53 +0800)]
weekly release 2.3.4+
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
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
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()
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
AMOS bot [Thu, 24 Jan 2013 00:46:51 +0000 (00:46 +0000)]
Automatically generated installer lang files
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
David Monllao [Wed, 23 Jan 2013 01:52:36 +0000 (09:52 +0800)]
MDL-37634 lesson: readquestion visibility to protected
Jean-Philippe Gaudreau [Tue, 22 Jan 2013 21:19:44 +0000 (16:19 -0500)]
MDL-37629 assign: Fix from regression MDL-37244
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.
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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()
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
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
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
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
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.
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
Michael de Raadt [Mon, 21 Jan 2013 07:34:26 +0000 (15:34 +0800)]
MDL-35357 Lesson Module: fixed undefined property for $answerformat
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
Rossiani Wijaya [Mon, 21 Jan 2013 06:57:05 +0000 (14:57 +0800)]
MDL-37375 Report: fixed blog post link from course activity report
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
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
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
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
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
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
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
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
AMOS bot [Mon, 21 Jan 2013 00:44:55 +0000 (00:44 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Sun, 20 Jan 2013 21:18:10 +0000 (10:18 +1300)]
Merge branch 'MDL-37295-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 20 Jan 2013 20:46:01 +0000 (09:46 +1300)]
Merge branch 'MDL-35817_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 20 Jan 2013 20:31:12 +0000 (09:31 +1300)]
Merge branch 'MDL-36757_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Petr Škoda [Sat, 19 Jan 2013 15:50:38 +0000 (16:50 +0100)]
MDL-37559 fix display of multiple roles of other users
Credit goes to Tyron Delean, thanks.
Tim Hunt [Fri, 18 Jan 2013 11:27:53 +0000 (11:27 +0000)]
MDL-28512 qtype essay: clean up properly when a question is deleted.
Mark Nelson [Tue, 15 Jan 2013 10:15:14 +0000 (18:15 +0800)]
MDL-35924 filemanager: added label for the input field when creating a new folder
Mark Nelson [Tue, 15 Jan 2013 06:09:50 +0000 (14:09 +0800)]
MDL-37275 webservices: ensure a webservice function is chosen before attempting to add to service
Dan Poltawski [Fri, 18 Jan 2013 06:32:02 +0000 (14:32 +0800)]
weekly release 2.3.4+
Dan Poltawski [Fri, 18 Jan 2013 06:31:25 +0000 (14:31 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
Ankit Agarwal [Tue, 15 Jan 2013 05:53:12 +0000 (13:53 +0800)]
MDL-37295 forum: Parse old log entries during restore
Rajesh Taneja [Thu, 17 Jan 2013 06:04:16 +0000 (14:04 +0800)]
MDL-35873 Blocks: Fixed roles icon
Dan Poltawski [Thu, 17 Jan 2013 05:48:42 +0000 (13:48 +0800)]
Merge branch 'wip-mdl-29534-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Rajesh Taneja [Thu, 17 Jan 2013 05:45:01 +0000 (13:45 +0800)]
MDL-29534 Forum: Fixed userfrom reference problem
Rossiani Wijaya [Thu, 17 Jan 2013 05:01:27 +0000 (13:01 +0800)]
MDL-35817 login: convert html tag to use html_writer and change <a> tag id to be more specific to login
Rossiani Wijaya [Tue, 15 Jan 2013 07:45:15 +0000 (15:45 +0800)]
MDL-35817 Login: set page focus to error message for login error
Damyon Wiese [Thu, 17 Jan 2013 04:09:36 +0000 (12:09 +0800)]
MDL-37539 Assignment upgrade: Disable submission comments if allow notes was not enabled.
For advanced upload of files only - this setting was stored in var2.
Conflicts:
mod/assign/submission/comments/locallib.php
Damyon Wiese [Thu, 17 Jan 2013 03:44:57 +0000 (11:44 +0800)]
MDL-37540 Assignment upgrade: Upgrade setting "Hide description before due date"
Advanced upload of files has this setting which is stored in var3.
Rajesh Taneja [Thu, 17 Jan 2013 03:50:23 +0000 (11:50 +0800)]
MDL-35780 Administration: current user email should be always displayed on participants page
Andrew Davis [Wed, 19 Dec 2012 01:46:16 +0000 (09:46 +0800)]
MDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade items
Damyon Wiese [Thu, 17 Jan 2013 03:05:31 +0000 (11:05 +0800)]
MDL-37543 Assignment upgrade: convert advanced upload files "Send for marking" setting
Advanced upload files assignment type has "Enable send for marking" setting instead
of "Allow resubmissions". Needs special handling in upgrade code to convert to
"Require students click submit button".
Conflicts:
mod/assign/submission/file/locallib.php
Dan Poltawski [Thu, 17 Jan 2013 02:23:15 +0000 (10:23 +0800)]
Merge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 15:15:56 +0000 (16:15 +0100)]
MDL-37555 Apply realpath() 2 CFG->phpunit_dataroot
Tim Hunt [Wed, 16 Jan 2013 12:38:04 +0000 (12:38 +0000)]
MDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB.
