Commit graph

488 commits

Author SHA1 Message Date
Marina Glancy
eb45e641b6 MDL-34139 filemanager select-file dialogue should update file on Enter 2012-07-06 09:44:16 +08:00
Eloy Lafuente (stronk7)
ecad7393e3 Revert "MDL-33303 Filepicker: resized to match HTML editor and made resizable"
This reverts commit c947ea3e3f.
2012-07-05 23:21:34 +02:00
Eloy Lafuente (stronk7)
20ef104713 Merge branch 'wip-MDL-33303-m24' of git://github.com/samhemelryk/moodle 2012-07-03 16:17:36 +02:00
Marina Glancy
b2dbfa90cc MDL-34117 Correctly pass accepted_types to dnduploader 2012-07-02 14:12:31 +08:00
Frederic Massart
c947ea3e3f MDL-33303 Filepicker: resized to match HTML editor and made resizable 2012-07-02 11:34:34 +12:00
Dan Poltawski
73ec069e3b Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle 2012-06-20 16:55:29 +08:00
Dan Poltawski
e3c7845314 Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle 2012-06-20 16:38:13 +08:00
Andrew Davis
703ffaea05 MDL-27156 repositories: altered a check as the !empty() test on $PAGE->course was always failing for some reason 2012-06-20 15:17:12 +07:00
Marina Glancy
83d2700ec9 MDL-33832 Fixed filling of files.source field
- also supress the error on unserialise (because people already may have broken files.source field)
- also display details about unparseable JSON error
- make source field look the same across repositories
2012-06-20 16:09:37 +08:00
Andrew Davis
bc8da017b5 MDL-27156 repositories: altered filepicker.php so that users with the ability to ignore course file size restrictions are not incorrectly restricted 2012-06-20 11:27:31 +07:00
Dan Poltawski
f14651b6b1 Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle 2012-06-20 11:17:01 +08:00
Dan Poltawski
f189c540b9 Merge branch 'MDL-33842_antivirus_message' of git://github.com/davosmith/moodle 2012-06-19 21:52:27 +08:00
Davo Smith
78b4da1963 MDL-33842 Filemanager dndupload - now displays error messages (including antivirus) 2012-06-19 14:27:12 +01:00
Dan Poltawski
139d3639c8 Merge branch 'MDL-33582-master-integration' of git://github.com/FMCorz/moodle 2012-06-19 15:39:03 +08:00
Dan Poltawski
6855fec7fd Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle 2012-06-18 17:36:03 +08:00
Aparup Banerjee
44b836d629 Merge branch 'MDL-33175' of git://github.com/danpoltawski/moodle 2012-06-18 17:14:11 +08:00
Davo Smith
d0b2d44528 MDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping file with existing name 2012-06-18 08:55:41 +01:00
Andrew Davis
448c2f5b9b MDL-27156 repositories: altered filepicker.php so that users with the ability to ignore course file size restrictions are not incorrectly restricted 2012-06-18 11:33:28 +07:00
Marina Glancy
52474d7497 MDL-33136 upload dnd files one after another 2012-06-15 14:48:02 +08:00
Frederic Massart
e7ae9c2600 MDL-33758 Filepicker: using iframe instead of popup windows for download 2012-06-15 10:12:57 +08:00
Aparup Banerjee
60d3ff94db Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle 2012-06-14 17:08:18 +08:00
Dan Poltawski
4585e6ac98 Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:23:08 +08:00
Frederic Massart
247804bcc2 MDL-33582 Filepicker: set main file button disabled when not required 2012-06-14 15:14:57 +08:00
Dan Poltawski
bc1f298b2a MDL-33175 - filemanager: make dndupload icon clickable 2012-06-14 13:25:05 +08:00
Dan Poltawski
54588ca214 Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle 2012-06-14 12:00:18 +08:00
Andrew Davis
845c2ae110 MDL-27156 repositories: switched the file manager and the file picker over to using get_user_max_upload_file_size() 2012-06-14 09:19:26 +07:00
Sam Hemelryk
043a53fb25 Merge branch 'MDL-33541' of git://github.com/danpoltawski/moodle 2012-06-14 11:27:37 +12: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
c469b3963b MDL-33446 Editor form field can filter return types
- Added possibility for editor form field to specify return_types (default FILE_INTERNAL | FILE_EXTERNAL | FILE_REFERENCE)
- For assignment, workshop, quiz essay submissions and form posts do not allow FILE_REFERENCE
- Fixed mod_resource return_types, reset them to default, because filemanager does not know how to work with FILE_EXTERNAL links
2012-06-12 11:03:43 +08:00
Frederic Massart
98d5bad9fa MDL-31499 Filepicker: download all function uses iframe instead of popup 2012-06-08 12:32:39 +08:00
Dan Poltawski
1cf840074b Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle 2012-06-04 17:13:35 +08:00
Marina Glancy
140669a9dd MDL-33026 set default author and license in drag-n-drop upload 2012-05-28 17:05:25 +08:00
Marina Glancy
5e11746696 MDL-33218 fixing filemanager/filepicker look in IE
now all YUI dialogues are under the div with id #filesskin. This way we can avoid using !important in CSS and use #filesskin instead. It will have priority over YUI skin in all browswers including IE (!important does not work in IE).

