d9a3d932db
Merge branch 'MDL-37397-m' of git://github.com/andrewnicols/moodle
2013-01-14 11:04:52 +13:00
8743aabca0
MDL-37397 Test for a valid select in formautosubmit
...
Ideally we shouldn't get into this situation, but in cases where the
generated select element is incorrectly configured, we should try and
handle it gracefully with a warning.
2013-01-11 11:49:44 +00:00
b64a33bade
fix permissions
2013-01-11 12:23:22 +01:00
92b00c32a7
MDL-37420 rework pg schema testing
2013-01-11 02:12:38 +01:00
1017426c26
MDL-32639 phpunit: Hack not to fail on debugging
2013-01-09 11:48:44 +08:00
a0af8cb8c3
Merge branch 'wip-MDL-37404-master' of git://github.com/marinaglancy/moodle
2013-01-09 14:35:09 +13:00
f9f750cecc
Merge branch 'w51_MDL-37420_m25_pgschema' of git://github.com/skodak/moodle
2013-01-09 01:32:09 +01:00
e801c74c54
Merge branch 'w51_MDL-37183_m25_excelcleanup' of git://github.com/skodak/moodle
2013-01-08 23:30:19 +01:00
ac4c7aed68
Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle
...
Conflicts:
lib/odslib.class.php
2013-01-08 23:11:54 +01:00
3913743aa3
Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle
2013-01-09 10:20:46 +13:00
f44e7d0a77
Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
...
Conflicts:
user/view.php
2013-01-09 09:34:22 +13:00
4f90540e0c
Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle
2013-01-08 18:01:43 +01:00
6ad8d762da
MDL-37420 add support for more PostgreSQL schemas
2013-01-08 17:12:31 +01:00
a74c3851f7
Merge branch 'w51_MDL-37284_m25_mysqlutf8' of git://github.com/skodak/moodle
2013-01-08 11:39:23 +01:00
cf78070a63
Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle
2013-01-08 10:34:04 +01:00
b315a45274
Merge branch 'w51_MDL-37323_m25_dlgstrings' of git://github.com/skodak/moodle
2013-01-08 10:21:50 +01:00
6c74a228f3
Merge branch 'wip_master_mdl-3941_add_support_for_LDAP_TLS' of git://github.com/iarenaza/moodle
2013-01-08 16:40:50 +08:00
655b566b9e
Merge branch 'w51_MDL-37299_m25_manselfprogress' of git://github.com/skodak/moodle
2013-01-08 15:08:05 +08:00
1a12cbd9df
Merge branch 'w51_MDL-35685_m25_capinit_b' of git://github.com/skodak/moodle
2013-01-08 14:50:29 +08:00
bfb5580f92
Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle
2013-01-08 14:46:14 +08:00
c37c9e760d
Merge branch 'w51_MDL-37125_m25_yui380' of git://github.com/skodak/moodle
2013-01-08 14:29:32 +08:00
397e4ecf76
Merge branch 'w51_MDL-37282_m25_tinymce358' of git://github.com/skodak/moodle
2013-01-08 14:26:52 +08:00
87ffc3fb69
Merge branch 'MDL-27901-master' of git://github.com/FMCorz/moodle
2013-01-08 13:01:00 +08:00
3dab21591d
Merge branch 'w51_MDL-21116_m52_reversedel' of git://github.com/skodak/moodle
2013-01-08 12:58:16 +08:00
f858088cc4
Merge branch 'w51_MDL-37191_m25_plugindelete' of git://github.com/skodak/moodle
2013-01-08 11:16:43 +08:00
a1d9f433ec
Merge branch 'w51_MDL-37301_m25_coursecatinfoas' of git://github.com/skodak/moodle
2013-01-08 10:26:44 +08:00
36b6340532
Merge branch 'w51_MDL-37254_m25_courseinfoas' of git://github.com/skodak/moodle
2013-01-08 10:24:01 +08:00
c4c1504b44
Merge branch 'w51_MDL-35893_m25_perfinstall' of git://github.com/skodak/moodle
2013-01-08 14:00:44 +13:00
27efa6bfac
MDL-37404 add class 'format-xxx' to the body for the current course format
2013-01-08 11:50:01 +11:00
70601b9433
Merge branch 'w51_MDL-21342_m25_lockout' of git://github.com/skodak/moodle
2013-01-08 10:56:39 +13:00
8d21130267
MDL-29996 cleanup filter plugin info
2013-01-07 12:42:13 +01:00
6f4cf4656e
Merge branch 'MDL-35230-master' of git://github.com/andrewnicols/moodle
2013-01-07 13:41:16 +08:00
b8459c0267
MDL-29996 filters: fixed bug when upgrading filter plugin names
2013-01-07 17:40:41 +13:00
dd89f61e68
Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle
2013-01-07 15:22:37 +13:00
1bdc017f42
Merge branch 'w51_MDL-36212_m25_entities' of git://github.com/skodak/moodle
2013-01-07 13:45:15 +13:00
9fa3979c15
Merge branch 'w51_MDL-37105_m25_catlimit' of git://github.com/skodak/moodle
2013-01-07 09:53:06 +13:00
083d5f8a48
Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle
2013-01-07 09:15:53 +13:00
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
c4844bf45c
MDL-21342 deprecate unused login functions
2013-01-04 15:17:14 +01:00
b28247fe90
MDL-21342 add user login lockout
2013-01-04 15:12:31 +01:00
bc5d899510
MDL-35893 do not track performance before installation
2013-01-01 15:50:26 +01:00
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
0662bd677c
MDL-29996 remove deprecated stuff from filter code
2012-12-30 17:02:18 +01:00
fba0abdc22
MDL-29996 remove legacy_filter support
2012-12-30 12:44:43 +01:00
d8e74f5be7
MDL-29996 remove unnecessary signed tricks
2012-12-30 12:44:42 +01:00
5d549ffc8c
MDL-37299 use progress_trace in enrol_manual and enrol_self sync
2012-12-29 21:50:32 +01:00
bb900d139c
MDL-37105 prevent fatal error when category limit reached
2012-12-27 13:52:14 +01:00
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
51feee1f64
Merge branch 'w51_MDL-37283_m25_spell' of git://github.com/skodak/moodle
2012-12-24 10:35:33 +08:00
eaf750cd9a
Merge branch 'wip-MDL-35833-master' of git://github.com/phalacee/moodle
2012-12-24 11:43:59 +13:00
Sam Hemelryk