Commit graph

410 commits

Author SHA1 Message Date
Vincent Petry
cc8efaa037 Show conflict dialog before upload when possible
When uploading files, first check if the files exist in the current file
list. For the ones that do, show a conflict dialog.
For the rest, upload directly.

If the upload operation detects a conflict on the server side, it will
also continue populating the conflict dialog.

From now on, server side conflict can only occur if someone concurrently
uploaded a file into the same folder but the current user hasn't
refreshed the list yet.
2015-09-28 17:50:11 +02:00
Vincent Petry
f35b6833ff Fix order of actions in the files actions menu 2015-09-28 11:19:49 +02:00
Olivier Paroz
46475b8114 Switch from Math.floor() to Math.ceil() when sending the dimension to Preview
Fixes #18203
2015-09-27 12:46:25 +02:00
Hendrik Leppelsack
28d3c1cc0b fix filelist checkboxes 2015-09-25 00:51:39 +02:00
Thomas Müller
4c62d71db7 Merge pull request #19277 from owncloud/files-plusbuttonfix
Only render the plus button when it makes sense
2015-09-23 11:31:52 +02:00
Thomas Müller
9fbd3fa6c1 Merge pull request #19270 from owncloud/files-sidebar-fixfortrashandco
Properly show sidebar for trash and sharing sections
2015-09-22 23:53:15 +02:00
Vincent Petry
a7d84287ad Only render the plus button when it makes sense 2015-09-22 16:47:52 +02:00
Vincent Petry
fa725fba73 Properly show sidebar for trash and sharing sections 2015-09-22 15:28:48 +02:00
Vincent Petry
a35144e961 Properly translate file actions 2015-09-22 14:52:52 +02:00
Thomas Müller
4d77fac191 Merge pull request #19048 from owncloud/details-icon
add details icon for file actions dropdown
2015-09-16 13:56:30 +02:00
Jan-Christoph Borchardt
2356ba2494 fix accessibility of New button, use alt text instead of tooltip 2015-09-16 11:51:58 +02:00
Vincent Petry
e7e0cfe93d Properly show sidebar when clicking on share button 2015-09-16 07:23:29 +02:00
Vincent Petry
e90065881d Bring back the share icon and update its status
Display share icon in file list row.
Update share icon status when the sharing state changed.
2015-09-16 07:23:28 +02:00
Thomas Müller
d1f7087b6c Merge pull request #18979 from owncloud/sidebare-preview-fixes
Sidebare preview fixes
2015-09-16 00:12:25 +02:00
Vincent Petry
7ab57f7f27 Add details icon for details menu item 2015-09-15 17:52:01 +02:00
Robin Appelman
19e1d35373 Fix path for fileinfomodel in subdirectories 2015-09-15 14:29:37 +02:00
Vincent Petry
d0cea82969 Fixed sidebar toggle entry
Properly highlight the row after selecting the item.
This also fixes the unit tests by changing the order of registration of
file actions.
2015-09-14 20:45:30 +02:00
Vincent Petry
8a6574e81a Keep right sidebar open, add Details action 2015-09-14 20:45:30 +02:00
Jan-Christoph Borchardt
004de1425e Merge pull request #18630 from owncloud/files-combineuploadbutton
Combine upload action into the "New" menu
2015-09-07 14:03:57 +02:00
Vincent Petry
310d797284 Add versions tab to files sidebar
- move versions to a tab in the files sidebar
- added mechanism to auto-update the row in the FileList whenever values
  are set to the FileInfoModel given to the sidebar
