58853 Commits

Author SHA1 Message Date
David Monllao
191b3fb9d7 MDL-37046 behat: Adding a test to check the test environment 2013-01-29 08:40:35 +08:00
David Monllao
dca22d7cc1 MDL-37046 behat: Basic web execution wrapper 2013-01-29 08:40:35 +08:00
David Monllao
301cbe3a30 MDL-37046 behat: Behat admin tool skeleton 2013-01-29 08:40:35 +08:00
Eloy Lafuente (stronk7)
09d6bcc232 Merge branch 'w04_MDL-37718_m25_rs' of git://github.com/skodak/moodle 2013-01-29 01:33:08 +01:00
Eloy Lafuente (stronk7)
ee4cac2b44 Merge branch 'wip-MDL-37474-m25' of git://github.com/samhemelryk/moodle 2013-01-29 01:32:09 +01:00
Sam Hemelryk
3178ae6f09 Merge branch 'wip-mdl-36619' of git://github.com/rajeshtaneja/moodle 2013-01-29 10:50:14 +13:00
Sam Hemelryk
dabe6985e4 Merge branch 'master_MDL-37696' of git://github.com/danmarsden/moodle 2013-01-29 10:19:31 +13:00
Sam Hemelryk
41f3d113f7 Merge branch 'MDL-37697-m' of git://github.com/andrewnicols/moodle 2013-01-29 10:17:01 +13:00
Sam Hemelryk
49c204d1ee Merge branch 'MDL-37350-m' of git://github.com/andrewnicols/moodle 2013-01-29 08:55:05 +13:00
Sam Hemelryk
5126bab95c Merge branch 'MDL-36881-m' of git://github.com/andrewnicols/moodle 2013-01-29 08:52:01 +13:00
Sam Hemelryk
bf6a1b9078 Merge branch 'w04_MDL-37596_m25_schedmaint' of git://github.com/skodak/moodle 2013-01-29 08:44:15 +13:00
Sam Hemelryk
8d8e6b1519 Merge branch 'MDL-34671-m' of git://github.com/andrewnicols/moodle 2013-01-29 08:39:35 +13:00
Sam Hemelryk
44aad12347 Merge branch 'MDL-37668-master' of git://github.com/sammarshallou/moodle 2013-01-29 08:33:41 +13:00
Sam Hemelryk
cb4adcc4a4 Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle 2013-01-29 08:28:31 +13:00
Eloy Lafuente (stronk7)
fab951a6ae Merge branch 'wip-MDL-37545-m25' of git://github.com/samhemelryk/moodle 2013-01-28 19:23:17 +01:00
Eloy Lafuente (stronk7)
7356e732b7 MDL-37086 phpunit: use alt reset method.
When code executed in test cases is using/preventing
database transactions, phpunit itself cannot
use transactions for reseting between cases. But we
can tell it about, so some alternative (and slower)
method for reseting will be used.
2013-01-28 18:25:38 +01:00
Petr Škoda
48e114a517 MDL-37596 optionally enable CLI maintenance later 2013-01-28 14:23:21 +01:00
sam marshall
62019ad86e MDL-37668 Accessibility: Help popup should be easy to close using keyboard 2013-01-28 10:56:26 +00:00
Andrew Robert Nicols
8a185b9ebc 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:35:26 +00:00
Sam Chaffee
56c0878b45 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:21:22 +00:00
Andrew Robert Nicols
344936ae48 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:57:08 +00:00
Dan Marsden
cce0da745a MDL-34231 SCORM: Lock after final attempt when using skip content structure or direct navigation to player.php 2013-01-28 21:17:43 +13:00
Sam Hemelryk
502e785311 Merge branch 'w04_MDL-37638_m25_rolecloning' of git://github.com/skodak/moodle 2013-01-28 18:00:07 +13:00
Sam Hemelryk
44a951b28d Merge branch 'w04_MDL-37666_m25_cssiesend' of git://github.com/skodak/moodle 2013-01-28 17:56:05 +13:00
Sam Hemelryk
d0ac573b7f Merge branch 'w04_MDL-37713_m25_testdir' of git://github.com/skodak/moodle 2013-01-28 17:53:54 +13:00
Sam Hemelryk
3619009d0b Merge branch 'MDL-37677-obsolete-cache-debug' of git://github.com/mudrd8mz/moodle 2013-01-28 17:50:48 +13:00
Sam Hemelryk
34e41c81f8 Merge branch 'MDL-37673-muc-groupdata-typo' of git://github.com/mudrd8mz/moodle 2013-01-28 17:49:24 +13:00
Sam Hemelryk
635bc28d98 Merge branch 'MDL-37548-m' of git://github.com/andrewnicols/moodle 2013-01-28 17:46:13 +13:00
Sam Hemelryk
be54d2015d Merge branch 'wip-MDL-37614_master' of git://github.com/lazydaisy/moodle 2013-01-28 17:40:08 +13:00
Sam Hemelryk
d38df267a0 Merge branch 'wip-MDL-37611_master' of git://github.com/lazydaisy/moodle 2013-01-28 17:40:01 +13:00
Sam Hemelryk
225a85806d Merge branch 'wip-MDL-37613_master' of git://github.com/lazydaisy/moodle 2013-01-28 17:38:36 +13:00
Sam Hemelryk
56a81ad856 Merge branch 'wip-MDL-37612_master' of git://github.com/lazydaisy/moodle 2013-01-28 17:37:07 +13:00
Sam Hemelryk
58f828ca14 Merge branch 'wip-MDL-29723_master' of git://github.com/lazydaisy/moodle 2013-01-28 17:35:04 +13:00
Sam Hemelryk
f9a71cb033 Merge branch 'MDL-37172' of git://github.com/jmvedrine/moodle 2013-01-28 17:29:24 +13:00
Sam Hemelryk
682a1c0108 Merge branch 'w04_MDL-37728_m25_roledef' of git://github.com/skodak/moodle 2013-01-28 17:25:51 +13:00
Andrew Davis
d8ef2bc03c MDL-13805 core_message: altered some strings so it isnt weird when viewing a different users messages 2013-01-28 16:07:37 +13:00
Andrew Davis
447df209cf MDL-13805 core_message: fixed the admin's ability to read another users messages 2013-01-28 16:07:37 +13:00
David Monllao
e8eb2b003a MDL-37634 lesson: readquestion visibility to protected 2013-01-28 13:45:42 +13:00
Sam Hemelryk
81ee22017a Merge branch 'MDL-37628-master' of git://github.com/grabs/moodle 2013-01-28 13:42:07 +13:00
Sam Hemelryk
e003d7dc5f Merge branch 'w04_MDL-37640_m25_zipclose' of git://github.com/skodak/moodle 2013-01-28 13:36:28 +13:00
Sam Hemelryk
0449f2e6da Merge branch 'w04_MDL-37407_m25_chineseunzip' of git://github.com/skodak/moodle 2013-01-28 13:32:09 +13:00
Sam Hemelryk
7395c2b8e2 Merge branch 'MDL-37414_master' of https://github.com/markn86/moodle 2013-01-28 13:29:17 +13:00
Sam Hemelryk
dff72cde30 Merge branch 'MDL-32750' of git://github.com/colchambers/moodle 2013-01-28 11:57:17 +13:00
Sam Hemelryk
0f54ac5698 Merge branch 'MDL-19069' of git://github.com/rwijaya/moodle 2013-01-28 11:32:53 +13:00
Sam Hemelryk
554b67545b MDL-37615 block_section_links: brought up to current standards. 2013-01-28 11:18:51 +13:00
Sam Hemelryk
1631d5ffdf MDL-37535 block_section_links: now uses component for settings. 2013-01-28 10:42:29 +13:00
Sam Hemelryk
9890ecfc25 MDL-37545 cache: fixed bug during initialisation and updating of cache config 2013-01-28 10:40:37 +13:00
Sam Hemelryk
5052356574 MDL-37470 cache: definitions can now be purged through config screen 2013-01-28 10:39:47 +13:00
Dan Marsden
fe56bc615d MDL-37696 SCORM css: don't include style.css multiple times 2013-01-28 10:31:08 +13:00
Petr Škoda
ba4b17dc55 MDL-37728 show role risks 2013-01-27 14:55:06 +01:00