wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
30262 commits 157 branches 562 tags 714 MiB
Commit graph

970 commits

Author SHA1 Message Date
Thomas Müller
25b0b01f5e Merge pull request #19467 from owncloud/files-newmenu-highlightcurrent 
Keep opacity in current item in newFileMenu
 2015-09-30 14:21:28 +02:00
Thomas Müller
750f19340f Merge pull request #19310 from owncloud/hide-sort-indicator 
hide sort indicator when in multiselect mode, ref #19056
 2015-09-30 11:07:45 +02:00
Thomas Müller
10978a7a61 Merge pull request #19373 from owncloud/sidebar-preview-cover 
Cover both width and height for the sidebar preview
 2015-09-30 11:07:18 +02:00
Morris Jobke
1051a3c6f5 Change small thumbnails to 32 px 
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
 2015-09-30 10:49:48 +02:00
Vincent Petry
d835115600 Keep opacity in current item in newFileMenu 
Whenever the input field appears, the menu item should keep its opacity
instead of reacting on hover.
 2015-09-30 10:44:59 +02:00
Vincent Petry
dbb6692468 [IE8] Fix filetype icon sizes 
Added hack that uses a "filter" CSS with explicit URL to fix the "New"
menu by scaling down icons and also fix the folder/filetype icon in the sidebar
by scaling it up.
 2015-09-29 18:28:31 +02:00
Thomas Müller
733673b39d Merge pull request #19365 from owncloud/files-detailsbar-interaction 
Fix sidebar interaction
 2015-09-29 14:44:28 +02:00
Vincent Petry
d52361b09b Disable sorting when multiselect is enabled in file list 2015-09-29 13:24:33 +02:00
Thomas Müller
f2cd334c8a Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeupload 
Show conflict dialog before upload when possible
 2015-09-29 13:17:47 +02:00
Robin Appelman
fbe296df17 adjust aspect ratio of preview size when for aspect ratios > 16/9 2015-09-29 13:07:08 +02:00
Robin Appelman
a40a2b0d64 improve handling of small images 2015-09-29 13:07:08 +02:00
Robin Appelman
222a4bd4ac Scale portrait images correctly 2015-09-29 13:07:08 +02:00
Robin Appelman
f41a38ba15 Cover both width and height for the sidebar preview 2015-09-29 13:07:03 +02:00
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
f9acf4627e Fix sidebar interaction 
- Clicking a file row or selecting it will open the sidebar.
- When sidebar is open, its contents update with the last selection.
- Dragging doesn't open the sidebar but does update its contents if it was
open already.
- Switching folders closes the sidebar.
- Close sidebar when highlighted file got deleted/removed from list
 2015-09-28 15:23:37 +02:00
Vincent Petry
a8fb0038e9 Hide sidebar tab headers conditionally 
Added canDisplay() in DetailsTabView that should return false if the tab
header of this tab must be hidden
 2015-09-28 14:57:44 +02:00
Thomas Müller
72024ad201 Merge pull request #19404 from owncloud/files-sidebar-sorttabs 
Fix tabs order in files sidebar
 2015-09-28 12:55:38 +02:00
Vincent Petry
5e4a52d3c2 Fix tabs order in files sidebar 2015-09-28 12:30:12 +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
Robin Appelman
d0ea62a51c adjust the height of the sidebar preview image when resizing the browser 2015-09-23 14:56:13 +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
8767c2b3be fix small mimetype icons 2015-09-15 15:40:42 +02:00
Robin Appelman
72cfeaf157 recognize eps, psd and illustrator as image 2015-09-15 14:32:07 +02:00
Robin Appelman
a734606649 Various thumbnail fixes 
- Show square images as portrait
- Set max height based on sidebar width
- cleanup
 2015-09-15 14:32:07 +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
Georg Ehrke
4660fefd01 enforce loading icon in sidebar to be 32x32 2015-09-11 18:15:36 +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
73c61941e2 Tags in FileInfo map must be an array 
Fixes FileList.elementToFile to make an array for the tags instead of
keeping the original joined string
 2015-09-03 13:01:14 +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
Vincent Petry
3ea9f97c36 Fix sidebar thumbnail loading JS unit tests 2015-09-03 08:24:50 +02:00
Jan-Christoph Borchardt
69b6358df6 fix icon and layout details for new menu 2015-09-03 00:58:03 +02:00
Robin Appelman
068ff09cfe fallback for isimage 2015-09-02 19:22:46 +02:00
Robin Appelman
e85620ab69 larger preview for images in the sidebar 2015-09-02 10:32:43 +02:00
Robin Appelman
c6060f53cd allow handling thumbnail errors 2015-09-02 10:32:43 +02:00
Raghu Nayyar
468bde67ff Removes unecessary divs and adds max width to longer names. 2015-08-30 14:17:18 +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
5e6fa3c938 Fix trashbin sidebar 
Do not display size as it is not available.
Use display name instead of name to remove the ".d123456" suffix.
 2015-08-25 11:29:35 +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
