Dan Poltawski
aa4ebbe5f7
Merge branch 'MDL-32358' of https://github.com/ppichet/moodle
2012-04-16 14:31:07 +08:00
Dan Poltawski
db27798502
Merge branch 'MDL-31694' of git://github.com/mouneyrac/moodle
2012-04-16 14:27:18 +08:00
Dan Poltawski
ef4965afe4
Merge branch 'MDL-32396' of git://github.com/timhunt/moodle
2012-04-16 13:55:25 +08:00
Dan Poltawski
71504afc99
Merge branch 'w16_MDL-32392_m23_minversion' of git://github.com/skodak/moodle
2012-04-16 13:52:50 +08:00
Dan Poltawski
5599620feb
Merge branch 'MDL-32438-master' of git://github.com/micaherne/moodle
2012-04-16 13:46:03 +08:00
Dan Poltawski
04b16edb6d
Merge branch 'w16_MDL-32434_m23_droptemp' of git://github.com/skodak/moodle
2012-04-16 13:40:32 +08:00
Sam Hemelryk
6669669fdb
Merge branch 'MDL-29174-master' of git://github.com/raymanuk/moodle
2012-04-16 17:37:06 +12:00
Dan Poltawski
2e70e457bd
Merge branch 'w16_MDL-32423_m23_flowplayer' of git://github.com/skodak/moodle
2012-04-16 13:32:40 +08:00
Sam Hemelryk
a02e2eafa4
Merge branch 'w16_MDL-32405_m23_estrict4' of git://github.com/skodak/moodle
2012-04-16 17:31:45 +12:00
Dan Poltawski
788c5164aa
Merge branch 'wip-MDL-32393-m23' of git://github.com/samhemelryk/moodle
2012-04-16 13:29:04 +08:00
Sam Hemelryk
9f31cf9f33
Merge branch 'w16_MDL-32447_m23_tcpdf' of git://github.com/skodak/moodle
2012-04-16 17:25:27 +12:00
Dan Poltawski
a096a21ef3
MDL-32443 queupgradehelper cli: fix path & whitespace
2012-04-16 13:22:53 +08:00
Eric Merrill
8767142576
MDL-32443 qeupgradehelper: Add cli tool to execute qeupgrade helper
2012-04-16 13:16:17 +08:00
Sam Hemelryk
0064f3cfbb
MDL-32393 navigation: Fixed up issue when rendering action_link instances for the navigation
2012-04-16 17:12:48 +12:00
Sam Hemelryk
fa3671d49f
Merge branch 'MDL-32385_master' of git://github.com/lazydaisy/moodle
2012-04-16 17:06:15 +12:00
Dan Poltawski
31aec26c18
Merge branch 'MDL-32404' of git://github.com/timhunt/moodle
2012-04-16 13:01:48 +08:00
Sam Hemelryk
52bb02020d
Merge branch 'MDL-32444_master' of git://github.com/lazydaisy/moodle
2012-04-16 15:59:55 +12:00
Sam Hemelryk
d4e2d9463e
MDL-32353 fixed up very minor whitespace
2012-04-16 15:23:05 +12:00
Sam Hemelryk
cb4b46f45c
Merge branch 'MDL-32353' of git://github.com/merrill-oakland/moodle
2012-04-16 15:14:45 +12:00
Sam Hemelryk
e3d34313ab
Merge branch 'MDL-26099-workshop-phase-switch' of git://github.com/mudrd8mz/moodle
2012-04-16 15:00:20 +12:00
Dan Poltawski
20dcbbf26a
Merge branch 'MDL-32442' of git://github.com/merrill-oakland/moodle
2012-04-16 10:45:02 +08:00
Dan Poltawski
570d76c456
Merge branch 'wip-MDL-32381-master' of git://github.com/marinaglancy/moodle
2012-04-16 10:35:56 +08:00
Dan Poltawski
85b0540605
Merge branch 'wip-MDL-32395-m23' of git://github.com/samhemelryk/moodle
2012-04-16 10:32:09 +08:00
ppichet
c9340ac145
MDL-32358 : numerical question: validation messages errors
...
The selected unit parameter is added answer paramter when renderer call
$question->get_validation_error() so that it mimics the
is_complete_response(array $response) structure.
2012-04-15 22:11:10 -04:00
Sam Hemelryk
448cebee57
Merge branch 'master_MDL-32388' of git://github.com/danmarsden/moodle
2012-04-16 12:23:23 +12:00
Kordan
8b83e36e60
MDL-32355 theme_formal_white: changed the order of parent themes
2012-04-16 12:06:13 +12:00
Kordan
71e5d66642
MDL-32355 formal_white: improved reliability e maintainability
2012-04-16 12:04:56 +12:00
Sam Hemelryk
d8b09e5eb2
Merge branch 'MDL-32356_master' of git://github.com/kordan/moodle
2012-04-16 12:00:55 +12:00
Sam Hemelryk
885d208283
Merge branch 'MDL-32433_master' of git://github.com/kordan/moodle
2012-04-16 11:58:17 +12:00
Sam Hemelryk
2a535174c0
MDL-32426 phpunit: Fixed up phpdocs for generator changes
2012-04-16 11:52:56 +12:00
Sam Hemelryk
e3a660a2e7
Merge branch 'MDL-32426-master-1' of git://git.luns.net.uk/moodle
2012-04-16 11:52:12 +12:00
Sam Hemelryk
f295ffebd0
Merge branch 'MDL-30819_grader_col_highlight' of git://github.com/andyjdavis/moodle
2012-04-16 11:45:55 +12:00
Sam Hemelryk
be58371e4e
Merge branch 'MDL-30955_forum_ratings' of git://github.com/andyjdavis/moodle
2012-04-16 11:34:39 +12:00
Mary Evans
cbeb231f05
MDL-23647 theme_anomaly: Removed margin + added padding to current week main content to give it more definition.
2012-04-16 00:27:32 +01:00
Sam Hemelryk
b9afb90b7f
Merge branch 'MDL-32316_master_wip' of git://github.com/grabs/moodle
2012-04-16 11:00:43 +12:00
Sam Hemelryk
68c7673088
Merge branch 'MDL-27547' of git://github.com/mouneyrac/moodle
2012-04-16 10:48:15 +12:00
Petr Skoda
54c5b1ad35
MDL32392 delete unused is_min_version() in some DB drivers
2012-04-15 19:40:07 +02:00
Petr Skoda
c990e4bfcb
MDL-32405 fix PHP4isms and other E_STRICT issues in custom profile fields
2012-04-15 17:15:50 +02:00
Petr Skoda
66b3302dec
MDL-32405 workaround for non-static PEAR::raise_error() and fixed -1 debug support
2012-04-15 17:02:26 +02:00
Petr Skoda
585ae3d949
MDL-32447 import latest tcpdf and point cache to tcpdf subdirectory of moodle cache dir
2012-04-15 16:08:46 +02:00
Petr Skoda
afd1c47c10
MDL32423 import latest flowplayer
2012-04-15 15:59:07 +02:00
Petr Skoda
7467f4c911
MDL-32437 add gradebook querylib tests
2012-04-15 14:23:07 +02:00
Petr Skoda
f41741e7ba
MDL-32437 fix invalid gradebook query sql
2012-04-15 14:20:14 +02:00
Petr Skoda
6b04fdc0b6
MDL-32400 improve module generators
...
Module generators are using standard *_add_instance() methods which helps with testing, it also updates grades and calendar events if used.
2012-04-15 14:16:59 +02:00
Petr Skoda
322cf28415
MDL-32400 fix PHPUnit configuration file paths on windows
2012-04-15 12:23:42 +02:00
Petr Skoda
0684ea9972
MDL-32400 do not silence diagnostic PHPUnit includes
2012-04-15 12:23:42 +02:00
Petr Skoda
0d8e51a65f
MDL-32400 rework phpunit exit codes, use only php based init
2012-04-15 12:23:42 +02:00
Petr Skoda
589376d385
MDL-32400 ignore outdated config settings in future upgrades
2012-04-15 12:23:41 +02:00
Petr Skoda
e2b8630b5c
MDL-32400 store version hash also in database
...
This prevents problems when switching databases in config.php and keeping the same test dataroot.
2012-04-15 12:23:41 +02:00
Petr Skoda
4059b64510
MDL-32400 convert completion tests
2012-04-15 12:23:41 +02:00