Commit graph

56665 commits

Author SHA1 Message Date
Andrew Davis
cd536c6be5 MDL-32076 core_grade: fixed handling of unlimited grades 2013-02-06 15:57:48 +08:00
Eloy Lafuente (stronk7)
5e3412d94d weekly release 2.3.4+ 2013-01-31 11:04:15 +01:00
Dan Poltawski
e17b0a6a8c Merge branch 'm23_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE 2013-01-31 10:15:00 +08:00
Dan Marsden
8bdac11f11 MDL-34231 SCORM: use correct calculation of attemptsleft 2013-01-31 11:12:43 +13:00
Sam Hemelryk
07f3c79dd4 Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2013-01-31 08:45:32 +13:00
Andrew Davis
db30e0b00a MDL-13805 core_message: fixed some problems caused by a hasty backport 2013-01-30 18:34:02 +08:00
Eloy Lafuente (stronk7)
2cc9648555 Merge branch 'w04_MDL-37734_m23_marshack' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2013-01-30 01:23:44 +01:00
Petr Škoda
06ffb6544b MDL-37767 allow empty host in enrol_database which is required for default pg socket 2013-01-30 00:57:26 +01:00
Eloy Lafuente (stronk7)
6e607d44c0 Merge branch 'MDL-37533-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-01-29 15:35:20 +01:00
Petr Škoda
9834ef146e MDL-37734 add one more recordset isolation test 2013-01-29 10:19:58 +01:00
Petr Škoda
1d65791467 MDL-37734 use prefetching workaround for MARS transaction problems 2013-01-29 10:19:51 +01:00
Rajesh Taneja
aebbfda077 MDL-34190 Course: Role with student archtype should be selected as default in user list 2013-01-29 16:54:17 +08:00
ppichet
b05659dde4 MDL-29691 Improve numerical format in multianswer
Allow the use of , as decsep in multianswer numerical subquestions
2013-01-29 16:30:36 +08:00
Dan Poltawski
87db6e272e Merge branch 'MDL-37694_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-01-29 11:54:51 +08:00
Sam Hemelryk
7b86ac4bbc Merge branch 'MDL-37476-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE 2013-01-29 15:23:35 +13:00
Dan Marsden
9e9b69fff9 MDL-37696 SCORM css: don't include style.css multiple times 2013-01-29 10:34:40 +13:00
Sam Hemelryk
09a8ba4aa6 Merge branch 'MDL-37697-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-01-29 09:02:32 +13:00
Sam Hemelryk
c5b346dc13 Merge branch 'MDL-37350-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-01-29 08:54:42 +13:00
Sam Hemelryk
3134895c01 Merge branch 'MDL-36881-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-01-29 08:51:20 +13:00
Sam Hemelryk
8108e113b3 Merge branch 'MDL-34671-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-01-29 08:39:08 +13:00
Sam Hemelryk
04093db18a Merge branch 'MDL-37668-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2013-01-29 08:33:01 +13:00
Sam Hemelryk
adf01e854b Merge branch 'm23_MDL-34321' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE 2013-01-29 08:27:23 +13:00
sam marshall
9fb8d1f275 MDL-37668 Accessibility: Help popup should be easy to close using keyboard 2013-01-28 10:57:42 +00:00
Andrew Robert Nicols
7efab51a7e 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.
2013-01-28 10:49:42 +00:00
Sam Chaffee
b19ecdb38d 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>
2013-01-28 10:23:08 +00:00
Andrew Robert Nicols
f9681cffa4 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.
2013-01-28 09:59:01 +00:00
Andrew Robert Nicols
f4b106ee59 MDL-37697 Use the user selected editor format for new course forums 2013-01-28 09:56:22 +00:00
Dan Marsden
9de3aac748 MDL-34231 SCORM: Lock after final attempt when using skip content structure or direct navigation to player.php 2013-01-28 21:21:18 +13:00
Sam Hemelryk
ab9008ffb0 Merge branch 'w04_MDL-37713_m23_testdir' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2013-01-28 17:53:29 +13:00
Sam Hemelryk
c01e5b0cd6 Merge branch 'MDL-37548-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-01-28 17:45:50 +13:00
Sam Hemelryk
b0610c8bca Merge branch 'wip-MDL-29723_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE 2013-01-28 17:34:40 +13:00
Sam Hemelryk
c2e15c4619 Merge branch 'MDL-37172_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Conflicts:
	question/format/learnwise/format.php
2013-01-28 17:28:54 +13:00
Sam Hemelryk
d6fdc727ea Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2013-01-28 16:06:49 +13:00
Andrew Davis
eae7b4d189 MDL-13805 core_message: fixed the admin's ability to read another users messages 2013-01-28 10:33:28 +08:00
Sam Hemelryk
ac9b9f152c Merge branch 'MDL-37634_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE 2013-01-28 13:44:45 +13:00
Sam Hemelryk
7ec3fd667a Merge branch 'MDL-37628-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE 2013-01-28 13:41:44 +13:00
Sam Hemelryk
a83ce21dfb Merge branch 'MDL-37629-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-01-28 12:02:35 +13:00
Sam Hemelryk
b5fe549a3c Merge branch 'MDL-19069_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2013-01-28 11:32:32 +13:00
Petr Škoda
1892098bf0 MDL-37713 let phpunit bootstrap create test dataroot if necessary 2013-01-26 15:00:31 +01:00
Andreas Grabs
7fdb36f523 MDL-37628 feedback - Coding error in Recent Activity 2013-01-26 11:23:30 +01:00
Jean-Michel Vedrine
0acd374832 MDL-37172 Hardcoded strings in some question imports formats
AMOS BEGIN
CPY [unknownorunhandledtype,qformat_blackboard_six],[unknownorunhandledtype,question]
AMOS END
2013-01-25 23:10:00 +01:00
Tim Hunt
1ec9eeadae MDL-37694 move quiz unit tests to the right place.
Follow-on from MDL-37684.
2013-01-25 12:16:42 +00:00
Dan Poltawski
913084399a MDL-37684 - phpunit add missing definitions to phpunit.xml.dist 2013-01-25 16:32:08 +08:00
Dan Poltawski
b7e9856937 weekly release 2.3.4+ 2013-01-25 15:58:46 +08:00
Dan Poltawski
11c1663d71 Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE 2013-01-25 15:58:26 +08:00
Dan Poltawski
4b081e7037 Merge branch 'MDL-37473b-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE 2013-01-25 12:36:26 +08:00
Aaron Barnes
d4d06686f7 MDL-37473 completion: Add missing cap checks to tracked users functions
Namely get_num_tracked_users and is_tracked_user()
2013-01-25 17:12:48 +13:00
Andrew Robert Nicols
0bbbabb550 MDL-37548 Show the incorrect value in a colour picker after validation 2013-01-24 10:11:59 +00:00
Stephen Bourget
db2a65bfa9 MDL-37533 Assign: Fix grading filters to show only assignments needing grading
Conflicts:

	mod/assign/gradingtable.php
2013-01-24 11:16:29 +08:00
Damyon Wiese
45e9749984 MDL-37533 Assign: Use the constant for the submitted status in the query (and parameterize the query) 2013-01-24 11:16:03 +08:00