Eloy Lafuente (stronk7)
f38ac3510a
Merge branch 'w02_MDL-37483_m25_redirect' of git://github.com/skodak/moodle
2013-01-14 23:29:55 +01:00
Dan Poltawski
5c2aacc21c
Merge branch 'MDL-37143-master' of git://github.com/mouneyrac/moodle
2013-01-14 15:34:29 +08:00
Dan Poltawski
5590e85e1a
Merge branch 'w02_MDL-37286_m25_tracebuffer' of git://github.com/skodak/moodle
2013-01-14 15:11:42 +08:00
Dan Poltawski
ddaf0983b2
Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle
2013-01-14 15:05:15 +08:00
Sam Hemelryk
d9a3d932db
Merge branch 'MDL-37397-m' of git://github.com/andrewnicols/moodle
2013-01-14 11:04:52 +13:00
Petr Škoda
ee17c773c1
MDL-37483 improve require_login redirect when activity not accessible
2013-01-13 11:37:14 +01:00
Petr Škoda
4fa7fdeada
MDL-37286 improve coding style in unit tests
2013-01-12 15:28:57 +01:00
Petr Škoda
e7259ec998
MDL-37286 add new combined_progress_trace
...
This type of trace should be useful when multiple trace outputs requested.
2013-01-12 15:16:39 +01:00
Petr Škoda
78048e15f2
MDL-37286 add error_log progress trace
2013-01-12 15:16:38 +01:00
Petr Škoda
837e304260
MDL-37286 add progres_trace buffer and unit tests
2013-01-12 15:16:38 +01:00
Andrew Robert Nicols
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
Eloy Lafuente (stronk7)
b64a33bade
fix permissions
2013-01-11 12:23:22 +01:00
Petr Škoda
92b00c32a7
MDL-37420 rework pg schema testing
2013-01-11 02:12:38 +01:00
Frederic Massart
1017426c26
MDL-32639 phpunit: Hack not to fail on debugging
2013-01-09 11:48:44 +08:00
Sam Hemelryk
a0af8cb8c3
Merge branch 'wip-MDL-37404-master' of git://github.com/marinaglancy/moodle
2013-01-09 14:35:09 +13:00
Eloy Lafuente (stronk7)
f9f750cecc
Merge branch 'w51_MDL-37420_m25_pgschema' of git://github.com/skodak/moodle
2013-01-09 01:32:09 +01:00
Eloy Lafuente (stronk7)
e801c74c54
Merge branch 'w51_MDL-37183_m25_excelcleanup' of git://github.com/skodak/moodle
2013-01-08 23:30:19 +01:00
Eloy Lafuente (stronk7)
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
Sam Hemelryk
3913743aa3
Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle
2013-01-09 10:20:46 +13:00
Sam Hemelryk
f44e7d0a77
Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
...
Conflicts:
user/view.php
2013-01-09 09:34:22 +13:00
Eloy Lafuente (stronk7)
4f90540e0c
Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle
2013-01-08 18:01:43 +01:00
Petr Škoda
6ad8d762da
MDL-37420 add support for more PostgreSQL schemas
2013-01-08 17:12:31 +01:00
Eloy Lafuente (stronk7)
a74c3851f7
Merge branch 'w51_MDL-37284_m25_mysqlutf8' of git://github.com/skodak/moodle
2013-01-08 11:39:23 +01:00
Eloy Lafuente (stronk7)
cf78070a63
Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle
2013-01-08 10:34:04 +01:00
Eloy Lafuente (stronk7)
b315a45274
Merge branch 'w51_MDL-37323_m25_dlgstrings' of git://github.com/skodak/moodle
2013-01-08 10:21:50 +01:00
Dan Poltawski
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
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
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
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
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
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
