Commit graph

19034 commits

Author SHA1 Message Date
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
Frederic Massart
0a8b3583ca MDL-42995 libraries: Global function to strip pluginfile content 2014-01-06 09:29:25 +01:00
Damyon Wiese
5490662ade Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle
Conflicts:
	course/dnduploadlib.php
2014-01-06 15:48:31 +08:00
Damyon Wiese
9f83e42fe3 Merge branch 'w01_MDL-36721_m27_passlog' of https://github.com/skodak/moodle 2014-01-06 14:52:56 +08:00
Dan Poltawski
73ee2fda6b MDL-41690 course: remove use of deprecated functions 2014-01-06 10:45:59 +08:00
Dan Poltawski
07e78d935f MDL-41690 cm_info: deprecate various properties 2014-01-06 10:45:59 +08:00
Sam Hemelryk
7c445ab8c0 Merge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/moodle 2014-01-06 14:46:31 +13:00
Sam Hemelryk
8e06909afd Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle 2014-01-06 14:19:11 +13:00
Sam Hemelryk
98f0074fc5 Merge branch 'MDL-31050_rss' of https://github.com/andyjdavis/moodle 2014-01-06 14:16:26 +13:00
Sam Hemelryk
61a79e01fc Merge branch 'MDL-40551_master' of https://github.com/totara/openbadges
Conflicts:
	badges/upgrade.txt
2014-01-06 12:00:11 +13:00
Sam Hemelryk
a9bd004c8c Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle 2014-01-06 11:28:34 +13:00
Sam Hemelryk
9b94e327d3 Merge branch 'MDL-43281-master' of git://github.com/andrewnicols/moodle 2014-01-06 11:22:29 +13:00
Sam Hemelryk
dfed81ae12 Merge branch 'MDL-36334-master' of git://github.com/andrewnicols/moodle 2014-01-06 09:53:15 +13:00
Sam Hemelryk
7404bfd003 Merge branch 'w01_MDL-43196_m27_signupfiles' of https://github.com/skodak/moodle 2014-01-06 09:11:32 +13:00