Thomas Müller
2f86be9ced Merge pull request #18523 from owncloud/crazy-scanner 
Prevent bkg scanner going crazy with unavailable storages (ajax/scan.php)
 2015-08-25 09:23:42 +02:00
Morris Jobke
b2fcdd65cd Merge pull request #18528 from owncloud/files-sidebar-mtime 
Parse mtime from the data attributes
 2015-08-24 19:44:46 +02:00
Vincent Petry
37939fb0e8 Parse mtime from the data attributes 2015-08-24 17:16:20 +02:00
Jan-Christoph Borchardt
a659ccb89c bigger file thumbnail in app sidebar 2015-08-24 16:58:30 +02:00
Vincent Petry
fe575feca8 Prevent scanner going crazy with unavailable storages 2015-08-24 16:42:53 +02:00
Vincent Petry
7c64ae4663 Add namespace in case the file is loaded individually 
Some apps might load this file in JS unit tests and need the OCA.Files
namespace to exist.
 2015-08-20 17:54:52 +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
Thomas Müller
9f6c33abe9 Merge pull request #18339 from owncloud/update-jquery-visibility 
update jquery-visibility in files app
 2015-08-19 09:54:05 +02:00
Morris Jobke
7b0f43efb6 Merge pull request #18381 from owncloud/public-share-fixdepsloading 
Fix file actions menu in public page
 2015-08-18 13:58:03 +02:00
Vincent Petry
37a842a18e Only show delete action in menu when delete permission exists 
This reverts an older decision where we said the delete action must
always appear but be grayed out when the permission is missing.
The actions menu obsoletes that.
 2015-08-18 11:35:40 +02:00
Vincent Petry
730f1d199a Fix spinner when deleting all files in a folder 2015-08-18 11:14:41 +02:00
Vincent Petry
ffff156965 Merge pull request #18310 from hasso/selection-string-fix 
Fix the string counting a selected files/dirs
 2015-08-18 10:43:17 +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
Morris Jobke
51c3a3ddaf update jquery-visibility in files app 
* ref #12877
 2015-08-17 09:39:21 +02:00
Vincent Petry
e2549fa660 Improve right sidebar tabs behavior 
Tab heads are not rendered if only one tab.

The tab contents is updated on-demand. This means that if a tab is not
visible it is not rendered at first. If the tab was already rendered
through switching, its model will not get updated until the next time it
becomes visible. This will prevent needless rerendering of invisible tab
contents, especially considering that some tabs might need extra ajax
requests.
 2015-08-14 16:51:04 +02: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
Vincent Petry
b811124aac Merge pull request #18231 from owncloud/fix-show-shared-storage-full-temporary 
Show storage full warning for shared storages temporary
 2015-08-13 10:05:53 +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
997577cf7a Introduce FileInfoModel 
FileInfoModel is a backbone model that will make it possible to track
changes and update views accordingly
 2015-08-12 17:29:54 +02:00
Morris Jobke
e6bf4e559a Show strage full warning for shared storages temporary 
* removed the setDefault call because then it will always be
  reshown
  * was added with ba475d4862
* fixes #18208
 2015-08-12 14:14:43 +02:00
Vincent Petry
984ae8140d Fixed file actions menu to close when reclicking trigger 
FileActionsMenu is now a backbone view.
The trigger and highlight handling is now done in the
FileActions.showMenu() method using events.
 2015-08-11 11:35:46 +02:00
Vincent Petry
86e1eaf370 Inline actions using default renderer are now always permanent 
Default renderer like the favorite icon can decide whether to use the
permanent class or not.

Fixed sharing code to properly update the icon according to sharing
state modifications.
 2015-08-10 15:57:21 +02:00
Vincent Petry
b142fbe6d7 Added bubble style, applied to file actions menu 2015-08-10 14:12:34 +02:00
Vincent Petry
9454e9043a Updated unit tests for file actions and actions menu 2015-08-10 14:12:34 +02:00
Vincent Petry
dd4e0a8253 Make file action menu icon permanent 2015-08-10 14:12:34 +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
Hendrik Leppelsack
7760300fca replace tipsy with tooltip 2015-08-07 12:33:50 +02:00
Arthur Schiwon
d1439ec104 fix tipsy gravity after rebase 2015-08-07 01:23:50 +02:00
Jan-Christoph Borchardt
eb323fe8de fix position of elements in right sidebar 2015-08-07 01:22:44 +02:00
Vincent Petry
781ba420c9 Use own tabs impl in files sidebar 
Also change style.
 2015-08-07 01:22:44 +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
Arthur Schiwon
7a982872e7 Main view does not commands detail and tab views to render. Fixes JS tests. 
For a predictive behaviour we need to determine who is allowed to call render
methods on the views. Either, the main view is solely allowed to call render
and views do not do anything about output until then. Or, the main view relies
on the concrete views to be ready when things are about to be shown. The latter
approach has the advantage that concrete views know when they have to update
themselves (e.g. new data arrives or information change), but the main view
has now idea of the inner workings.
 2015-08-07 01:22:43 +02:00
Vincent Petry
3e44ca6dc2 Added unit tests for right sidebar 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