Damyon Wiese
f27e462b5f
Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle
2014-01-14 14:23:06 +08:00
David Monllao
ff7139d6cb
MDL-43461 testing: Avoid switching to .bat files when running MinGW
...
MinGW can not execute .bat files (http://sourceforge.net/p/mingw/bugs/1902 )
so we should not switch to .bat files when running MinGW.
2014-01-14 13:11:07 +08:00
David Monllao
19a40b1468
MDL-43461 behat: Using linux-style directory separators when using cygwin
2014-01-14 13:10:40 +08:00
Petr Škoda
62c8032509
MDL-34347 remove all problematic global text caching
...
Instead we will create new MUC caches inside each filter plugin.
Please note that all cache filters should work with local caches
without the need of strict cache invalidation.
2014-01-14 10:49:23 +08:00
Andrew Nicols
06acdf04f6
MDL-43664 Javascript: Use YUI indexOf for pending_js tracking
...
Some old browsers do not support indexOf and so cannot determine whether JS
script is in progress. The YUI Y.Array module polyfills the indexOf
functionality when it does not exist.
2014-01-14 10:39:06 +08:00
Matteo Scaramuccia
753b71c775
MDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption().
2014-01-13 21:29:23 +01:00
Eloy Lafuente (stronk7)
c33eb444fc
Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle
2014-01-13 19:10:13 +01:00
Dan Poltawski
d1426e2843
Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assignment/lang/en/assignment.php
2014-01-13 12:55:36 +08:00
Dan Poltawski
8c0ddd430a
Merge branch '43598-43262-27' of git://github.com/samhemelryk/moodle
...
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
lib/yui/src/notification/js/dialogue.js
2014-01-13 12:42:13 +08:00
Dan Poltawski
3ef74a63a6
Merge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle
2014-01-13 12:11:17 +08:00
Dan Poltawski
f6652bc750
Merge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle
2014-01-13 08:54:22 +08:00
Dan Poltawski
c582565a06
MDL-43395 dml: warn about invalid limit params
...
Help developers to find bugs by throwing a DEBUG_DEVELOPER message
rather than ignoring this case completely.
2014-01-13 08:42:07 +08:00
Sam Hemelryk
d9bf4be487
MDL-43598 dialogue: fixed bug with render procedure
2014-01-13 08:27:46 +13:00
Andrew Nicols
a67233e76f
MDL-43262 JavaScript: Correct use of centered attribute override
...
This should be done using an attribute modification, rather than at the
constructor level.
2014-01-13 08:26:28 +13:00
Andrew Nicols
c46cca4f94
MDL-43262 JavaScript: Correct visible attribute override
...
This should be done using an attribute modification, rather than at the
constructor level.
2014-01-13 08:26:28 +13:00
Andrew Nicols
16d024348a
MDL-43262 JavaScript: Correct width attribute override
...
This should be done using an attribute modification, rather than at the
constructor level.
2014-01-13 08:26:28 +13:00
Sam Hemelryk
cea3b7eb76
MDL-35597 admin: categories now support localised alphabetical sorting
2014-01-13 08:12:42 +13:00
Petr Škoda
460b5b791f
MDL-43537 remove environemnt checks and strings that are not used any more
2014-01-12 18:02:46 +08:00
Petr Škoda
6a27439b8f
MDL-43529 delete all unnecessary register_globals checks
2014-01-12 17:58:39 +08:00
David Monllao
14ebd16390
MDL-43584 behat: Removing DB calls from step definitions as much as possible
...
Old methods deprecated as the expected arguments
have changed.
2014-01-10 18:25:44 +08:00
Damyon Wiese
3ec07614ba
MDL-43439: Behat - new $CFG param - behat_screenshot_after_failure
2014-01-10 17:54:53 +08:00
Eloy Lafuente (stronk7)
b47b3c58e0
MDL-36721 make upgrade queries cross-db
2014-01-10 11:17:23 +08:00
Andrew Nicols
b5154feacc
MDL-40119 Forms: Remove cursor style override for calendar button
2014-01-08 11:13:37 +01:00
Eloy Lafuente (stronk7)
d68829aac0
Merge branch 'MDL-43423_master-increase-timeout' of git://github.com/dmonllao/moodle
2014-01-08 09:55:08 +01:00
David Monllao
845ceaff9f
MDL-43423 behat: Increasing the timeout to 6 seconds
2014-01-08 16:51:17 +08:00
Damyon Wiese
40cb48792a
MDL-33952 Assignment - bon voyage!
...
mod_assignment has been replaced with a stub that only exists to support restoring and
auto upgrading to mod_assign. If you require mod_assignment for some old plugin, then
overwrite with the 2.6 version manually.
2014-01-08 14:51:06 +08:00
Dan Poltawski
7de1b42f55
Merge branch 'wip-MDL-43606-master' of git://github.com/marinaglancy/moodle
2014-01-08 14:32:57 +08:00
Marina Glancy
c6cd067f14
MDL-43606 tinymce_managefiles: bump version
...
to allow smooth upgrade from contributed plugin in 2.5
2014-01-08 13:58:41 +08:00
Yuliya Bozhko
343534a855
MDL-41810 badges: Remove hardcoded references to backpack.openbadges.org
2014-01-08 14:55:30 +13:00
Eloy Lafuente (stronk7)
ab7f498343
Merge branch 'MDL-40119-master' of git://github.com/andrewnicols/moodle
2014-01-08 02:15:03 +01:00
Dan Poltawski
267d4927b4
Merge branch 'MDL-43173_master' of git://github.com/dmonllao/moodle
2014-01-08 08:21:06 +08:00
Eloy Lafuente (stronk7)
b8a8f3dd01
Merge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle
2014-01-08 00:39:15 +01:00
Eloy Lafuente (stronk7)
78b31176cb
Merge branch 'w01_MDL-43515_m27_phpunitdocs' of https://github.com/skodak/moodle
2014-01-08 00:13:28 +01:00
Eloy Lafuente (stronk7)
7ad46ac29d
Merge branch 'w01_MDL-43503_m27_pagedldap' of https://github.com/skodak/moodle
2014-01-07 23:40:51 +01:00
Eloy Lafuente (stronk7)
b3b1b18a4f
Merge branch 'MDL-43451-master' of git://github.com/andrewnicols/moodle
2014-01-07 23:32:38 +01:00
Dan Poltawski
7d374cdf4a
Merge branch 'w01_MDL-43510_m27_test404' of https://github.com/skodak/moodle
2014-01-07 17:28:15 +08:00
Damyon Wiese
8af52d3188
Merge branch 'MDL-34356-master' of git://github.com/andrewnicols/moodle
2014-01-07 16:57:49 +08:00
Dan Poltawski
25294dd466
MDL-43481 lib: minor cleanups to commands
...
And remove unused strings - thanks to Simon Coggins!
2014-01-07 15:48:06 +08:00
Dan Poltawski
6d0796942b
Merge branch 'w01_MDL-43481_m27_passwords' of https://github.com/skodak/moodle
2014-01-07 15:46:59 +08:00
Dan Poltawski
899ca7632f
Merge branch 'MDL-43489-master' of git://github.com/andrewnicols/moodle
2014-01-07 13:48:49 +08:00
Dan Poltawski
4e5fb5bec1
Merge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle
2014-01-07 12:42:33 +08:00
Damyon Wiese
e011f229a8
Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle
2014-01-07 12:29:45 +08:00
Damyon Wiese
3a145daba4
Merge branch 'MDL-43490-master' of git://github.com/andrewnicols/moodle
2014-01-07 12:26:01 +08:00
Damyon Wiese
de47c9c81b
Merge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/moodle
2014-01-07 12:22:49 +08:00
Sam Hemelryk
c68fbad68a
MDL-43526 category: added restore course link to admin structure
2014-01-07 12:08:34 +08:00
Sam Hemelryk
39bd07f732
MDL-43526 course: links to restore from management and admin structure.
2014-01-07 12:08:34 +08:00
Dan Poltawski
812cc702ad
Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle
2014-01-07 11:51:15 +08:00
Dan Poltawski
a6b4b3350f
Merge branch 'MDL-43394a' of https://github.com/srynot4sale/moodle
2014-01-07 10:59:40 +08:00
Dan Poltawski
62bfe6202e
Merge branch 'MDL-43323-master' of git://github.com/andrewnicols/moodle
2014-01-07 10:34:40 +08:00
Frederic Massart
686e3b3ae0
MDL-39661 blocks: More verbose move-block-here descriptions
2014-01-06 12:51:44 +01:00