d86c7206aa
MDL-40912 coursecat: replaced 'move' add_to_log calls with an event
2014-01-14 19:24:14 -08:00
c4cea8cb5d
MDL-40912 coursecat: replaced 'update' add_to_log call with an event
2014-01-14 19:24:14 -08:00
03ea10e6d3
MDL-40912 coursecat: replaced 'add' add_to_log call with an event
2014-01-14 19:24:08 -08:00
19c32aacea
Merge branch 'MDL-43439_master-dateformat' of git://github.com/dmonllao/moodle
2014-01-15 03:59:51 +01:00
8acec2a693
MDL-43306 restore: Fix grade_item sortorder after restoring course
...
While restoring course/activity, restore will blindly insert grade_item
sortorder. Which cause dulicate sortorder and lead to unpredicatble sorting
results.
Now we will call grade_item::fix_duplicate_sortorder() after restore is finished
to fix duplicate sortorder and order grade items to the closest order possible
2014-01-15 10:28:00 +08:00
7508094a87
Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle
2014-01-15 09:39:03 +08:00
4234011a1a
MDL-43439 behat: Dir date without - separators
2014-01-15 09:17:44 +08:00
852c34e509
Merge branch 'MDL-43619-master' of git://github.com/sammarshallou/moodle
2014-01-15 08:19:49 +08:00
75bdb2bfc7
Merge branch 'MDL-43439_master' of git://github.com/dmonllao/moodle
2014-01-15 00:03:34 +01:00
7d4c752e31
Merge branch 'w02_MDL-43524_m27_textcaching' of https://github.com/skodak/moodle
2014-01-14 22:08:46 +01:00
7f964cfdc7
MDL-43621 badges: Don't display deleted users in badge recipients list
2014-01-15 09:31:45 +13:00
da47e297da
Merge branch '35597-27' of git://github.com/samhemelryk/moodle
2014-01-14 16:39:00 +01:00
1b92203ef3
Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle
2014-01-14 16:01:27 +01:00
0f1882ed1f
MDL-43619 Roles: reset_role_capabilities unit test, cache fix
2014-01-14 13:46:25 +00:00
3978da9e2f
MDL-43619 Roles: reset_role_capabilities function destroys overrides
2014-01-14 13:46:24 +00:00
473924dfd5
Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle
2014-01-14 16:50:07 +08:00
718f42ae68
Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle
2014-01-14 16:21:21 +08:00
00ae4c4ead
Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle
2014-01-14 15:36:58 +08:00
5c0dfe32eb
MDL-43439 behat: Save the screenshots to the specified location
2014-01-14 15:17:28 +08:00
88457992ba
Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle
2014-01-14 14:46:55 +08:00
f27e462b5f
Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle
2014-01-14 14:23:06 +08:00
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
19a40b1468
MDL-43461 behat: Using linux-style directory separators when using cygwin
2014-01-14 13:10:40 +08:00
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
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
753b71c775
MDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption().
2014-01-13 21:29:23 +01:00
c33eb444fc
Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle
2014-01-13 19:10:13 +01:00
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
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
3ef74a63a6
Merge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle
2014-01-13 12:11:17 +08:00
f6652bc750
Merge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle
2014-01-13 08:54:22 +08:00
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
d9bf4be487
MDL-43598 dialogue: fixed bug with render procedure
2014-01-13 08:27:46 +13:00
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
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
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
cea3b7eb76
MDL-35597 admin: categories now support localised alphabetical sorting
2014-01-13 08:12:42 +13:00
460b5b791f
MDL-43537 remove environemnt checks and strings that are not used any more
2014-01-12 18:02:46 +08:00
6a27439b8f
MDL-43529 delete all unnecessary register_globals checks
2014-01-12 17:58:39 +08:00
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
3ec07614ba
MDL-43439: Behat - new $CFG param - behat_screenshot_after_failure
2014-01-10 17:54:53 +08:00
b47b3c58e0
MDL-36721 make upgrade queries cross-db
2014-01-10 11:17:23 +08:00
b5154feacc
MDL-40119 Forms: Remove cursor style override for calendar button
2014-01-08 11:13:37 +01:00
d68829aac0
Merge branch 'MDL-43423_master-increase-timeout' of git://github.com/dmonllao/moodle
2014-01-08 09:55:08 +01:00
845ceaff9f
MDL-43423 behat: Increasing the timeout to 6 seconds
2014-01-08 16:51:17 +08:00
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
7de1b42f55
Merge branch 'wip-MDL-43606-master' of git://github.com/marinaglancy/moodle
2014-01-08 14:32:57 +08:00
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
343534a855
MDL-41810 badges: Remove hardcoded references to backpack.openbadges.org
2014-01-08 14:55:30 +13:00
ab7f498343
Merge branch 'MDL-40119-master' of git://github.com/andrewnicols/moodle
2014-01-08 02:15:03 +01:00
Mark Nelson