Commit Graph

440 Commits

Author SHA1 Message Date
Christopher Schäpers 70c0d7d6bc Merge pull request #5310 from owncloud/hide_filestable-header_when_empty
Hide files list header, when theres no files to see
2013-10-22 14:39:14 -07:00
Thomas Müller cea1f80c1a Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyle
Fixed ugly white space while loading file thumbnail
2013-10-22 14:20:48 -07:00
Vincent Petry 263f8bebfe Added FileList.setViewerMode to hide controls
Some files app embed themselves under the controls (like the text
editor). The new method FileList.setViewerMode() makes it possible to
properly show/hide the control buttons using the correct permissions.

Apps using this approach must call setViewerMode(true) when starting and
setViewerMode(false) upon closing to restore the controls.

This is needed for #5284
2013-10-22 16:44:57 +02:00
Vincent Petry 3bb7cf939e Fixed ugly white space while loading file thumbnail
Preview images are now pre-loaded before being set on the file element.

This fixes #5135 and prevents a white space to be displayed while the
thumbnails is being loaded.
2013-10-22 12:08:05 +02:00
kondou 732e7db319 Fix mind-boggling emptycontent logic 2013-10-21 19:49:27 +02:00
kondou 7864a3bf07 Fix shared folder still showing fileheader 2013-10-21 17:59:51 +02:00
kondou 40cc57ab3e Improve updateEmptyContent logic 2013-10-20 22:55:49 +02:00
kondou 60b25a2e97 Create FileList.updateEmptyContent() and fix not showing emptycontent after deletion 2013-10-20 22:47:44 +02:00
Bjoern Schiessle 1c611a3dfb give getSelectedFilesTrash() a unique name for the trash.js to avoid confusions with the same function in files.js 2013-10-18 10:57:10 +02:00
Vincent Petry 467f864db4 Fixed sharing status update for new/uploaded files
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.

For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.

Performance should improve as the sharing list is now only loaded once
per navigation session.

In OC.Share, split loadIcons into loadIcons + updateIcons.

Fixes #4977
2013-10-17 12:55:10 +02:00
Morris Jobke a132144eca Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix
Fixed conflict dialog in IE8
2013-10-16 12:52:41 -07:00
Morris Jobke db31541fe1 Merge pull request #5353 from owncloud/files-dndtodirbroken
Fixed drag and drop to subfolder and breadcrumb
2013-10-16 04:52:35 -07:00
Vincent Petry c6f14001bb Fixed drag and drop upload to breadcrumb 2013-10-15 16:14:23 +02:00
Vincent Petry 92e646413a Fixed drag and drop onto folders
Fixes #5351
2013-10-15 15:59:45 +02:00
Vincent Petry fab4102c51 Disabled ajax mode for public files view
Ajax loading is not supported yet for public files view.
This fix disabled the history API, ajax loading and ajax directory
switch in public mode until it is implemented properly.
2013-10-14 17:47:38 +02:00
kondou f828b51ede Hide files list header, when theres no files to see 2013-10-12 17:28:20 +02:00
Thomas Müller dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
Vincent Petry e98ea06890 File actions are now updated after create/upload file
The file actions must explicitly be updated by calling
FileActions.display() on the file element after creating or uploading a
file.

Fixes #4971 and #4993
2013-10-11 17:07:48 +02:00
Vincent Petry e2a4417079 Fixed conflict dialog in IE8
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
2013-10-10 15:54:00 +02:00
Vincent Petry 3a3819b303 Merge pull request #5134 from owncloud/trashbin-homeiconbroken
Do not call changeDirectory() when no dir set on breadcrumb
2013-10-09 09:01:43 -07:00
Thomas Müller 7c6ed6ab33 catch exceptions while uploading and pass on the error message 2013-10-08 15:03:24 +02:00
VicDeo d8b7e42fc1 Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
File conflicts dialog fixes
2013-10-07 08:19:40 -07:00
Jörn Friedrich Dreyer 4ccbace68d remove double uri encoding 2013-10-07 11:15:58 +02:00
Jörn Friedrich Dreyer 0683372200 canceling individual uploads is currently impossible because there is no placeholder 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer 8899543b7f use !== comparison 2013-10-07 11:14:10 +02:00
Vincent Petry 6a4563f203 Fix breadcrumb to reinit dnd after ajax nav #5064
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.

