Dan Poltawski [Tue, 22 May 2012 06:32:35 +0000 (14:32 +0800)]
Merge branch 'wip-files23-fixes' of git://github.com/marinaglancy/moodle
Barbara Ramiro [Tue, 22 May 2012 06:25:23 +0000 (14:25 +0800)]
MDL-33160 new filetype icons
Marina Glancy [Tue, 22 May 2012 06:24:11 +0000 (14:24 +0800)]
MDL-33158 fixed bugs with restricting file typs in filepicker
- extension was returned without leading dot which resulted in improper validation
- fixed human-readable mime type in error message
- fixed youtube repository to support video files and pass filetype validation
Marina Glancy [Tue, 22 May 2012 06:18:06 +0000 (14:18 +0800)]
MDL-33160 fixed some icons and groups for file types
Dan Poltawski [Tue, 22 May 2012 05:57:51 +0000 (13:57 +0800)]
Merge branch 'dev_MDL-33154_sesskey_error' of git://github.com/dongsheng/moodle
Dan Poltawski [Tue, 22 May 2012 05:34:18 +0000 (13:34 +0800)]
Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 22 May 2012 05:05:28 +0000 (13:05 +0800)]
Merge branch 'w21_MDL-32379_m23_forumcron' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 22 May 2012 04:51:45 +0000 (12:51 +0800)]
Merge branch 'MDL-33116-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 22 May 2012 04:28:37 +0000 (12:28 +0800)]
Merge branch 'MDL-32744-master-3' of git://git.luns.net.uk/moodle
Dongsheng Cai [Tue, 22 May 2012 04:14:59 +0000 (12:14 +0800)]
MDL-33154 added missing sesskey to navgation nodes
Dan Poltawski [Tue, 22 May 2012 03:54:30 +0000 (11:54 +0800)]
Merge branch 'wip-mdl-33027' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 22 May 2012 03:44:23 +0000 (11:44 +0800)]
Merge branch 'MDL-33153-master-integration' of github.com:FMCorz/moodle
Rajesh Taneja [Thu, 17 May 2012 07:10:56 +0000 (15:10 +0800)]
MDL-33027 theme: Hidden section link will be displayed dimmed in section navigation
Rajesh Taneja [Wed, 16 May 2012 06:22:22 +0000 (14:22 +0800)]
MDL-33027 themes: Modified heading to be displayed for section in all themes
Dan Poltawski [Tue, 22 May 2012 03:14:12 +0000 (11:14 +0800)]
Merge branch 'MDL-32981-master' of github.com:FMCorz/moodle
Frederic Massart [Mon, 21 May 2012 05:00:31 +0000 (13:00 +0800)]
MDL-32981 Filepicker: my private files uses edit page instead of view
Sam Hemelryk [Tue, 22 May 2012 02:49:35 +0000 (14:49 +1200)]
Merge branch 'MDL-32204-mnet-auth' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Tue, 22 May 2012 02:40:31 +0000 (14:40 +1200)]
Merge branch 'MDL-33051' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 22 May 2012 02:31:59 +0000 (14:31 +1200)]
Merge branch 'MDL-33055_master' of git://github.com/kordan/moodle
Dan Poltawski [Tue, 22 May 2012 02:30:36 +0000 (10:30 +0800)]
Merge branch 'wip-MDL-33066-m23' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Tue, 22 May 2012 01:42:39 +0000 (13:42 +1200)]
MDL-32932 mod_assign: Coding style clean up and security improvement
Sam Hemelryk [Tue, 22 May 2012 02:21:41 +0000 (14:21 +1200)]
Merge branch 'MDL-32932' of git://github.com/netspotau/moodle-mod_assign
Conflicts:
mod/assign/gradingtable.php
Dan Poltawski [Tue, 22 May 2012 02:18:45 +0000 (10:18 +0800)]
Merge branch 'MDL-33167' of git://github.com/lazydaisy/moodle
Mary Evans [Tue, 22 May 2012 02:05:42 +0000 (03:05 +0100)]
MDL-33167 theme_afterburner: added z-index to fix issue with yui3-widget when adding activity or resourse using new feature dialogue box
Frederic Massart [Tue, 22 May 2012 01:36:29 +0000 (09:36 +0800)]
MDL-33153 Resource: rename submit button to 'save changes' in folder resource
Sam Hemelryk [Mon, 21 May 2012 23:38:03 +0000 (11:38 +1200)]
Merge branch 'MDL-33118' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 21 May 2012 23:33:52 +0000 (11:33 +1200)]
MDL-33122 Coding style cleanup during integration
Sam Hemelryk [Mon, 21 May 2012 22:54:48 +0000 (10:54 +1200)]
Merge branch 'MDL-33122-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 21 May 2012 22:49:59 +0000 (10:49 +1200)]
Merge branch 'MDL-33137-master-2' of git://git.luns.net.uk/moodle
Andrew Robert Nicols [Mon, 21 May 2012 11:25:34 +0000 (12:25 +0100)]
MDL-33137 Add styling to activity chooser buttons
sam marshall [Mon, 21 May 2012 11:55:32 +0000 (12:55 +0100)]
MDL-33116 Media filter broken with slasharguments off
Ruslan Kabalin [Tue, 8 May 2012 10:10:22 +0000 (11:10 +0100)]
MDL-32744: Maintain format specific CSS selectors in the format configuration.
This updates existing core formats and introduce a configuration function.
Dan Poltawski [Mon, 21 May 2012 12:17:12 +0000 (20:17 +0800)]
Merge branch 'MDL-33126-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 21 May 2012 12:04:42 +0000 (20:04 +0800)]
MDL-33032 - dont require repository/lib.php until necessary
This is an ugly fix to a broken installer only.
Dan Poltawski [Mon, 21 May 2012 10:54:02 +0000 (18:54 +0800)]
MDL-31901: Fix trailing whitespace
sam marshall [Mon, 21 May 2012 11:05:30 +0000 (12:05 +0100)]
MDL-33126 Fix error on first view of new course page
Dan Poltawski [Wed, 16 May 2012 06:13:17 +0000 (14:13 +0800)]
MDL-31901: filemanager/picker.js - match coding style
* No inline ifs
* Spacing between ternary operators
* Missing ;'s
Dan Poltawski [Wed, 16 May 2012 04:52:03 +0000 (12:52 +0800)]
MDL-28666: filelib - remove unusused globals
Dan Poltawski [Wed, 16 May 2012 07:39:56 +0000 (15:39 +0800)]
MDL-28666 repository - Switch usefilereference to PARAM_BOOL
Dan Poltawski [Wed, 16 May 2012 03:11:33 +0000 (11:11 +0800)]
MDL-28666 admin/repository: use PARAM_BOOL for booleans.
Dan Poltawski [Mon, 21 May 2012 10:19:32 +0000 (18:19 +0800)]
Merge branch 'wip-files23' of git://github.com/marinaglancy/moodle
Marina Glancy [Mon, 21 May 2012 10:17:25 +0000 (03:17 -0700)]
Merge pull request #4 from mudrd8mz/wip-files23-fixes
Changing the tinyicon size to 24x24
David Mudrak [Mon, 21 May 2012 09:29:47 +0000 (11:29 +0200)]
MDL-32471 redefining the tinyicon thumbnail size to 24x24
As requested by the Files 2.3 UI team.
Dan Poltawski [Mon, 21 May 2012 09:22:13 +0000 (17:22 +0800)]
Merge branch 'MDL-22504_drag_and_drop_upload_integration' of git://github.com/davosmith/moodle
Marina Glancy [Mon, 21 May 2012 09:12:55 +0000 (17:12 +0800)]
MDL-32247 fixed bug with displaying icon for unknown filetype, fixed merge mistakes
Davo Smith [Mon, 21 May 2012 09:03:55 +0000 (10:03 +0100)]
MDL-22504 Course drag and drop upload - experimental setting is now a checkbox
Dongsheng Cai [Mon, 21 May 2012 08:27:49 +0000 (16:27 +0800)]
MDL-33127 stored_file::update should use get_content_file_location because it tried to update file_record
Barbara Ramiro [Mon, 14 May 2012 05:51:00 +0000 (13:51 +0800)]
MDL-32900 Change Icons to FileTypesIcons
Marina Glancy [Mon, 21 May 2012 07:17:53 +0000 (15:17 +0800)]
MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons
- function get_mimetypes_array() now contains also information about filetype groups and language strings
- use 'smart' human-readable mimetype description
- never determine filetype group based on filetype icon image! remove function mimeinfo_from_icon()
- get rid of class filetype_parser and file lib/filestorage/file_types.mm, replaced with functions file_get_typegroup(), file_extension_in_typegroup() and file_mimetype_in_typegroup()
- support multiple icon sizes, not only 16 and 32
- retrieve filetype icon only using proper functions file_..._icon() from lib/filelib.php throughout the code
- increase size of repository thumbnails to 90 and icons to 24 (will take effect when new icons exist)
Davo Smith [Mon, 21 May 2012 07:34:50 +0000 (08:34 +0100)]
MDL-22504 Course drag and drop upload - removed browser specific content hacks, made 'text and link' dragging an experimental feature
Kordan [Mon, 21 May 2012 07:26:52 +0000 (09:26 +0200)]
MDL-33055 theme_formal_white: changed "general" to "standard" in $theme->layouts array index
Dongsheng Cai [Mon, 21 May 2012 05:30:41 +0000 (13:30 +0800)]
MDL-33082 Detecting mimetype based on content bytes
Barbara Ramiro [Mon, 21 May 2012 06:47:14 +0000 (14:47 +0800)]
MDL-31901 filemanager and filepicker styling
- Swaped tool buttons and view buttons sequence for keyboard access both on filemanager and filepicker
- Added "new folder name" label and "cancel" button on create a folder dialogue
- Added href="#" and resized fonts on confirmation and message dialogue
Ankit Agarwal [Mon, 21 May 2012 05:32:02 +0000 (13:32 +0800)]
MDL-33122 repositories: Enable youtube,url and wikimedia repositories by default
Dan Poltawski [Mon, 21 May 2012 05:26:36 +0000 (13:26 +0800)]
Merge branch 'MDL-33079' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 21 May 2012 04:12:44 +0000 (12:12 +0800)]
MDL-33051 - topics format: remove section number from section column
We don't think its necessary anymore
David Mudrak [Fri, 18 May 2012 20:58:50 +0000 (22:58 +0200)]
MDL-33096 update the file's timemodified if it was changed in the draft area
Previously up to 2.2, new file records were created for all files that
were modified in the draft area - see file_save_draft_area_files().
The commit
aba1e17dd7ffa5e42d309fb2efe7945aeb3b3d39 introduced a new way
of re-using the previous file's record. We need to transfer the
timemodified of the file in the draft area into the file in the real
area when saving the draft area to achieve the same behaviour now in 2.3.
Note this may eventually lead to kinda weird situation when the file was
created say on a certain timecreated but then was replaced with another file
that has timemodified set to a lower value (in other words, the file
will look as if it was firstly modified and then created). This case
should be handled by the filepicker if it is seen as the issue.
David Mudrak [Fri, 18 May 2012 20:17:41 +0000 (22:17 +0200)]
MDL-33093 invalidate the thumbnail in the local browser's cache on update
This adds &oid= parameter to the URL of file preview images. The
parameter is supposed to be ignored by draftfile.php and pluginfile.php.
It just holds some unique identification of the original file's
revision. Currently, we use the timestamp of the most recent
modification of the original file.
David Mudrak [Fri, 18 May 2012 13:42:30 +0000 (15:42 +0200)]
MDL-33098 filemanager now stores the new author field correctly
Dongsheng Cai [Thu, 17 May 2012 05:55:03 +0000 (13:55 +0800)]
MDL-33032 Fixed issues for file integration
1. Added tracker issue number in comment
2. Fixed stored_file::delete_reference()
3. repository::send_file() will throw exception if not implemented by subclass
4. Fixed renaming unit test, added one unit test for deleting original file
5. Fixed copyright statement for googledoc and picasa repository plugin
6. Implemented stored_file::set_filesize()
Dongsheng Cai [Thu, 17 May 2012 06:18:13 +0000 (14:18 +0800)]
MDL-28666, Fixed source field when download a file using filepicker
Barbara Ramiro [Thu, 17 May 2012 05:56:21 +0000 (13:56 +0800)]
MDL-31901 filemanager and filepicker styling
- Thumbnail for Private files, Server file and Recent file restyled
- Thumbnail for Context menu made flexible
- Filenames on hover made all text visible
- Drag and drop arrow hidden for unsupported browsers
- Drag and drop styled applied on edit profile
- Yui3 panel focused removed
Marina Glancy [Wed, 16 May 2012 07:05:14 +0000 (15:05 +0800)]
MDL-31901 fixed forgotten overwrite dialogue in filepicker
Dongsheng Cai [Wed, 16 May 2012 06:08:37 +0000 (14:08 +0800)]
MDL-32867 filemanager and repository
1. Allowing "." as filename, so filemanager can rename folder
2. Fixed import_external_file method
3. Disallow recent repository to list file references
Marina Glancy [Wed, 16 May 2012 02:07:01 +0000 (10:07 +0800)]
MDL-32867: changed renaming of folders to the new API (function 'rename'), removed unused code
Petr Skoda [Wed, 16 May 2012 00:46:43 +0000 (08:46 +0800)]
MDL-33015 fix invalid PAGE->url in repo instance config pages
Conflicts:
admin/repositoryinstance.php
Petr Skoda [Tue, 15 May 2012 13:22:31 +0000 (15:22 +0200)]
MDL-33015 revert form actions to default back to FULLME
This is a temporary workaround until we fix all admin pages to set up actual url properly in admin_externalpage_setup().
Marina Glancy [Tue, 15 May 2012 06:20:31 +0000 (14:20 +0800)]
MDL-31901 Implemented lazy loading of thumbnails in filemanager
Dongsheng Cai [Tue, 15 May 2012 03:10:04 +0000 (11:10 +0800)]
MDL-28666 phpdoc improvements
Marina Glancy [Tue, 15 May 2012 02:51:00 +0000 (10:51 +0800)]
MDL-32867 Display a list of references pointing to the file in filemanager
Barbara Ramiro [Mon, 14 May 2012 05:41:07 +0000 (13:41 +0800)]
MDL-31901 Styled File Manager Icon view, Table view and Tree view
Dongsheng Cai [Mon, 14 May 2012 07:22:26 +0000 (15:22 +0800)]
MDL-28666 file_storage::get_directory_files() supports references
Dongsheng Cai [Mon, 14 May 2012 06:17:30 +0000 (14:17 +0800)]
MDL-28666 Files API and db changes
1. Fix db regression
2. Unit tests for is_external_file() and rename exception
3. Searching reference method exclude draft files
Marina Glancy [Mon, 14 May 2012 03:53:18 +0000 (11:53 +0800)]
MDL-31901, MDL-28666 merged files API changes
David Mudrak [Sat, 12 May 2012 14:24:11 +0000 (16:24 +0200)]
MDL-31901 draft files manager supports realthumbnail, realicon and dimensions for images
David Mudrak [Sat, 12 May 2012 14:20:40 +0000 (16:20 +0200)]
MDL-31901 draftfile.php supports the preview parameter
David Mudrak [Thu, 10 May 2012 07:46:44 +0000 (09:46 +0200)]
MDL-31901 fixed the name of user draft file serving handler
Files stored in user context, draft are must be served by draftfile.php,
not the pluginfile.php.
David Mudrak [Thu, 10 May 2012 04:12:24 +0000 (06:12 +0200)]
MDL-31901 repositories serving images from the filepool now provide preview details
David Mudrak [Thu, 10 May 2012 02:09:25 +0000 (04:09 +0200)]
MDL-31901 file_info_stored now provides access to the wrapped stored_file's get_imageinfo() method
Marina Glancy [Fri, 11 May 2012 01:30:23 +0000 (09:30 +0800)]
MDL-32914 fixed function get_imageinfo() to get rid of notice messages
Marina Glancy [Thu, 10 May 2012 08:00:46 +0000 (16:00 +0800)]
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
Marina Glancy [Thu, 10 May 2012 07:20:09 +0000 (15:20 +0800)]
MDL-31901 filepicker interface changes:
- fixed displaying and dragging of dialog popups;
- fixed error when repository results are filtered;
- added string for image dimensions
Marina Glancy [Wed, 9 May 2012 03:25:14 +0000 (11:25 +0800)]
MDL-31901: moved select-file panel outside of filepicker/filemanager for better UI
Marina Glancy [Wed, 9 May 2012 03:03:06 +0000 (11:03 +0800)]
MDL-31901,MDL-28666: add support for external references in new filepicker design
Marina Glancy [Mon, 7 May 2012 03:03:23 +0000 (11:03 +0800)]
MDL-31901: filemanger: fixed bug with switching to treeview in empty folder
Marina Glancy [Mon, 7 May 2012 02:32:27 +0000 (10:32 +0800)]
MDL-31901: filemanager: fixed 'Original' label, and small bug in treeview navigation
Marina Glancy [Fri, 4 May 2012 08:46:41 +0000 (16:46 +0800)]
MDL-31901: Filemanager and Filepicker, cleaned up requirements and strings
Marina Glancy [Fri, 4 May 2012 08:09:26 +0000 (16:09 +0800)]
MDL-31901: Highlighting main file in FileManager
Marina Glancy [Fri, 4 May 2012 05:26:10 +0000 (13:26 +0800)]
MDL-31901: Updating/moving files in FileManager
- added new functions to the backend (repository/draftfiles_ajax.php) to allow changing of file name, location, license and author in one request
- enabled changing file properties using JS UI (lib/form/filemanager.js)
Marina Glancy [Thu, 3 May 2012 08:53:44 +0000 (16:53 +0800)]
MDL-31901: FileManager uses more YUI3 windows and more renderers
- Add folder dialog in FileManager now uses YUI3 and renderer;
- Fixed bug with remembering current folder in Tree view;
- Display error messages in FileManager using YUI3 and not using 'alert'
Marina Glancy [Thu, 3 May 2012 07:14:59 +0000 (15:14 +0800)]
MDL-31901: FileManager, added image for accessing right-click action
Marina Glancy [Wed, 2 May 2012 08:03:38 +0000 (16:03 +0800)]
MDL-31901: removed accidentally commited testing code
Barbara Ramiro [Wed, 2 May 2012 07:35:50 +0000 (15:35 +0800)]
MDL-31901: Change the UI in filepicker CSS rendered and images
Marina Glancy [Wed, 2 May 2012 06:59:09 +0000 (14:59 +0800)]
MDL-31901: Allow FileManager to re-use FilePicker JS code for view modes:
- when loading core_filepicker we extend the Node element with functions necessary to display files list in different view modes;
- repository/filepicker.js is changed to use those functions;
- FileManager now has three different view modes (icon view, tree view and table view), JS code is re-used from FilePicker;
- files in FileManager no longer have context menu, they have one popup Widget with different actions instead;
- Added more templates for JS code to FileManager, use similar CSS class names as FilePicker;
- lib/filelib.php : fixed double slashes in path, return more data about files;
- lib/form/filemanager.php : pass information to FileManager about available licenses and default author;
- repository/draftfiles_ajax.php : return information about directory tree for file moving UI in FileManager, return formatted information;
- repository/lib.php : function repository::prepare_listing() now can work also with draftarea files listing;
Marina Glancy [Thu, 26 Apr 2012 07:28:53 +0000 (15:28 +0800)]
MDL-31901: moved filepicker html to files/renderer.php, pass templates once per page
Marina Glancy [Thu, 26 Apr 2012 03:53:52 +0000 (11:53 +0800)]
MDL-31901: user renderer for filemanager, decrease html generation in filemanager.js and dndupload.js
Marina Glancy [Tue, 24 Apr 2012 05:17:36 +0000 (13:17 +0800)]
MDL-31901: show shorttile instead of title where applicable
Marina Glancy [Tue, 24 Apr 2012 03:09:18 +0000 (11:09 +0800)]
MDL-32473,MDL-32471: Lazy loading of next page and image thumbnails when scrolling
Marina Glancy [Mon, 23 Apr 2012 06:41:00 +0000 (14:41 +0800)]
MDL-31901: Simple loading of the next page, migrating to YUI 3.5.0
- instead of using paging bar and navigating between pages, there is a link 'more' in the bottom of the list that loads the files from the next page and adds them to the bottom of the list;
- DataTable is updated to YUI 3.5.0, sorting is done properly
Marina Glancy [Thu, 19 Apr 2012 02:40:21 +0000 (10:40 +0800)]
MDL-31901: Changing interface of file picker, use renderers:
- Filepicker window is now resizable and draggable;
- filepicker&renderer: removed id substitution from renderer, replaced it with classes (better readability);
- filepicker: allowed tree and table view for search results;
- filepicker: fixed small bug with displaying external link checkbox
- filepicker: display additional information about file in select window, repository returns more formatted information