54196 Commits

Author SHA1 Message Date
Dan Poltawski
644495114e Merge branch 'MDL-33475' of git://github.com/netspotau/moodle-mod_assign 2012-06-07 17:33:39 +08:00
Dan Poltawski
a6eecb7c9d Merge branch 'MDL-33535-master-1' of git://git.luns.net.uk/moodle 2012-06-07 17:25:59 +08:00
Petr Skoda
dbf7784e67 MDL-33583 really keep all automated backup files when told to do so 2012-06-07 11:05:15 +02:00
Petr Skoda
096702f698 MDL-30725 save automated external only backups directly to ext storage, do not pollute file pool
This solution is based on code by Tony Levi, thanks!
2012-06-07 10:49:48 +02:00
Dan Poltawski
d9d59e3911 MDL-33551 googleapi: allow multiple uploads in one session
We need to clear state between multiple uploads
2012-06-07 16:38:10 +08:00
Andrew Robert Nicols
7ccec1e2cf MDL-33535 Correct typo in glossary documentation link 2012-06-07 09:17:40 +01:00
Dan Poltawski
c9978ce67b Merge branch 'w23_MDL-33555_m23_assignfk' of git://github.com/skodak/moodle 2012-06-07 14:29:08 +08:00
Aparup Banerjee
ac16f14512 Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	backup/moodle2/restore_stepslib.php
2012-06-07 14:04:08 +08:00
Dan Poltawski
25f288f2fd Merge branch 'MDL-33467' of git://github.com/timhunt/moodle 2012-06-07 13:33:22 +08:00
Dan Poltawski
2960a22052 Merge branch 'MDL-33322' of git://github.com/rwijaya/moodle 2012-06-07 13:02:38 +08:00
Aparup Banerjee
3872cae1eb Merge branch 'MDL-31863' of git://github.com/nebgor/moodle 2012-06-07 11:59:13 +08:00
Aparup Banerjee
130d3fbf96 MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time. 2012-06-07 11:57:19 +08:00
Yang Yang
25ccaf5494 MDL-31863 Web service : added modified to parameters and modifiedtime to description 2012-06-07 11:56:19 +08:00
Damyon Wiese
eba009ea63 MDL-33475: Fix javascript error when advanced grading is used in mod_assign 2012-06-07 10:52:05 +08:00
Damyon Wiese
4913af936f MDL-33498: Correct use of unformat_float for mod_assign decimal grades
This was affecting locales that use , instead of . in floating point numbers.
2012-06-07 09:27:59 +08:00
Tim Hunt
98984c09a2 MDL-33565 setuplib: better error if you pass an object as $debuginfo
This changes makes sure the error is triggerd when the exception is
thrown, so that the problem code is in the stack-trace. Before, the
error happend in the exception hander, so you could not see the code
that caused the problem.
2012-06-06 20:33:16 +01:00
Tim Hunt
ee326d5e7d MDL-33548 quiz manual grading: check the grade is in range.
To do this nicely, I refactored some code out of the quiz manual grading
report.
2012-06-06 20:21:33 +01:00
Tim Hunt
f02a91fc50 MDL-33517 quiz: revise timelimit help string.
Thanks Helen.
2012-06-06 19:24:48 +01:00
Eric Merrill
54c2756ca2 MDL-32985 cron: Fixing related problem with setting of lastnotifyfailure
Because of a flaw in the logic, lastnotifyfailure was not set unless
there was a failure. This means that after 1 hour of no failures, the
function would execute every cron cycle, which has a pretty high cost
on large sites.
2012-06-06 12:04:03 -04:00
Petr Skoda
5f9ba165de MDL-33557 fix path in PHPUnit init hint
This resolves problem when execution phpunit in subdirectory.
2012-06-06 12:29:20 +02:00
Marina Glancy
2aad62e93c MDL-33467 fixed variable name conflict 2012-06-06 11:17:07 +01:00
Petr Skoda
3269c859bf MDL-33555 fix invalid FK in mod_assign
There is no need to upgrade DB because we create only indexes now.
2012-06-06 10:54:40 +02:00
Dan Poltawski
4a5be0e949 MDL-33330 /lib/db/upgrade.php: fix stray semicolon
Breaking Oracle upgrade
2012-06-06 16:25:20 +08:00
Dan Poltawski
79c2b50980 Merge branch 'MDL-33330-files-reference' of git://github.com/mudrd8mz/moodle
Conflicts:
	version.php
    lib/db/upgrade.php