This also fixes dropping onto the "files" app icon.
2013-10-07 11:07:33 +02:00
Vincent Petry 0736bfb43a Do not call changeDirectory() when no dir set on breadcrumb
Some apps like the files_trashbin app do not set a directory on its
"home" breadcrumb link.

This fix makes sure that the click event doesn't do anything in that
case and lets the browser open the link.

This fixes the "home" icon in the trashbin app which now correctly
reopens the files app.
2013-10-04 17:49:42 +02:00
Vincent Petry ba0f2f10a7 Merge pull request #4933 from owncloud/1376-filesappplussigninurlbug
Replace plus sign with space in files app URL #4932
2013-10-04 05:30:30 -07:00
Vincent Petry 9d2595a7c5 Shortened notification message that was too long
The message for invalid private key was too long and didn't fit in the
notification box. This fix reduces the message to fit properly by
removing the extra information.
2013-10-04 11:11:24 +02:00
Bjoern Schiessle 4d79e7e673 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-30 15:08:53 +02:00
Georg Ehrke 8a1618bce5 implement previews for public upload 2013-09-23 12:27:05 +02:00
Bjoern Schiessle f6e8a388a9 Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
	settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
Vincent Petry 1962bed261 Replace plus sign with space in files app URL #4932
Some apps create URLs to the files app and encode the spaces of a
directory using plus signs.

This fix ensures that plus signs are properly converted back to spaces
when parsing the URL on the JS side.
2013-09-20 22:08:57 +02:00
Jörn Friedrich Dreyer 7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/filelist.js
2013-09-19 17:00:54 +02:00
Jörn Friedrich Dreyer bd5cb1d801 Merge pull request #4900 from owncloud/fixing-4488-master
File permissions are part of the ajax response of file upload
2013-09-19 07:46:37 -07:00
Jörn Friedrich Dreyer 9f9eb1b08f Merge pull request #4263 from owncloud/search_scrollto
initial scrollto implementation
2013-09-19 05:49:45 -07:00
Jörn Friedrich Dreyer 98ff847830 fix race condition in lazy preview loading 2013-09-19 14:46:33 +02:00
Thomas Müller 4344c62f7e Merge branch 'master' into fixing-4488-master 2013-09-19 11:43:38 +02:00
Jörn Friedrich Dreyer 1bba800e47 Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog 2013-09-19 11:33:34 +02:00
Jörn Friedrich Dreyer ae97fad632 fix double translation of error message 2013-09-19 11:32:56 +02:00
Thomas Müller eea02cee2f Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-19 11:15:20 +02:00
Thomas Müller c30c153ea5 fixing typos and l10n 2013-09-19 11:13:11 +02:00
Jörn Friedrich Dreyer 89ed0007c0 jsdoc types should go into {} 2013-09-19 11:11:22 +02:00
Jörn Friedrich Dreyer 0d81a53e12 use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there 2013-09-19 10:00:42 +02:00
Thomas Müller 3c0e93e220 no file actions during upload 2013-09-18 23:06:48 +02:00
Jörn Friedrich Dreyer 715846626e hide excessive logging with a trace flag 2013-09-18 14:39:39 +02:00
Jörn Friedrich Dreyer 17337b22af Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-18 14:19:58 +02:00
Thomas Müller 20a43d1982 remove file action elements before recreating them 2013-09-18 13:09:47 +02:00
Thomas Müller 6ed2df11fc store the permissions retrieved via ajax within the dom element 2013-09-18 13:09:04 +02:00
Jörn Friedrich Dreyer 86c4c83b86 use exists 2013-09-17 19:11:18 +02:00