15008 Commits

Author SHA1 Message Date
Dan Poltawski
655b566b9e Merge branch 'w51_MDL-37299_m25_manselfprogress' of git://github.com/skodak/moodle 2013-01-08 15:08:05 +08:00
Dan Poltawski
1a12cbd9df Merge branch 'w51_MDL-35685_m25_capinit_b' of git://github.com/skodak/moodle 2013-01-08 14:50:29 +08:00
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
Jason Fowler
0232fa7b32 MDL-30316 - Libraries - improving pagination output to allow a shifting start page for displays of less than 18 pages -- original code provided by Martha (martha dot morelos at gmail dot com) 2013-01-08 14:02:06 +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
Paul Nicholls
a0dc7da9b4 MDL-29835: filemanager - zero means zero, not unlimited
The form_filemanager constructor was using empty() rather than !isset(),
so overwrote maxfiles=0 with the default (-1).  In addition, the JS UI
treated 0 as unlimited - but the non-JS fallback UI treated it as zero.
This would result in a file manager which allowed files to be
chosen/uploaded, which would then vanish into the void when the backend
saw that the maximum number of files was 0.
2013-01-08 15:12:50 +13: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
Marina Glancy
27efa6bfac MDL-37404 add class 'format-xxx' to the body for the current course format 2013-01-08 11:50:01 +11: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
Sam Hemelryk
7f30a6449b MDL-34344 config: added unit tests for get_config 2013-01-08 09:52:19 +13:00
Petr Škoda
8d21130267 MDL-29996 cleanup filter plugin info 2013-01-07 12:42:13 +01:00
Sam Hemelryk
007bfe8b4d MDL-25290 conversion: Converted config to use MUC 2013-01-07 19:22:40 +13: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
Jerome Mouneyrac
9a4c2f50c9 MDL-37355 object are automatically cast into object by the return value 2013-01-07 11:12:32 +08: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
8e7591654a MDL-35356 improve worksheet exports
This patch removes deprecated PEAR excel export lib in favour of newer PHPExcel,
the ODS exporter implementation is finished and a test script is included.

The default Excel format is now 2007, file extension is changed automatically
to match excel format.
2013-01-06 18:15:20 +01: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
Sam Hemelryk
e85c56ccb8 MDL-36297 caching: added for HTML purified text 2013-01-03 10:55:00 +13:00
Petr Škoda
bc5d899510 MDL-35893 do not track performance before installation 2013-01-01 15:50:26 +01:00
Petr Škoda
97155c387d MDL-37323 add support for _dlg strings in our TinyMCE subplugins
Credit goes to Étienne FLORENT, thanks.
2013-01-01 15:25:43 +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
5d549ffc8c MDL-37299 use progress_trace in enrol_manual and enrol_self sync 2012-12-29 21:50:32 +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
9d0ded6697 MDL-37284 fix mysql test for unicode compatibility 2012-12-22 18:42:55 +01:00
Tim Hunt
f187622a0d MDL-31616 block editing: show in subcontexts does not work on category pages.
Thanks to Ian David Wild for pointing to the proper fix.
2012-12-22 17:37:49 +00: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
017a713900 MDL-37152 remove bogus $mail->IsSMTP() breaking non-smtp mailing
Credit goes to Aurelijus Bruzas, thanks.
2012-12-22 14:46:44 +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
2c4bccd5b8 MDL-35685 attempt to improve slow USER access array init 2012-12-20 22:51:29 +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