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
fe77a34ed0
MDL-33554 update_categories didn't update the path field when moving category
2012-06-06 16:40:06 +08:00
4a5be0e949
MDL-33330 /lib/db/upgrade.php: fix stray semicolon
...
Breaking Oracle upgrade
2012-06-06 16:25:20 +08:00
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
de6a0dfd3d
Merge branch 'MDL-33547' of git://github.com/netspotau/moodle-mod_assign
2012-06-06 16:09:15 +08:00
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
55e168e3a3
MDL-32581 Web services : should force type of external_format_value structure
2012-06-06 14:29:45 +08:00
7f04dd633f
Merge branch 'MDL-33088-master' of git://github.com/FMCorz/moodle
2012-06-06 13:20:59 +08:00
a8608cba3f
MDL-33088 Glossary: disabled filtering on concepts in recent activity block
2012-06-06 12:57:02 +08:00
dcba513f4b
Merge branch 'w23_MDL-32632_m23_windate' of git://github.com/skodak/moodle
2012-06-06 12:27:10 +08:00
5dc4db1ef2
Merge branch 'MDL-33090-missing-xmldb-strings' of git://github.com/rlorenzo/moodle
2012-06-06 15:37:43 +12:00
e5b200cd65
Merge branch 'wip-mdl-33367' of git://github.com/rajeshtaneja/moodle
2012-06-06 15:19:49 +12:00
bfcf1a449c
Merge branch 'wip-MDL-33527-master' of git://github.com/phalacee/moodle
2012-06-06 11:07:08 +08:00
c89331a4ca
Merge branch 'MDL-33119' of git://github.com/timhunt/moodle
2012-06-06 10:31:12 +08:00
50d24a3c85
MDL-32325 Glossary: Entrylist print version is XHTML compliant
2012-06-06 09:55:36 +08:00
abaf245f10
MDL-33527 - Database - Fixing the ability to export database entries
2012-06-06 09:13:26 +08:00
0cc24b8425
MDL-30506 navigation: Hook for local plugins to extend the settings_navigation tree
2012-06-06 10:38:03 +10:00
4cd6f90eed
Automatically generated installer lang files
2012-06-06 00:31:25 +00:00
f064f0fd15
Merge branch 'w23_MDL-33103_m23_dataestrict' of git://github.com/skodak/moodle
2012-06-06 11:50:19 +12:00
9897974b82
Merge branch 'MDL-33511' of git://github.com/danpoltawski/moodle
2012-06-06 11:43:47 +12:00
1236d15b0e
Merge branch 'MDL-33528' of git://github.com/mouneyrac/moodle
2012-06-06 11:13:32 +12:00
4744851197
Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle
2012-06-06 11:00:20 +12:00
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
fd200bc5e5
Merge branch 'MDL-31520-master' of git://github.com/fabiomsouto/moodle
2012-06-06 10:33:31 +12:00
dd9e2c8d44
Merge branch 'MDL-33503' of git://github.com/stronk7/moodle
2012-06-06 10:18:43 +12:00
447ebaa90e
Merge branch 'MDL-31823_master' of git://github.com/dmonllao/moodle
2012-06-06 10:14:00 +12:00
4ed1657f3e
Merge branch 'MDL-33441' of git://github.com/danpoltawski/moodle
2012-06-06 10:10:05 +12:00
f48de74428
Merge branch 'MDL-33487' of git://github.com/danpoltawski/moodle
2012-06-06 10:06:17 +12:00
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
238858e362
MDL-26277: Fixed whitespace post integration
2012-06-06 09:15:18 +12:00
e8a20ce85a
Merge branch 'MDL-26277-master' of https://github.com/mackensen/moodle
2012-06-06 09:07:34 +12:00
2c7a72df06
Merge branch 'MDL-33369-master' of git://github.com/ankitagarwal/moodle with changes
2012-06-06 09:05:04 +12:00
b576a97554
Merge branch 'MDL-33031_master' of git://github.com/kordan/moodle
2012-06-06 08:54:38 +12:00
7df271d9b3
Merge branch 'MDL-27559-master-v2' of https://github.com/mackensen/moodle
2012-06-06 08:51:11 +12:00
5deaa764ba
Merge branch 'MDL-33056_dnd_status_bar' of git://github.com/davosmith/moodle
2012-06-06 08:30:02 +12:00
0ad654dc8b
MDL-33330 Use the referencehash when searching for references
...
Together with this, refactoring and cleanup of search_references() and
similar methods was done. SQL was improved to use the INNER JOIN instead
of the LEFT JOIN as we are really interested in records that have a
reference. Also, joining the {repository_instances} table assures that
only references with valid repository_instance are returned (the check
against is_external_file() can't be applied to the methods that return
the count of references so I dropped it completely).
2012-06-05 14:07:25 +02:00
6bbf31c395
MDL-33330 Create new unique index in files_reference
...
The combination of repositoryid and reference field is supposed to be a
unique identification of an external file. Because the reference is a
TEXT field, we can't use it to compose the index. So we use the
referencehash instead and the file API is responsible to keep it
up-to-date.
2012-06-05 14:07:24 +02:00
8f47a60e4e
MDL-33330 Remap all instances of an external file to a single record in files_reference
2012-06-05 14:07:24 +02:00
dccba8bcc9
MDL-33330 Populate referencehash field values
2012-06-05 14:07:24 +02:00
5100365347
MDL-33330 Add referencehash field to the files_reference table
2012-06-05 14:07:19 +02:00
d83ce95322
MDL-33330 improved {files_reference} records creation
...
This patch unifies the way how records in {files_reference} get created.
Previously, each reference file (i.e. a file with referencefileid set)
created its own record in {files_reference}. This patch makes sure that
existing record is reused if possible.
Bye bye 1:1 relationships, you suck!
2012-06-05 13:39:09 +02:00
e28fbdba61
MDL-33330 introducing new file_reference_exception
...
This replaces the previously defined external_file_exception that was
not used anywhere in the code. The new exception will be thrown in
situations where there is some unexpected problem detected with the
records in the {files_reference} table (e.g. unable to find a record
referenced by some file from {file}, invalid reference value etc.)
2012-06-05 13:29:48 +02:00
7f88c42608
MDL-33441 course/lib.php prevent fatal error when no visible categories
2012-06-05 16:40:40 +08:00
469f4078c5
Merge branch 'MDL-33019-master-2' of git://git.luns.net.uk/moodle
2012-06-05 15:32:45 +08:00
2812b87bab
Merge branch 'MDL-32581' of git://github.com/mouneyrac/moodle
2012-06-05 15:23:28 +08:00
2330cf7af1
Merge branch 'wip-mdl-33455' of git://github.com/rajeshtaneja/moodle
2012-06-05 15:15:26 +08:00
c770311367
Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle
2012-06-05 14:30:40 +08:00
6546a73dbb
MDL-33445 reverted file size check for files inserted by reference
2012-06-05 13:57:16 +08:00
9615b623c6
MDL-33528 fix create_categories warnings + default parent parameter
2012-06-05 13:40:12 +08:00
efa28f30f2
MDL-33391 Files API, Repository : mimetype should be determined from file extension when possible
2012-06-05 13:29:07 +08:00
Petr Skoda