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
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
dcba513f4b
Merge branch 'w23_MDL-32632_m23_windate' of git://github.com/skodak/moodle
2012-06-06 12:27:10 +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
Sam Hemelryk
4744851197
Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle
2012-06-06 11:00:20 +12:00
Sam Hemelryk
238858e362
MDL-26277: Fixed whitespace post integration
2012-06-06 09:15:18 +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
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
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
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
29304b6c7d
Merge branch 'MDL-33401-master' of git://github.com/ankitagarwal/moodle
2012-06-05 12:34:29 +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
7e5789c12c
Merge branch 'wip-tablelib' of git://github.com/marinaglancy/moodle
2012-06-05 10:10:21 +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
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
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)
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)
d291dfd0aa
Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle
2012-06-05 00:42:59 +02:00
Eloy Lafuente (stronk7)
080f585f39
Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle
2012-06-04 21:47:14 +02:00
Eloy Lafuente (stronk7)
0b702fca0b
Merge branch 'w23_MDL-33436_m23_testprinter' of git://github.com/skodak/moodle
2012-06-04 19:55:21 +02:00
Eloy Lafuente (stronk7)
a301675101
Merge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle
2012-06-04 11:33:47 +02:00
Dan Poltawski
1cf840074b
Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle
2012-06-04 17:13:35 +08:00
Petr Skoda
03f0cd1039
MDL-33007 fix incorrect min_fix_utf8() tests
...
Credit goest to Eloy Lafuente.
2012-06-04 10:45:44 +02:00
Dan Poltawski
1cbaf803d0
MDL-29173 - fix whitespace error
2012-06-04 16:32:25 +08:00
Dan Poltawski
6f337ea935
Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle
2012-06-04 15:55:54 +08:00
Juan Leyva
8430d87b1f
MDL-32919 Webservices: Added method core_course_import_course
2012-06-04 08:56:11 +02:00
Dan Poltawski
7b61ac39d2
MDL-33507 - oauth2lib: switch 'code' to oauth2code
...
To avoid param collisions in future.
2012-06-04 11:25:19 +08:00
Dan Poltawski
db7602af7c
MDL-33501 - oauth2lib: improve redirect url handling
...
Only accept PARAM_LOCALURL for state params and enforce
use of moodle_url param in oauthlib to facilitate that.
2012-06-04 10:57:39 +08:00
Petr Skoda
bd672f7830
MDL-33436 include phpunit printer file from our lib.php
...
The problem is that the phpunit.xml does not support relative links.
2012-06-02 21:48:26 +02:00
sam marshall
38d06fea66
MDL-32107 Activity completion: should use get_enrolled_sql instead of reinventing wheel
2012-06-01 12:25:59 +01:00
Petr Skoda
63d59875b5
MDL-32632 fix date formatting on Windows
2012-06-01 12:24:33 +02:00
Petr Skoda
0aff15c2c9
MDL-33007 add workaround for broken iconv //IGNORE
...
This patch adds mbstring utf-8 cleanup fallback and admin warning if no utf-8 cleanup possible in user submitted data.
2012-06-01 12:23:09 +02:00
Petr Skoda
3681e78429
MDL-33007 add buggy iconv workaround to configonlylib, add tests and fix minor issues
2012-06-01 12:23:09 +02:00
Sam Hemelryk
84ec16a861
Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle
2012-06-01 13:42:01 +12:00
Eloy Lafuente (stronk7)
5669b28d59
Merge branch 'MDL-33326' of git://github.com/stronk7/moodle
2012-06-01 00:58:08 +02:00
Dan Poltawski
c9bd018825
Merge branch 'MDL-33434' of git://github.com/stronk7/moodle
2012-05-31 16:59:23 +08:00
Frederic Massart
ccc604a24d
MDL-33398 Cron: fix wrong variable type in completion criterias
2012-05-31 12:50:38 +08:00
Jerome Mouneyrac
93ce0e8296
MDL-32581 support additional format field with all text field in extrnal lib function + new possible ws params to decide how format is returned (which are stored in a singleton)
2012-05-31 12:31:27 +08:00
Eloy Lafuente (stronk7)
a3fa993212
MDL-33434 mssql: Improve handling of returned ids on insert.
...
This commit moves from the batch SCOPE_IDENTITY() way to return
the inserted ids to the OUTPUT alternative (supported and
recommended since 2005). Also the handling of possible return
values is improved, with all the alternatives leading to expected results.
2012-05-31 01:01:14 +02:00
Eloy Lafuente (stronk7)
cbdcdd4734
MDL-33434 dml: define expected results when unique constraint is violated on insert.
2012-05-31 01:00:07 +02:00