2012-06-06 16:18:30 +08:00
Dan Poltawski
de6a0dfd3d Merge branch 'MDL-33547' of git://github.com/netspotau/moodle-mod_assign 2012-06-06 16:09:15 +08:00
Damyon Wiese
509e59ca38 MDL-33547: Fix for mod_assign portfolio export for a list of files.
This will fix any submission or feedback plugin using render_area_files
to show a list of files.
2012-06-06 15:49:37 +08:00
Jerome Mouneyrac
55e168e3a3 MDL-32581 Web services : should force type of external_format_value structure 2012-06-06 14:29:45 +08:00
Dan Poltawski
7f04dd633f Merge branch 'MDL-33088-master' of git://github.com/FMCorz/moodle 2012-06-06 13:20:59 +08:00
Frederic Massart
a8608cba3f MDL-33088 Glossary: disabled filtering on concepts in recent activity block 2012-06-06 12:57:02 +08:00
Dan Poltawski
dcba513f4b Merge branch 'w23_MDL-32632_m23_windate' of git://github.com/skodak/moodle 2012-06-06 12:27:10 +08:00
Sam Hemelryk
5dc4db1ef2 Merge branch 'MDL-33090-missing-xmldb-strings' of git://github.com/rlorenzo/moodle 2012-06-06 15:37:43 +12:00
Sam Hemelryk
e5b200cd65 Merge branch 'wip-mdl-33367' of git://github.com/rajeshtaneja/moodle 2012-06-06 15:19:49 +12:00
Aparup Banerjee
bfcf1a449c Merge branch 'wip-MDL-33527-master' of git://github.com/phalacee/moodle 2012-06-06 11:07:08 +08:00
Dan Poltawski
c89331a4ca Merge branch 'MDL-33119' of git://github.com/timhunt/moodle 2012-06-06 10:31:12 +08:00
Frederic Massart
50d24a3c85 MDL-32325 Glossary: Entrylist print version is XHTML compliant 2012-06-06 09:55:36 +08:00
Jason Fowler
abaf245f10 MDL-33527 - Database - Fixing the ability to export database entries 2012-06-06 09:13:26 +08:00
Jonathon Fowler
0cc24b8425 MDL-30506 navigation: Hook for local plugins to extend the settings_navigation tree 2012-06-06 10:38:03 +10:00
AMOS bot
4cd6f90eed Automatically generated installer lang files 2012-06-06 00:31:25 +00:00
Sam Hemelryk
f064f0fd15 Merge branch 'w23_MDL-33103_m23_dataestrict' of git://github.com/skodak/moodle 2012-06-06 11:50:19 +12:00
Sam Hemelryk
9897974b82 Merge branch 'MDL-33511' of git://github.com/danpoltawski/moodle 2012-06-06 11:43:47 +12:00
Sam Hemelryk
1236d15b0e Merge branch 'MDL-33528' of git://github.com/mouneyrac/moodle 2012-06-06 11:13:32 +12:00
Sam Hemelryk
4744851197 Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle 2012-06-06 11:00:20 +12:00
Sam Hemelryk
ca774c940e MDL-31520 user-ws: Optimised if statement for email access by moving admin check to the start 2012-06-06 10:35:19 +12:00
Sam Hemelryk
fd200bc5e5 Merge branch 'MDL-31520-master' of git://github.com/fabiomsouto/moodle 2012-06-06 10:33:31 +12:00
Sam Hemelryk
dd9e2c8d44 Merge branch 'MDL-33503' of git://github.com/stronk7/moodle 2012-06-06 10:18:43 +12:00
Sam Hemelryk
447ebaa90e Merge branch 'MDL-31823_master' of git://github.com/dmonllao/moodle 2012-06-06 10:14:00 +12:00
Sam Hemelryk
4ed1657f3e Merge branch 'MDL-33441' of git://github.com/danpoltawski/moodle 2012-06-06 10:10:05 +12:00
Sam Hemelryk
f48de74428 Merge branch 'MDL-33487' of git://github.com/danpoltawski/moodle 2012-06-06 10:06:17 +12:00
Kordan
9ad11a6c70 MDL-32905 theme_formal_white: changed three setting name, some string name and string content
AMOS BEGIN
 MOV [displaylogodesc,theme_formal_white],[headercontentdesc,theme_formal_white]
 MOV [frontpagelogo,theme_formal_white],[frontpagelogourl,theme_formal_white]
 MOV [frontpagelogodesc,theme_formal_white],[frontpagelogourldesc,theme_formal_white]
 MOV [heading,theme_formal_white],[displayheading,theme_formal_white]
 MOV [logo,theme_formal_white],[customlogourl,theme_formal_white]
 MOV [logodesc,theme_formal_white],[customlogourldesc,theme_formal_white]
 CPY [moodlelogo,theme_formal_white],[displaylogo,theme_formal_white]
AMOS END
2012-06-06 10:02:39 +12:00
Sam Hemelryk
238858e362 MDL-26277: Fixed whitespace post integration 2012-06-06 09:15:18 +12:00