Commit graph

1182 commits

Author SHA1 Message Date
Sam Hemelryk
043a53fb25 Merge branch 'MDL-33541' of git://github.com/danpoltawski/moodle 2012-06-14 11:27:37 +12:00
Dongsheng Cai
24b96f0170 MDL-33513 Fixed source field 2012-06-13 19:57:10 +10:00
Dan Poltawski
3aad3a5e64 Merge branch 'wip-MDL-33452-master' of git://github.com/marinaglancy/moodle 2012-06-13 15:03:07 +08:00
Dan Poltawski
837eef2e64 MDL-33541 - remove cookies from filepicker 2012-06-13 12:17:52 +08:00
Marina Glancy
0b2bfbd1c6 MDL-33550 Correctly process situation when file reference source is missing
- do not die with fatal error if source file in moodle internal repository is missing;
- moved code duplication for moodle repositories into class repository (functions send_file, get_reference_details, get_file_by_reference, get_file_reference);
- update file status after repository::sync_external_file so we know that it is missing (or not missing anymore). Do not run this function more than once for file within one request;
- display readable name for Private Files and Server files with the new format;
- display broken icon in filemanager if we know that source is missing, display information (for admin) where it was located before: see repository::get_reference_details() and extending classes;
- removed unnecessary queries in stored_file::sync_external_file();
- syncronize files before displaying it's size in mod_resource, do not query  directly
2012-06-13 12:11:06 +08:00
Marina Glancy
be920f9acf MDL-33420 Enable references in Server files repository 2012-06-13 09:03:41 +08:00
Dan Poltawski
4a126f1725 MDL-32573 - repository: make instance_config_form static 2012-06-12 22:17:29 +08:00
Marina Glancy
c0e8f211d3 MDL-33452 It must not possible to create an alias to another alias
- if the downloaded file is an alias we pretend that we operate with its source
2012-06-12 11:03:54 +08:00
Eloy Lafuente (stronk7)
74ea1b95f4 MDL-32117 equella: add missing MOODLE_INTERNAL + phpdocs tidy 2012-06-12 02:23:14 +02:00
Eloy Lafuente (stronk7)
37b8257de5 Merge branch 'equella' of git://github.com/danpoltawski/moodle 2012-06-12 02:22:26 +02:00
Dongsheng Cai
39c60294a6 MDL-33513 box.net repository should have filename in source field 2012-06-11 17:41:32 +10:00
Dan Poltawski
d66e5720a1 MDL-32117 - equella: prevent errors when no username 2012-06-11 10:08:16 +08:00
Dongsheng Cai
8a288971e2 MDL-33513: Make files->source field consistent 2012-06-10 17:47:00 +10:00
Dan Poltawski
2960a22052 Merge branch 'MDL-33322' of git://github.com/rwijaya/moodle 2012-06-07 13:02:38 +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
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
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
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
nread
826b34836a MDL-32117 equella: pass through course shortname too 2012-06-05 11:45:24 +10: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
Eloy Lafuente (stronk7)
080f585f39 Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle 2012-06-04 21:47:14 +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
Dan Poltawski
095b8c5818 MDL-32117 equella: Add validation rules to instance form
Also change equella_action to hardcoded value
2012-06-04 15:29:46 +08:00
Dan Poltawski
e3e691cc6e MDL-32117 equella: die after redirection
To make it clear that nothing else happens.
2012-06-04 15:29:46 +08:00
Dan Poltawski
2e47347c88 MDL-32117 equella: callback.php params
* Properly cleaned and filtered
* Add utf8 content type

(Thanks Petr Škoda)
2012-06-04 15:29:45 +08:00
Dan Poltawski
c1e688bba4 MDL-32117 equella: Moodle style checker issues
* Whitespace around control statements
* DOS formated version.php
2012-06-04 15:29:45 +08:00
Dan Poltawski
1256d67102 MDL-32117 equella: remove unused full_url() method 2012-06-04 15:29:45 +08:00
Dan Poltawski
dcd51551d2 MDL-32117 equella: improve version.php
* Include component name
* Include requires version

(Thanks Petr Škoda)
2012-06-04 15:29:12 +08:00
Dan Poltawski
bf4b1698a5 MDL-32117 equella: remove another unused global 2012-06-04 15:29:11 +08:00
Dan Poltawski
e38919c070 MDL-32117 equella: Make private functions private
Match mimetype function name to moodle coding style.
2012-06-04 12:32:15 +08:00
Dan Poltawski
7406ee9f57 MDL-32117 equella: Switch get_all_editing_roles to get_users_with_capability
This is the core function to do the same thing
2012-06-04 12:32:15 +08:00
Dan Poltawski
32f7f85862 MDL-32117 equella: Remove custom 'context tree' handling.
user_has_role_assignment will check parent contexts itself so there is
no need to do this manally
2012-06-04 12:32:10 +08:00
Dan Poltawski
3e3910a58d MDL-32117 equella: Remove unusused globals 2012-06-04 12:30:40 +08:00
Dan Poltawski
130b3f8c4f MDL-32117 equella: various E_STRICT fixes
* Make send_file compatible with its parent
* mktime -> time()
* callback.php: fix pass by reference warnings
2012-06-04 12:29:15 +08:00
Dongsheng Cai
e88aa1e34c MDL-32117 Removed dots from language key names 2012-06-04 11:46:03 +08:00
Dongsheng Cai
da1f4aee95 MDL-32117 EQUELLA plugin: Added some TODO comments in callback.php and changed variable names to conform moodle coding style 2012-06-04 11:46:03 +08:00
Dongsheng Cai
36f8060a6b MDL-32117 EQUELLA plugin: Fixed file downloading redirect issue 2012-06-04 11:46:02 +08:00
Dongsheng Cai
9225747e11 MDL-32117 EQUELLA plugin: Fixed callback parameters 2012-06-04 11:46:02 +08:00
nread
7283bb95ae MDL-32117 EQUELLA plugin: EQUELLA only support references, not external files 2012-06-04 11:46:02 +08:00
nread
a3fde71746 MDL-32117 EQUELLA plugin: Remove warning when 'mimetypes' option is not set 2012-06-04 11:46:02 +08:00
nread
205f169edf MDL-32117 EQUELLA plugin: Turn off the login, refresh buttons and the search box 2012-06-04 11:46:02 +08:00
nread
1b4e7fbc37 MDL-32117 EQUELLA plugin: else if -> elseif 2012-06-04 11:46:02 +08:00
nread
11a55b46ff MDL-32117 EQUELLA plugin: Enforce selection restriction settings, but override if Moodle wants to restrict to specific MIME types as it is always going to be for resources only 2012-06-04 11:46:01 +08:00
nread
cb1871a829 MDL-32117 EQUELLA plugin: Don't restrict to MIME types if '*' is used, as user should be able to select any type at this point 2012-06-04 11:46:01 +08:00
nread
1be875bab7 MDL-32117 EQUELLA plugin: Don't include the 'mimeTypes' option if it's empty or we get the wrong stuff 2012-06-04 11:46:01 +08:00
nread
d3376ba684 MDL-32117 EQUELLA plugin: Spelling error in variable name 2012-06-04 11:46:01 +08:00