Conflicts:

	files/renderer.php
	theme/base/style/filemanager.css
2012-05-28 11:54:33 +08:00
Aparup Banerjee
708738cd73 Merge branch 'wip-MDL-33324-master' of git://github.com/marinaglancy/moodle 2012-05-25 11:25:25 +08:00
Dan Poltawski
4b0992ca19 Merge branch 'wip-MDL-33329-master' of git://github.com/marinaglancy/moodle 2012-05-24 23:30:23 +08:00
Dan Poltawski
2625d99b52 Merge branch 'wip-MDL-33144-master' of git://github.com/marinaglancy/moodle 2012-05-24 16:32:32 +08:00
Marina Glancy
2d7c111734 MDL-33329 Filepicker form element can not link by reference. Also better handling of maxbytes 2012-05-24 16:14:02 +08:00
Marina Glancy
9213f5476f MDL-33324 fixed bugs with icons in filepicker/filemanager treeview
- in treeview the icons for parent folders did not appear
- in treeview after refreshing (expanding subtrees) the image previews were replaced back to filetype icons
- also fixed a mistype in icon url in repository_local
2012-05-24 14:10:40 +08:00
Sam Hemelryk
8dd37f1f69 Merge branch 'MDL-33189-master-1' of git://git.luns.net.uk/moodle 2012-05-24 11:11:13 +12:00
Marina Glancy
ae7f35b934 MDL-33144 display filetype icon and mimetype based on extension
- use finfo to determine mimetype of a file only when it is unknown from file extension
- display filetype icon and mimetype in filemanager based on file extension
- fixed a small issue with specifying extension instead of group in file_get_typegroup()
- allow only web-compartible image types when embedding into editor or using in database field
- created new groups web_video and web_audio to use in resource module
2012-05-23 14:51:55 +08:00
Ruslan Kabalin
7d84dfe704 MDL-33189: Make checkboxcontroller functionable 2012-05-22 14:26:09 +01:00
Dan Poltawski
6a0d7194f7 MDL-31901: filemanager/picker.js - match coding style
* No inline ifs
* Spacing between ternary operators
* Missing ;'s
2012-05-21 18:25:56 +08:00
Marina Glancy
469a53a053 MDL-31901 Implemented lazy loading of thumbnails in filemanager 2012-05-21 11:57:55 +08:00
Marina Glancy
9dbdf31f8c MDL-32867 Display a list of references pointing to the file in filemanager 2012-05-21 11:57:54 +08:00
Marina Glancy
9a62f7799b MDL-32867 Working with external references in filemanager
- Files that are references to external resources have special shortcut icon in filemanager
- When user selects a REF file in filemanager, he can see the 'Original' of the file in the way that original repository wants to show it, it is loaded dynamically via AJAX request
- Files that are themselves the source of references of other files in the system have 'link' icon in filemanager. When user tries to remove/rename/overwrite SRC file he is warned that all ## existing references will be updated/converted to copies.
- Changed confirmation messages for deleting, moving/renaming of the folders
- confirmation dialog in filemanager is using YUI3 now
2012-05-21 11:57:53 +08:00
Marina Glancy
55089a9d01 MDL-31901: moved select-file panel outside of filepicker/filemanager for better UI 2012-05-21 11:57:53 +08:00
Marina Glancy
1908ae06fb MDL-31901: filemanger: fixed bug with switching to treeview in empty folder 2012-05-21 11:57:52 +08:00
Marina Glancy
e0ff0867bd MDL-31901: filemanager: fixed 'Original' label, and small bug in treeview navigation 2012-05-21 11:57:52 +08:00
Marina Glancy
4325db53ab MDL-31901: Filemanager and Filepicker, cleaned up requirements and strings 2012-05-21 11:57:52 +08:00