54196 Commits

Author SHA1 Message Date
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
Sam Hemelryk
5deaa764ba Merge branch 'MDL-33056_dnd_status_bar' of git://github.com/davosmith/moodle 2012-06-06 08:30:02 +12:00
David Mudrak
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
David Mudrak
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
David Mudrak
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
David Mudrak
dccba8bcc9 MDL-33330 Populate referencehash field values 2012-06-05 14:07:24 +02:00
David Mudrak
5100365347 MDL-33330 Add referencehash field to the files_reference table 2012-06-05 14:07:19 +02:00
David Mudrak
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
David Mudrak
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
Dan Poltawski
7f88c42608 MDL-33441 course/lib.php prevent fatal error when no visible categories 2012-06-05 16:40:40 +08:00
Dan Poltawski
469f4078c5 Merge branch 'MDL-33019-master-2' of git://git.luns.net.uk/moodle 2012-06-05 15:32:45 +08:00
Dan Poltawski
2812b87bab Merge branch 'MDL-32581' of git://github.com/mouneyrac/moodle 2012-06-05 15:23:28 +08:00
Aparup Banerjee
2330cf7af1 Merge branch 'wip-mdl-33455' of git://github.com/rajeshtaneja/moodle 2012-06-05 15:15:26 +08:00
Dan Poltawski
c770311367 Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle 2012-06-05 14:30:40 +08:00
Marina Glancy
6546a73dbb MDL-33445 reverted file size check for files inserted by reference 2012-06-05 13:57:16 +08:00
Jerome Mouneyrac
9615b623c6 MDL-33528 fix create_categories warnings + default parent parameter 2012-06-05 13:40:12 +08:00
Marina Glancy
efa28f30f2 MDL-33391 Files API, Repository : mimetype should be determined from file extension when possible 2012-06-05 13:29:07 +08:00
Dan Poltawski
66726f61d0 Merge branch 'MDL-33502' of git://github.com/stronk7/moodle 2012-06-05 13:10:28 +08:00
Dan Poltawski
a16757ed9c Merge branch 'MDL-33042-master-1' of git://git.luns.net.uk/moodle 2012-06-05 12:52:39 +08:00
Dan Poltawski
8e9e62fd8e Merge branch 'MDL-29103' of git://github.com/mouneyrac/moodle 2012-06-05 12:42:30 +08:00
Dan Poltawski
29304b6c7d Merge branch 'MDL-33401-master' of git://github.com/ankitagarwal/moodle 2012-06-05 12:34:29 +08:00
Dan Poltawski
820b845415 Merge branch 'MDL-33476' of git://github.com/esqueeze/moodle 2012-06-05 12:15:47 +08:00
Dan Poltawski
490ef89365 Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle 2012-06-05 12:09:44 +08:00
Dan Poltawski
ac0ad29c6f Merge branch 'MDL-33319' of git://github.com/netspotau/moodle-mod_assign 2012-06-05 12:03:56 +08:00
Dan Poltawski
d54020bf4c Merge branch 'MDL-30880_feedback_property' of git://github.com/andyjdavis/moodle 2012-06-05 11:58:32 +08:00
nread
e3e4ca5ae9 MDL-32117 equella: owner field in JSON maps back to author 2012-06-05 13:45:25 +10:00
Tim Barker
8de9272c6c MDL-33476 repositories: Added instructions to assist with setting up Dropbox keys 2012-06-05 10:19:06 +08:00
Dan Poltawski
f7091beef4 Merge branch 'MDL-33485' of git://github.com/timhunt/moodle 2012-06-05 10:16:44 +08:00
Dan Poltawski
7e5789c12c Merge branch 'wip-tablelib' of git://github.com/marinaglancy/moodle 2012-06-05 10:10:21 +08:00
Rajesh Taneja
a1a2cc5994 MDL-33455 gradebook: Grade will not be inserted for unknown user 2012-06-05 09:46:40 +08:00
nread
826b34836a MDL-32117 equella: pass through course shortname too 2012-06-05 11:45:24 +10:00
Rajesh Taneja
ac5f641465 MDL-33367 course: Deprecated message added to move_section, so it can be removed in 2.5 2012-06-05 09:34:36 +08:00
Dan Poltawski
92c1f40445 MDL-31460 mod_forum: fix trailing whitespace 2012-06-05 09:34:26 +08:00
Rajesh Taneja
eb01aa2c34 MDL-33367 course: move_section reuse move_section_to function
Conflicts:

	course/lib.php
2012-06-05 09:34:14 +08:00
Ankit Agarwal
336d8c49f4 MDL-33465 course: 'Course view section' logs should use sectionid instead of section number to generate action urls' 2012-06-05 09:33:45 +08:00
Dan Poltawski
50bc155cce Merge branch 'MDL-31460_unsubscribe' of git://github.com/andyjdavis/moodle 2012-06-05 09:33:38 +08:00
Marina Glancy
2ea47082f0 MDL-33479 removed legacy constructor causing strict notice in php5 2012-06-05 09:27:32 +08:00
Marina Glancy
9945ec5e13 MDL-33445 Added file size check to files inserted by reference 2012-06-05 09:26:26 +08:00
Marina Glancy
2dfa16ef8a MDL-33409 Newly copied files should take on the userid of the current user, and dates reset
- changed function repository::copy_to_area so it accepts more file attributes, pass changed attributes to it
- changed file_info::copy_to_storage and file_info_stored::copy_to_storage to accept more file attributes
- simplified file size check for moodle files in repository/repository_ajax.php
- removed unused code in repository/repository_ajax.php
2012-06-05 09:26:26 +08:00
Frederic Massart
775fe70093 MDL-30837 Accessibility: removed navigation icons default alt text 2012-06-05 09:11:46 +08:00
Helen Foster
3c97ce2461 MDL-31803 lang - make the mooch registration message more descriptive 2012-06-05 09:09:52 +08:00
Ankit Agarwal
5249ba7405 MDL-33369 course: Adding support for sectionid parameter for section view pages 2012-06-05 08:53:04 +08:00
Ankit Agarwal
586e797689 MDL-33401 blocks: Allow managers to have block:edit capability by default 2012-06-05 08:50:43 +08:00
Eloy Lafuente (stronk7)
0b1f477618 Merge branch 'MDL-32649_ratings_sort' of git://github.com/andyjdavis/moodle 2012-06-05 02:22:33 +02:00
Eloy Lafuente (stronk7)
aa12ec984c MDL-32985 cron: prevent notices on "new" sites. 2012-06-05 02:14:13 +02:00
Eloy Lafuente (stronk7)
4baa746eae Merge branch 'MDL-32985' of git://github.com/merrill-oakland/moodle 2012-06-05 02:02:12 +02:00
Eloy Lafuente (stronk7)
f61194e387 MDL-33080 IMSCC: look for imsmanifest.xml @ root dir 2012-06-05 01:04:29 +02:00