- updated tags/favorite action to make use of that new mechanism
2015-09-03 16:47:24 +02:00
Vincent Petry
4ba2333507 Added unit tests for "new" file menu and small fixes
- added unit tests for NewFileMenu
- use generateUrl for FileList.createFile and FileList.createDirectory
- added unit tests for FileList.createFile and FileList.createDirectory
2015-09-03 12:17:35 +02:00
Robin Appelman
e85620ab69 larger preview for images in the sidebar 2015-09-02 10:32:43 +02:00
Vincent Petry
59273a8863 Combine upload action into the "New" menu
Refactored the new menu to be encapsulated in the NewFileMenu JS class
2015-08-28 17:27:48 +02:00
Vincent Petry
a86602a157 Properly hide sidebar when switching between files app sections
Since there are multiple sidebars, one for each files app section, we
need to hide the correct ones.
2015-08-25 11:07:47 +02:00
Vincent Petry
37939fb0e8 Parse mtime from the data attributes 2015-08-24 17:16:20 +02:00
Vincent Petry
5fd36d017e Merge pull request #18378 from owncloud/files-delete-spinner
Fix spinner when deleting all files in a folder
2015-08-19 14:31:23 +02:00
Vincent Petry
bd6beaaae2 Merge pull request #18354 from owncloud/files-fixdnd
Fix file drag and drop JS error
2015-08-19 14:30:21 +02:00
Vincent Petry
730f1d199a Fix spinner when deleting all files in a folder 2015-08-18 11:14:41 +02:00
Hasso Tepper
bbff530b65 Move decaration to the beginning of the block 2015-08-18 10:34:30 +03:00
Vincent Petry
009c008ed8 Fix file drag and drop JS error 2015-08-17 16:09:29 +02:00
Hasso Tepper
72799ffba2 Move selectionVars into if statement 2015-08-17 15:28:55 +03:00
Hasso Tepper
69c550ce51 Fix the string counting a selected files/dirs
The old one contains untranslatable ' & ' if both files and dirs are
selected. The new code is especially designed to reuse strings from file
listing summary view (apps/files/js/filesummary.js), so no translation
is broken.
2015-08-14 14:50:25 +03:00
Jan-Christoph Borchardt
4e53b5922d Merge pull request #18178 from owncloud/files-sidebar-actions
Sidebar file actions
2015-08-13 17:17:10 +02:00
Hendrik Leppelsack
e5444a1a5d replace tipsys with tooltips 2015-08-12 23:09:49 +02:00
Vincent Petry
c964eff17b Make file actions work from sidebar
The favorite icon in the sidebar now triggers the file action and also
updates itself according to the model's state when triggered from the
file row.

The thumbnail triggers the default action.

Currently only one FileInfoModel is used for the selection and state
synchronization between views.

FileList reload now auto-closes the sidebar.
2015-08-12 17:30:20 +02:00
Vincent Petry
ca34921cdf Implement file actions dropdown
File actions now have two types "inline" and "dropdown". The default is
"dropdown".
The file actions will now be shown in a dropdown menu.
2015-08-10 14:12:34 +02:00
Vincent Petry
15e16d335d Merge pull request #17656 from owncloud/files-rightsidebar
Basic work for right sidebar
2015-08-10 13:14:15 +02:00
Vincent Petry
8e2369f72b Make sure to hide empty content message when mask is shown 2015-08-07 15:57:16 +02:00
Arthur Schiwon
5af59c6871 rename sidebar element and use css and js utility functions to core 2015-08-07 01:22:43 +02:00
Arthur Schiwon
f508cf40da sidebar shall not overlap but shrink the contnet 2015-08-07 01:22:43 +02:00
Vincent Petry
f11946c8c0 Improve layout, fix mime icon 2015-08-07 01:22:43 +02:00
Vincent Petry
b6192db610 Disable right sidebar in public file list page 2015-08-07 01:22:43 +02:00
Vincent Petry
deb9d4d778 Right sidebar now has its own scrollbar 2015-08-07 01:22:43 +02:00
Vincent Petry
ad90ba27cd Styling fixes + hightlight in files sidebar
Sidebar scrolls with contents
Highlight currently show file
2015-08-07 01:22:43 +02:00
Vincent Petry
ff614a7dbd More fixes to the right sidebar
Sidebar now works in all file list views.
Moved owner to share tab.
2015-08-07 01:22:43 +02:00
Vincent Petry
12e5f310dd Improved right sidebar
Added owner info.
Added animation, but causes scrollbal.
Default file action now when clicking on name directly.
Fixed icon.
Added empty share tab.
2015-08-07 01:22:42 +02:00
Vincent Petry
9854e71d2c Basic work for right sidebar
Adds right sidebar with registrable panels (still WIP)
2015-08-07 01:22:42 +02:00
Morris Jobke
5699fff889 Merge pull request #17175 from owncloud/add-download-feedback
Add loading spinner to download icon
2015-07-30 16:34:35 +02:00
Hendrik Leppelsack
f67477206b fixed tooltip for modified date 2015-07-27 15:56:03 +02:00
Morris Jobke
009d1f3214 move updateFileActionSpinner to OCA.Files.FileActions 2015-07-22 10:35:15 +02:00