Commit Graph

2825 Commits

Author SHA1 Message Date
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
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 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
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