Commit Graph

2932 Commits

Author SHA1 Message Date
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
Thomas Müller 54b507306a Merge pull request #19409 from owncloud/files-sidebar-hiding-tabs
Hide sidebar tab headers conditionally
2015-09-29 13:17:38 +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
Jenkins for ownCloud aa3596a410 [tx-robot] updated from transifex 2015-09-29 01:55:02 -04: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
Thomas Müller 716ff81b27 Merge pull request #19401 from owncloud/files-actionsorder
Fix order of actions in the files actions menu
2015-09-28 12:53:11 +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
Jenkins for ownCloud 60f123193b [tx-robot] updated from transifex 2015-09-28 05:07:18 -04: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 dba9211d5d fix filecomparator 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack 28d3c1cc0b fix filelist checkboxes 2015-09-25 00:51:39 +02:00
Jan-Christoph Borchardt 4eb299a308 hide sort indicator when in multiselect mode, ref #19056 2015-09-23 15:09:49 +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
Thomas Müller 0c93de5a65 Merge pull request #19266 from owncloud/fileactions-translate-details
Properly translate file actions
2015-09-22 15:56:04 +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
Jan-Christoph Borchardt f6aeb023cf remove float from file/folder name in sidebar, fix #19243 2015-09-22 14:13:56 +02:00
Hendrik Leppelsack 964cfc8e08 fix missing checkboxes in file comparator 2015-09-21 12:57:34 +02:00
Thomas Müller 3325fb4cdd Merge pull request #19058 from owncloud/multiselect-bar-style
adjust multiselect bar to controls bar, fix #18989
2015-09-18 15:52:05 +02:00
Joas Schilling 5eddde6486 Add a Sabre plugin that emits an event for apps 2015-09-17 13:59:27 +02:00
Jenkins for ownCloud 91365a8969 [tx-robot] updated from transifex 2015-09-17 01:57:20 -04: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
Thomas Müller 919b7d203f Merge pull request #19066 from owncloud/fix-new-menu-mobile
fix new menu not showing on mobile, fix #18879
2015-09-16 13:54:57 +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
Jan-Christoph Borchardt 475603eeb7 fix new menu not showing on mobile, fix #18879 2015-09-16 09:49:39 +02:00
Thomas Müller afc7eeacaf Merge pull request #18185 from owncloud/share-dialog-files-sidebar
Share dialog files sidebar
2015-09-16 09:40:53 +02:00
Thomas Müller af517103b1 Merge pull request #18735 from owncloud/checkbox-style
custom checkbox style
2015-09-16 09:34:46 +02:00
Thomas Müller fad963970c Merge pull request #19062 from owncloud/line-height
fix height of 'All files' entry in sidebar
2015-09-16 09:26:36 +02:00
Hendrik Leppelsack 0ce3b19e11 fix filelist checkboxes 2015-09-16 09:06:05 +02:00
Raghu Nayyar 7ccd02ec95 Fixes white and black checkboxes in core, files will be next. 2015-09-16 09:06:05 +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
Jan-Christoph Borchardt 1d56d74c3f fix height of 'All files' entry in sidebar 2015-09-15 19:25:49 +02:00
Jan-Christoph Borchardt 00d756b4d1 adjust multiselect bar to controls bar, fix #18989 2015-09-15 18:11:44 +02:00
Vincent Petry 7ab57f7f27 Add details icon for details menu item 2015-09-15 17:52:01 +02:00
Jan-Christoph Borchardt accebae356 fix filename display in sidebar, fix #18981 2015-09-15 17:03:46 +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 98966329bf crop to the center for landscape images 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
Robin Appelman 1c792b9f43 normal margins for portrait previews 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
Lukas Reschke 1369525e7f Merge pull request #18982 from owncloud/fix_18878
enforce loading icon in sidebar to be 32x32
2015-09-14 12:47:53 +02:00
Individual IT Services 04db96adaf Merge pull request #19006 from owncloud/individual-it-patch-1
allow ".." in folder names
2015-09-14 15:56:53 +05:45
Jenkins for ownCloud 211a243784 [tx-robot] updated from transifex 2015-09-14 01:55:35 -04:00
Individual IT Services f7e66d49fc allow ".." in folder names
".." are valid in folder names, only ".." by itself is invalid
fix for #18987
2015-09-14 10:42:00 +05:45
Jenkins for ownCloud 9860a79441 [tx-robot] updated from transifex 2015-09-12 01:55:35 -04:00
Georg Ehrke 4660fefd01 enforce loading icon in sidebar to be 32x32 2015-09-11 18:15:36 +02:00
Jenkins for ownCloud ee1b57d15d [tx-robot] updated from transifex 2015-09-11 01:55:26 -04:00
Jenkins for ownCloud 0ef7b84d77 [tx-robot] updated from transifex 2015-09-10 01:54:52 -04:00
Jenkins for ownCloud bf01c3d72a [tx-robot] updated from transifex 2015-09-09 01:54:49 -04:00
Jenkins for ownCloud d044884cfa [tx-robot] updated from transifex 2015-09-08 01:55:56 -04: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 d4104ed9f7 Remove ellipsis on new file menu items 2015-09-03 10:57:34 +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
Jenkins for ownCloud 772d39f006 [tx-robot] updated from transifex 2015-09-02 07:08:44 -04: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
Jenkins for ownCloud 310084cc25 [tx-robot] updated from transifex 2015-09-01 14:03:19 -04:00
Morris Jobke 89b603a4b3 Merge pull request #18671 from owncloud/cleanup-sidebar-semantics
Removes unecessary divs and adds max width to longer names.
2015-08-31 00:38:18 +02:00
Raghu Nayyar c6053daf43 Fixes failing tests 2015-08-31 00:14:07 +02:00
Morris Jobke 5d1fb8cb11 Introduce small line for navigation sidebar 2015-08-30 20:47:22 +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
Jan-Christoph Borchardt 30d2283bed compress icons in navigation, move to monochrome again 2015-08-28 13:30:20 +02:00
Jan-Christoph Borchardt e9e8f57655 Merge pull request #18621 from owncloud/filetype-icons-elsewhere
fix filetype icons elsewhere, empty page, sidebar, apps menu
2015-08-28 12:40:57 +02:00
Morris Jobke d3fc28a6ba Merge pull request #18606 from owncloud/fix-filename-overflow-sidebar
fix right sidebar causing filename overflow, fix #18383
2015-08-28 12:16:53 +02:00
Vincent Petry 61bfa3652f Merge pull request #18614 from owncloud/fix-favorites-display
restore behavior where favorite stars only show up on hover, to not clutter the interface so much
2015-08-28 12:03:09 +02:00
Jenkins for ownCloud 933ac14b76 [tx-robot] updated from transifex 2015-08-28 01:55:25 -04:00
Jan-Christoph Borchardt f967a1df68 fix filetype icons elsewhere, empty page, sidebar, apps menu 2015-08-28 00:53:27 +02:00
Jan-Christoph Borchardt 589b066c4c restore behavior where favorite stars only show up on hover, to not clutter the interface so much 2015-08-27 23:09:32 +02:00
Jan-Christoph Borchardt 67f3dc232f fix right sidebar causing filename overflow, fix #18383 2015-08-27 14:49:40 +02:00
Jan-Christoph Borchardt c41089bcad reduce grey tones to one for list highlight 2015-08-26 17:28:40 +02:00
Jan-Christoph Borchardt bf0c3b3d21 reduce grey tones in app navigation, bubble menu and scrollbar 2015-08-26 17:00:48 +02:00
Morris Jobke 062fd37f74 Merge pull request #18577 from owncloud/action-details
file action detail style fixes
2015-08-26 16:28:40 +02:00
Thomas Müller 40203d7d1e Remove languages which are no longer maintained on transifex 2015-08-26 12:19:24 +02:00
Jan-Christoph Borchardt c11ea056d0 properly shade file actions and menu items, don't differentiate between mobile and desktop 2015-08-26 11:07:29 +02:00
Jenkins for ownCloud 90e11ee005 [tx-robot] updated from transifex 2015-08-26 04:10:42 -04:00
Jan-Christoph Borchardt 8d1fb6059f proper padding and whitespace for share and more actions 2015-08-26 09:57:32 +02:00
Jan-Christoph Borchardt 2458a09ac4 use same font-size for share action text 2015-08-26 09:46:47 +02:00
Christoph Wurst d7ceb3a162 adjust dropdown borders to button borders 2015-08-25 22:59:15 +02:00
Jenkins for ownCloud 2171cc02c3 [tx-robot] updated from transifex 2015-08-25 12:39:10 -04:00
Jan-Christoph Borchardt a262be5141 Merge pull request #18550 from owncloud/mobile-shared-style
fix being able to distinguish shared items on mobile
2015-08-25 17:08:34 +02:00
Jan-Christoph Borchardt 1efbc99365 Merge pull request #18543 from owncloud/remove-lines
Remove some lines
2015-08-25 16:08:06 +02:00
Jan-Christoph Borchardt cc898cf346 fix being able to distinguish shared items on mobile 2015-08-25 14:45:39 +02:00
Jan-Christoph Borchardt 3cfbf77866 reduce files table header line 2015-08-25 14:14:53 +02:00
Vincent Petry 010c03fc30 Fix row highlight in other file lists 2015-08-25 12:05:04 +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
Morris Jobke 1797bb576f Merge pull request #18525 from owncloud/app-sidebar-style
Right sidebar style improvements
2015-08-24 19:44:31 +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
Morris Jobke e88b380973 Remove DEBUG constant and use config value
* introduces config.php option 'debug' that defaults to false
* migrate DEBUG constant to config value
2015-08-24 15:14:05 +02:00
Vincent Petry 31d62c10bf Merge pull request #17501 from tbartenstein/patch-1
Update fileinfo.php
2015-08-24 09:57:27 +02:00
tbartenstein 5e1c2aecc7 fix unit test for folder renaming (icon)
fix unit test to go with #17501 and check for the new icon
2015-08-21 18:54:09 +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
Robin McCorkell 67893ca839 Merge pull request #18380 from owncloud/files-sidebar-selectbar
Fix files select bar width when app sidebar is visible
2015-08-20 12:35:33 +01: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 0b37004808 Merge pull request #18076 from owncloud/fix-thumbnail-api-master
No need to url decode the file
2015-08-19 09:59:14 +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 170259e840 Fix files select bar width when app sidebar is visible 2015-08-18 11:30:00 +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 97bc73ad49 Update unit test to reflect the string change 2015-08-17 15:31:44 +03:00
Hasso Tepper 72799ffba2 Move selectionVars into if statement 2015-08-17 15:28:55 +03:00
Robin McCorkell 675d852c7d Merge pull request #17182 from owncloud/user_ini_upload_size
Update .user.ini when setting upload size limit
2015-08-17 13:27:47 +01:00
Morris Jobke 51c3a3ddaf update jquery-visibility in files app
* ref #12877
2015-08-17 09:39:21 +02:00
Morris Jobke 5b7143885d Merge pull request #18318 from owncloud/files-sidebar-fixtabs
Improve right sidebar tabs behavior
2015-08-16 12:53:50 +02:00
Thomas Müller dfba425d68 Integration in files app to load scripts and styles on request 2015-08-14 18:04:17 +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
Thomas Müller eb13cb8d75 Merge pull request #18127 from owncloud/dav-request-tests
add test framework for doing full request webdav tests
2015-08-12 10:07:20 +02:00
Jan-Christoph Borchardt d04a6bce6f Merge pull request #17709 from owncloud/fileactions-dropdown
Move file actions to dropdown
2015-08-11 15:13:59 +02:00
Robin Appelman b0c8654f9e split out creating the sabre dav server to it's own factory 2015-08-11 14:43:46 +02:00
Morris Jobke 0abc637782 Merge pull request #18171 from owncloud/fix-language-of-files-activities-in-emails
Correctly make use of the languageCode argument in the files activity extension
2015-08-11 12:34:58 +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
Joas Schilling acd54fbeda Merge pull request #16528 from owncloud/activity-302-improve-settings
Activity 302 improve settings
2015-08-11 11:24:27 +02:00