59808 Commits

Author SHA1 Message Date
Petr Škoda
fe95fb5322 MDL-37782 reset DB after each failed database test 2013-03-24 14:16:28 +01:00
Damyon Wiese
373a8e052c weekly release 2.5dev 2013-03-22 13:38:50 +08:00
Damyon Wiese
39b041eca1 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-03-22 13:35:24 +08:00
David Monllao
371b7fc397 MDL-38414_master behat: Changing expand fieldsets test to forum form 2013-03-21 10:42:24 +08:00
AMOS bot
ba6e8f02f0 Automatically generated installer lang files 2013-03-21 00:37:26 +00:00
Eloy Lafuente (stronk7)
fedcc83016 Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle 2013-03-20 17:06:22 +01:00
sam marshall
acfee0d4ba MDL-38035 Conditional availability: Support multilang custom user fields 2013-03-20 15:57:53 +00:00
David Monllao
25919739fd MDL-38364 phpunit: PHPUnit autoload uses capital A 2013-03-20 16:02:40 +08:00
Damyon Wiese
c2eb74df47 Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/db/caches.php
	version.php
2013-03-20 14:08:55 +08:00
Damyon Wiese
f50867c424 Merge branch 'wip-MDL-38387-m25' of https://github.com/samhemelryk/moodle 2013-03-20 13:24:18 +08:00
Damyon Wiese
d7cea24b55 MDL-38373 Auth - Additional strict warning fix for radius authentication 2013-03-20 12:32:29 +08:00
Sam Hemelryk
7b9cb736ba MDL-38387 cache: removed call to plugins API from cache API 2013-03-20 16:07:25 +13:00
Sam Hemelryk
a3b63be703 MDL-38350 cache: fixed issue with siteidentifier === false 2013-03-20 16:07:25 +13:00
Sam Hemelryk
fe86ebfa4d MDL-38387 cache: fixed inifinite initialisation loop with site id 2013-03-20 16:07:25 +13:00
Damyon Wiese
80d852fa23 Merge branch 'MDL-38373' of git://github.com/stronk7/moodle 2013-03-20 11:05:38 +08:00
Eloy Lafuente (stronk7)
cfe6a96f0a Merge branch 'MDL-38470-m' of https://github.com/andrewnicols/moodle 2013-03-20 01:47:52 +01:00
Andrew Robert Nicols
c5952e06f1 MDL-38470 JavaScript: Rebuild moodle-core-tooltip with Shifter 2013-03-20 00:46:33 +00:00
Eloy Lafuente (stronk7)
99b3e4e7bd Merge branch 'MDL-38414-master' of git://github.com/FMCorz/moodle 2013-03-20 01:21:05 +01:00
Eloy Lafuente (stronk7)
dc1abf2bc4 Merge branch 'MDL-38330-master' of git://github.com/FMCorz/moodle 2013-03-20 01:19:17 +01:00
Eloy Lafuente (stronk7)
e6f94aaa11 MDL-38515 JavaScript: Partially revert 4f65d03b08
It was going to cause some continuous logging in the console
annoying developers on 2.5 all the time. It may be reintroduced
once filepickers are converted to proper YUI modules.
2013-03-20 01:02:45 +01:00
Eloy Lafuente (stronk7)
b2b54ad7fe Revert "MDL-38515 JavaScript: Correct module dependencies for core_filepicker"
This reverts commit babf34d5cfc7845e8f42b850a39646bf9a9c17c3.
2013-03-20 00:55:32 +01:00
Eloy Lafuente (stronk7)
8b994ec0b9 Merge branch 'MDL-38490' of git://github.com/timhunt/moodle 2013-03-20 00:43:09 +01:00
Eloy Lafuente (stronk7)
e233dc58ed Merge branch 'MDL-38416-master' of git://github.com/FMCorz/moodle 2013-03-20 00:34:52 +01:00
Eloy Lafuente (stronk7)
b35dd05521 Merge branch 'MDL-38370-master' of git://github.com/ankitagarwal/moodle 2013-03-20 00:30:49 +01:00
Eloy Lafuente (stronk7)
6a32219c84 Merge branch 'w12_MDL-38364_m25_phpunitloading' of git://github.com/skodak/moodle 2013-03-20 00:17:35 +01:00
Eloy Lafuente (stronk7)
044566f001 Merge branch 'MDL-38166-m' of git://github.com/andrewnicols/moodle 2013-03-20 00:13:51 +01:00
Eloy Lafuente (stronk7)
87b6981e25 MDL-38035 api: doc get_condition_user_fields() new param. 2013-03-20 00:09:43 +01:00
Eloy Lafuente (stronk7)
1d962a1984 Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle 2013-03-19 23:54:27 +01:00
Eloy Lafuente (stronk7)
354ec0691b Merge branch 'MDL-37664-master' of https://github.com/lucisgit/moodle 2013-03-19 23:31:21 +01:00
Eloy Lafuente (stronk7)
e73ac7692e Merge branch 'MDL-38433_master' of git://github.com/dmonllao/moodle 2013-03-19 23:27:50 +01:00
Eloy Lafuente (stronk7)
1d790031c2 Merge branch 'MDL-38411_master' of git://github.com/dmonllao/moodle 2013-03-19 23:26:01 +01:00
Eloy Lafuente (stronk7)
eb8a3eeaac Merge branch 'MDL-38410_master' of git://github.com/dmonllao/moodle 2013-03-19 23:20:31 +01:00
Eloy Lafuente (stronk7)
ec05fb8367 Merge branch 'MDL-38424_master' of git://github.com/kordan/moodle 2013-03-19 23:17:39 +01:00
Eloy Lafuente (stronk7)
85620106df Merge branch 'MDL-38418-master' of git://github.com/FMCorz/moodle 2013-03-19 23:15:04 +01:00
Eloy Lafuente (stronk7)
65b5f400b8 Merge branch 'MDL-38395' of git://github.com/timhunt/moodle 2013-03-19 23:06:06 +01:00
Eloy Lafuente (stronk7)
989b9ab6fb Merge branch 'MDL-38363' of git://github.com/timhunt/moodle 2013-03-19 21:02:48 +01:00
Eloy Lafuente (stronk7)
28a5cd942d Merge branch 'MDL-38355' of git://github.com/timhunt/moodle 2013-03-19 21:00:21 +01:00
Eloy Lafuente (stronk7)
e0e59a0c38 Merge branch 'w12_MDL-38558_m25_preupgrade' of git://github.com/skodak/moodle 2013-03-19 19:15:09 +01:00
Petr Škoda
6b4b74904b MDL-38558 add preupgrade script support
This is intended things like undoing of local hacks, it is similar to older pre 2.0 upgrade hack.
2013-03-19 19:14:01 +01:00
Eloy Lafuente (stronk7)
49ac0c5d6a Merge branch 'MDL-38388' of git://github.com/jonof/moodle 2013-03-19 18:47:39 +01:00
Eloy Lafuente (stronk7)
bab8a6724f Merge branch 'MDL-33680-m' of git://github.com/andrewnicols/moodle 2013-03-19 18:27:57 +01:00
Eloy Lafuente (stronk7)
bf2d2aa983 Merge branch 'MDL-38412' of git://github.com/timhunt/moodle 2013-03-19 18:20:47 +01:00
Eloy Lafuente (stronk7)
4e37889c41 Merge branch 'w12_MDL-38329_m25_webkit' of git://github.com/skodak/moodle 2013-03-19 18:17:11 +01:00
Eloy Lafuente (stronk7)
66f1870701 Merge branch 'w12_MDL-38180_m25_enrolpics' of git://github.com/skodak/moodle 2013-03-19 17:58:55 +01:00
Eloy Lafuente (stronk7)
58b9cd031f Merge branch 'MDL-38497-admintree-beforesibling' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/upgrade.txt
2013-03-19 17:16:32 +01:00
Eloy Lafuente (stronk7)
83ba845de9 Merge branch 'w12_MDL-38202_m25_loginas' of git://github.com/skodak/moodle 2013-03-19 16:51:45 +01:00
Eloy Lafuente (stronk7)
b81d5eab90 Merge branch 'MDL-38542' of git://github.com/timhunt/moodle 2013-03-19 16:48:37 +01:00
Eloy Lafuente (stronk7)
1e1815bead Merge branch 'MDL-38444' of https://github.com/ppichet/moodle 2013-03-19 16:33:28 +01:00
Tim Hunt
1736fe3f74 MDL-38542 shortanswer qtype: was broken for responses of '0'.
This was a regression caused by MDL-37157 & MDL-37746.
2013-03-19 13:40:51 +00:00
Eloy Lafuente (stronk7)
7c27e34742 Merge branch 'MDL-38507-m' of git://github.com/andrewnicols/moodle 2013-03-19 13:31:46 +01:00