Commit graph

14829 commits

Author SHA1 Message Date
Dan Poltawski
bfb5580f92 Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle 2013-01-08 14:46:14 +08:00
Dan Poltawski
c37c9e760d Merge branch 'w51_MDL-37125_m25_yui380' of git://github.com/skodak/moodle 2013-01-08 14:29:32 +08:00
Dan Poltawski
397e4ecf76 Merge branch 'w51_MDL-37282_m25_tinymce358' of git://github.com/skodak/moodle 2013-01-08 14:26:52 +08:00
Dan Poltawski
87ffc3fb69 Merge branch 'MDL-27901-master' of git://github.com/FMCorz/moodle 2013-01-08 13:01:00 +08:00
Dan Poltawski
3dab21591d Merge branch 'w51_MDL-21116_m52_reversedel' of git://github.com/skodak/moodle 2013-01-08 12:58:16 +08:00
Dan Poltawski
f858088cc4 Merge branch 'w51_MDL-37191_m25_plugindelete' of git://github.com/skodak/moodle 2013-01-08 11:16:43 +08:00
Dan Poltawski
a1d9f433ec Merge branch 'w51_MDL-37301_m25_coursecatinfoas' of git://github.com/skodak/moodle 2013-01-08 10:26:44 +08:00
Dan Poltawski
36b6340532 Merge branch 'w51_MDL-37254_m25_courseinfoas' of git://github.com/skodak/moodle 2013-01-08 10:24:01 +08:00
Sam Hemelryk
c4c1504b44 Merge branch 'w51_MDL-35893_m25_perfinstall' of git://github.com/skodak/moodle 2013-01-08 14:00:44 +13:00
Sam Hemelryk
70601b9433 Merge branch 'w51_MDL-21342_m25_lockout' of git://github.com/skodak/moodle 2013-01-08 10:56:39 +13:00
Petr Škoda
8d21130267 MDL-29996 cleanup filter plugin info 2013-01-07 12:42:13 +01:00
Dan Poltawski
6f4cf4656e Merge branch 'MDL-35230-master' of git://github.com/andrewnicols/moodle 2013-01-07 13:41:16 +08:00
Sam Hemelryk
b8459c0267 MDL-29996 filters: fixed bug when upgrading filter plugin names 2013-01-07 17:40:41 +13:00
Sam Hemelryk
dd89f61e68 Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle 2013-01-07 15:22:37 +13:00
Sam Hemelryk
1bdc017f42 Merge branch 'w51_MDL-36212_m25_entities' of git://github.com/skodak/moodle 2013-01-07 13:45:15 +13:00
Sam Hemelryk
9fa3979c15 Merge branch 'w51_MDL-37105_m25_catlimit' of git://github.com/skodak/moodle 2013-01-07 09:53:06 +13:00
Sam Hemelryk
083d5f8a48 Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle 2013-01-07 09:15:53 +13:00
Petr Škoda
c4844bf45c MDL-21342 deprecate unused login functions 2013-01-04 15:17:14 +01:00
Petr Škoda
b28247fe90 MDL-21342 add user login lockout 2013-01-04 15:12:31 +01:00
Petr Škoda
bc5d899510 MDL-35893 do not track performance before installation 2013-01-01 15:50:26 +01:00
Petr Škoda
0662bd677c MDL-29996 remove deprecated stuff from filter code 2012-12-30 17:02:18 +01:00
Petr Škoda
fba0abdc22 MDL-29996 remove legacy_filter support 2012-12-30 12:44:43 +01:00
Petr Škoda
d8e74f5be7 MDL-29996 remove unnecessary signed tricks 2012-12-30 12:44:42 +01:00
Petr Škoda
bb900d139c MDL-37105 prevent fatal error when category limit reached 2012-12-27 13:52:14 +01:00
Petr Škoda
dd9cd338cf MDL-37301 fix missing AS in select
This was breaking pg 8.3. Credit goes to Thomas Robb, thanks.
2012-12-26 22:25:24 +01:00
Dan Poltawski
51feee1f64 Merge branch 'w51_MDL-37283_m25_spell' of git://github.com/skodak/moodle 2012-12-24 10:35:33 +08:00
Sam Hemelryk
eaf750cd9a Merge branch 'wip-MDL-35833-master' of git://github.com/phalacee/moodle 2012-12-24 11:43:59 +13:00
Sam Hemelryk
486c53f25c Merge branch 'wip-mdl-37015' of git://github.com/rajeshtaneja/moodle 2012-12-24 10:55:31 +13:00
Petr Škoda
f092d92004 MDL-21116 drop plugin tables in opposite order
This should help with foreign key in the future.
2012-12-22 19:01:00 +01:00
Petr Škoda
48d2e1117f MDL-37283 import tinymce spellchecker 2.0.6.1 2012-12-22 16:44:55 +01:00
Petr Škoda
d10f3e9fef MDL-37282 import TinyMCE 3.5.8 2012-12-22 16:24:20 +01:00
Petr Škoda
171215d465 MDL-37254 add missing AS keyword 2012-12-22 14:11:22 +01:00
Petr Škoda
3db309dcc4 MDL-37191 do not timeout when uninstalling plugins 2012-12-21 15:58:25 +01:00
Petr Škoda
7539894649 MDL-36212 rework html entity conversions
This should resolve all html entity conversion problems in different PHP versions.
2012-12-20 22:47:16 +01:00
Petr Škoda
6846f033a9 MDL-37125 import latest YUI 3.8.0 2012-12-20 22:31:51 +01:00
Jason Fowler
d01176bfc9 MDL-35833 - Blocks - Adding alt and title attributes to the docked-block panel close button 2012-12-20 10:42:20 +08:00
Rajesh Taneja
e5ad278a94 MDL-37015 Resource: link in onclick should not contain html special char 2012-12-20 10:21:36 +08:00
Dan Poltawski
b93e0af3fe Revert "MDL-36704: wrap pending conditions in span tags"
This reverts commit 5e9fd83df8.
2012-12-20 08:45:04 +08:00
Eloy Lafuente (stronk7)
917169221f Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle 2012-12-18 23:41:48 +01:00
Dan Poltawski
86575fa709 Merge branch 'MDL-36704-master' of git://github.com/sammarshallou/moodle 2012-12-18 14:57:43 +08:00
Dan Poltawski
3280819b20 Merge branch 'MDL-30899_master' of git://github.com/dmonllao/moodle 2012-12-18 09:10:42 +08:00
Eloy Lafuente (stronk7)
7039c823dc Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle 2012-12-18 00:13:45 +01:00
Sam Hemelryk
9674194eec Merge branch 'w50_MDL-36475_m25_zindexesgrrr' of git://github.com/skodak/moodle 2012-12-18 10:43:00 +13:00
Sam Hemelryk
a483113178 Merge branch 'MDL-37176' of git://github.com/stronk7/moodle 2012-12-18 10:12:37 +13:00
Sam Hemelryk
740f635b79 Merge branch 'MDL-29733_master' of git://github.com/andyjdavis/moodle 2012-12-18 09:42:26 +13:00
David Monllao
9e8961e76f MDL-30899 moodle-enrol-notification Overridding default footer padding 2012-12-17 15:39:19 +08:00
Dan Poltawski
62347c883b Merge branch 'w50_MDL-36493_m25_mysql' of git://github.com/skodak/moodle 2012-12-17 15:28:39 +08:00
Dan Poltawski
f136e27f15 Merge branch 'MDL-37034-CategoryNavigationKey' of https://github.com/iamandrew/moodle 2012-12-17 15:21:31 +08:00
Dan Poltawski
dfa45f7ddc Merge branch 'w50_MDL-36597_m25_courselang' of git://github.com/skodak/moodle 2012-12-17 13:51:32 +08:00
Dan Poltawski
bfcbbc9833 Merge branch 'wip-MDL-35874-master' of git://github.com/phalacee/moodle 2012-12-17 11:52:55 +08:00