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 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 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
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
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
dff72cde30
Merge branch 'MDL-32750' of git://github.com/colchambers/moodle
2013-01-28 11:57:17 +13:00
Petr Škoda
a07c89c632
MDL-37713 let phpunit bootstrap create test dataroot if necessary
2013-01-26 14:59:27 +01:00
Petr Škoda
9226ec1939
MDL-37666 fix comment describing IE CSS limitations
2013-01-25 20:20:04 +01:00
Petr Škoda
231b022777
MDL-37407 add support for zh_cn unicode unzip
2013-01-25 15:55:52 +01:00
Petr Škoda
96846ef18b
MDL-37640 close all zip archives after use in unit tests
2013-01-25 12:46:58 +01:00
Colin Chambers
2a22be64ee
MDL-32750 Question: make the html editor tools collapsible
2013-01-25 11:17:41 +00:00
Dan Poltawski
dec70f2599
Revert "MDL-32652 - Make block drag-drop work throughout Moodle"
...
This reverts commit d7c29c22572314680350ccdcf801f188aca541e4.
2013-01-25 11:52:15 +08:00
David Mudrák
df5d245a05
MDL-37677 Do not display debug info about obsolete string manager caches
2013-01-24 23:14:16 +01:00
David Mudrák
34424d4c8b
MDL-37673 Fix core_groupdata cache definition
2013-01-24 22:52:10 +01:00
Andrew Robert Nicols
0739873052
MDL-37548 Show the incorrect value in a colour picker after validation
2013-01-24 09:23:38 +00:00
Mark Nelson
93cc145f88
MDL-37082 core_course: include details of deprecation in the upgrade.txt file
2013-01-23 15:55:04 +08:00
Aparup Banerjee
46112c0277
Merge branch 'MDL-37100-master' of git://github.com/ankitagarwal/moodle
...
Conflicts:
version.php
2013-01-23 14:57:45 +08:00
David Monllao
1150aeb896
MDL-37458 testing: Removing wrong comments
2013-01-23 13:23:08 +08:00
Dan Poltawski
0a93b3127f
Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle
2013-01-23 08:53:02 +08:00
Sam Hemelryk
8c35fcdcd9
Merge branch 'MDL-34435-master' of git://github.com/FMCorz/moodle
...
Conflicts:
version.php
2013-01-23 11:08:55 +13:00
Sam Hemelryk
9d98cb9f17
Merge branch 'wip-MDL-34436-master' of git://github.com/phalacee/moodle
2013-01-23 09:54:36 +13:00
Frederic Massart
31a783303e
MDL-29749 phpunit: Windows dir uses backslashes
2013-01-22 16:24:35 +01:00
Mark Nelson
a347aee32e
MDL-37082 core_course: create new course_delete_module function that handles the whole deletion process
...
Instead of repeating code all over the place because the original function delete_course_module only partially deletes data, we now place all the functionality needed to delete a module here.
2013-01-22 17:05:16 +08:00
Dan Poltawski
d7687c3a23
Merge branch 'w03_MDL-37257_m25_enrolsettings' of git://github.com/skodak/moodle
2013-01-22 15:37:36 +08:00
Dan Poltawski
011ee6742f
Merge branch 'MDL-37426-m' of git://github.com/andrewnicols/moodle
2013-01-22 12:41:12 +08:00
Dan Poltawski
f5ba8b0f03
Merge branch 'w03_MDL-37593_m25_httpslogineditor' of git://github.com/skodak/moodle
2013-01-22 12:35:54 +08:00
Sam Hemelryk
59573bb447
MDL-36621 calendar: fixed up conflict error
2013-01-22 16:35:48 +13:00
Sam Hemelryk
36546841f1
Merge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle
...
Conflicts:
calendar/lib.php
lib/db/caches.php
version.php
2013-01-22 16:35:03 +13:00
Dan Poltawski
68a6d87684
Merge branch 'MDL-37473' of git://github.com/srynot4sale/moodle
2013-01-22 11:14:19 +08:00
Aparup Banerjee
60f95aad6c
Merge branch 'MDL-37585' of git://github.com/timhunt/moodle
2013-01-22 11:08:16 +08:00
Eloy Lafuente (stronk7)
37027f431b
Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle
2013-01-21 23:26:35 +01:00
Eloy Lafuente (stronk7)
fa669c49ad
Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle
2013-01-21 20:08:12 +01:00
Eloy Lafuente (stronk7)
6ee4df92ab
Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle
2013-01-21 19:41:45 +01:00
Tim Hunt
74fa94b26a
MDL-37585 Make $DB->set_debug(true) show run time of each query.
2013-01-21 08:48:15 +00:00
Petr Škoda
1764cd8e6f
MDL-37593 use https for editor script if required
2013-01-21 09:40:15 +01:00
Dan Poltawski
77ea8340de
Merge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle
2013-01-21 11:14:38 +08:00
Ankit Agarwal
793d38552a
MDL-37100 webservices: Define core_calendar_get_calendar_events() api
2013-01-21 11:05:50 +08:00
Ankit Agarwal
475896bdbc
MDL-37100 webservices: Implement core_calendar_get_calendar_events()
2013-01-21 11:05:50 +08:00
Dan Poltawski
73ce4ac996
Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle
2013-01-21 10:53:12 +08:00
Dan Poltawski
b77cce5c5c
Merge branch 'MDL-30769_iframe' of git://github.com/rwijaya/moodle
2013-01-21 10:25:42 +08:00
Dan Poltawski
be576cb0e8
Merge branch 'wip-mdl-36674' of git://github.com/rajeshtaneja/moodle
2013-01-21 10:15:16 +08:00
Dan Poltawski
94abbef12f
Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle
2013-01-21 09:59:35 +08:00
Dan Poltawski
2f61796c26
Merge branch 'w03_MDL-36809_m25_mysqlipers' of git://github.com/skodak/moodle
2013-01-21 09:04:57 +08:00