Commit graph

54111 commits

Author SHA1 Message Date
David Mudrak
1c0da8498f MDL-33587 Improve stored_file::delete_reference() method 2012-06-07 17:37:25 +02:00
David Mudrak
2fa8aea279 MDL-33587 Throw coding exception when trying to unlink a non-reference file 2012-06-07 17:36:29 +02:00
David Mudrak
2d2c194bbe MDL-33587 Add unit tests for stored_file::delete_reference()
The first unit test forces the File API to be more picky as any sane
core API should be. The second one illustrates the buggy behaviour of
the current implementation of delete_reference(). They both fail at the
moment, of course...
2012-06-07 17:36:23 +02:00
Dan Poltawski
620ecd38d2 Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle 2012-06-07 18:11:10 +08:00
Barbara Ramiro
8d25aeb711 MDL-33482 Replaced modchooser with chooserdialouge and cleaned codes 2012-06-07 18:09:14 +08:00
Andrew Robert Nicols
255dd8d1e2 MDL-33482 Replaced modchooser with chooserdialogue 2012-06-07 18:09:14 +08:00
Barbara Ramiro
89e00e91cd MDL-33482 Activity Chooser styled similar to Filepicker particularly the look and feel with drop shadow 2012-06-07 18:09:14 +08:00
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
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
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
Jason Fowler
abaf245f10 MDL-33527 - Database - Fixing the ability to export database entries 2012-06-06 09:13:26 +08: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
Sam Hemelryk
e8a20ce85a Merge branch 'MDL-26277-master' of https://github.com/mackensen/moodle 2012-06-06 09:07:34 +12:00
Sam Hemelryk
2c7a72df06 Merge branch 'MDL-33369-master' of git://github.com/ankitagarwal/moodle with changes 2012-06-06 09:05:04 +12:00
Sam Hemelryk
b576a97554 Merge branch 'MDL-33031_master' of git://github.com/kordan/moodle 2012-06-06 08:54:38 +12:00
Sam Hemelryk
7df271d9b3 Merge branch 'MDL-27559-master-v2' of https://github.com/mackensen/moodle 2012-06-06 08:51:11 +12:00