Commit Graph

8462 Commits

Author SHA1 Message Date
Frank Karlitschek a468687682 Merge pull request #9453 from owncloud/enc_fix_wrong_file_size
[encryption] always take unencrypted size
2014-07-06 10:38:06 -04:00
Jenkins for ownCloud 33492b4448 [tx-robot] updated from transifex 2014-07-06 01:54:33 -04:00
Jenkins for ownCloud 23e0ef6ed0 [tx-robot] updated from transifex 2014-07-05 01:56:33 -04:00
Björn Schießle a544bd3a0f Merge pull request #9357 from owncloud/sharing_unshare_on_delete
[sharing] unshare childrens on delete
2014-07-04 17:42:52 +02:00
Bjoern Schiessle 5397101e1c improved unit tests 2014-07-04 17:37:35 +02:00
Bjoern Schiessle ddac446c5b always take unencrypted size 2014-07-04 16:44:50 +02:00
icewind1991 d3fab824f7 Merge pull request #9445 from owncloud/filelist-auth-error
Reload the page when the files app encounters an authentication error
2014-07-04 16:39:00 +02:00
Robin Appelman 4fe1cdd2a7 Add machine readable error messages to OC\JSON
Reload the files app in case of authentication errors, expired tokens or disabled app

Reloading will triger the full server side handeling of those errors

formatting

fix missing semicolon + some jshint warnings
2014-07-04 16:20:27 +02:00
Morris Jobke 574cb15c2d Merge pull request #9434 from owncloud/files-reloadpromiseissue
Fix reload call for all subclasses
2014-07-04 16:13:33 +02:00
Thomas Müller 2327d41b11 Merge pull request #9269 from owncloud/fix_versions_preview
change order of registering api and capabilities to fix file version previews
2014-07-04 15:25:24 +02:00
Morris Jobke aae118890a Merge pull request #9440 from owncloud/files-fileactionsdeepcopy
Fix FileActions merging override
2014-07-04 14:49:00 +02:00
Morris Jobke 3d13e04170 Merge pull request #9426 from owncloud/design-remoteshare-confirm
use icon-confirm instead of text for accepting remote share, works better with translations
2014-07-04 14:13:44 +02:00
Vincent Petry 07118f599e Fix FileActions merging override
When merging FileActions, the register() functio needs to correctly
override the previously merged action handler without affecting the
original one.
2014-07-04 12:56:04 +02:00
Bjoern Schiessle 673b0f5eb9 add owner as parameter for delShareKey 2014-07-04 12:19:59 +02:00
Vincent Petry 59ca30d462 Fix reload call for all subclasses
All subclasses must also properly return the ajax call object.
2014-07-04 11:45:36 +02:00
Vincent Petry 5e8959a5b3 Return and use isPreviewAvailable for share previews
Since the mime type is known, now isPreviewAvailable is returned as well
and used by the JS side to properly render mime icon and previews.
2014-07-04 11:16:23 +02:00
Bjoern Schiessle e9f5730869 make sure that the umount hook always contains the path relative to data/user/files 2014-07-04 10:34:54 +02:00
Bjoern Schiessle 3b9fa81581 if a folder gets deleted we unshare all shared files/folders below 2014-07-04 10:34:54 +02:00
Morris Jobke ac00e4b6e6 IE8 fixes 2014-07-04 08:13:05 +02:00
Jenkins for ownCloud e4a3f8d3c4 [tx-robot] updated from transifex 2014-07-04 01:56:01 -04:00
Jan-Christoph Borchardt 8e617453e5 use icon-confirm instead of text for accepting remote share, works better with translations 2014-07-04 00:07:24 +02:00
Morris Jobke 3cbea82bd0 Merge pull request #9420 from owncloud/trashbin-hidesummarysize
Hide the size in the trashbin summary row
2014-07-03 17:37:33 +02:00
Morris Jobke c223977794 Merge pull request #9407 from owncloud/fix-share-logo
for shared links, use wide logo on desktop and icon on mobile
2014-07-03 17:33:34 +02:00
Vincent Petry 52248d4d81 Hide the size in the trashbin summary row
This also fixes the extra spacing that appearing on the right of the
table.
2014-07-03 17:16:50 +02:00
Morris Jobke a829d07234 Merge pull request #9403 from owncloud/design-fix-fileslistbottom
Fix bottom of files list, add proper space to have room for dropdowns
2014-07-03 16:40:38 +02:00
Jan-Christoph Borchardt 6c174813b6 Merge pull request #9394 from owncloud/design-fix-rename
fix position of rename function, and text size
2014-07-03 13:44:00 +02:00
Jan-Christoph Borchardt c7101d26db fix checkbox shifting when rename input appears 2014-07-03 13:34:12 +02:00
Jan-Christoph Borchardt e5f68bafb9 for shared links, use wide logo on desktop and icon on mobile 2014-07-03 12:20:44 +02:00
Jan-Christoph Borchardt cee5afa8af reduce file list bottom whitespace a bit 2014-07-03 11:43:59 +02:00
Jan-Christoph Borchardt 6f14034c48 fix left margin of file list summary 2014-07-03 11:40:11 +02:00
Jan-Christoph Borchardt 4c97f2b3af add whitespace to bottom of Files list – more obvious it's the end, and space for share dropdown 2014-07-03 11:36:04 +02:00
Jan-Christoph Borchardt e9f616b0a0 Merge pull request #9391 from owncloud/design-mobile-share
Fix mobile share view glitches
2014-07-03 09:45:19 +02:00
Jenkins for ownCloud 1a1c5aa3c0 [tx-robot] updated from transifex 2014-07-03 01:56:24 -04:00
Jan-Christoph Borchardt e695244f32 fix position of rename function, and text size 2014-07-03 02:08:53 +02:00
Jan-Christoph Borchardt 079fee2c2a Merge pull request #9389 from owncloud/fix-nametext-height
fix nametext height, was higher than the row
2014-07-03 01:09:19 +02:00
Jan-Christoph Borchardt 019e1b1065 Merge pull request #9365 from owncloud/design-controls-polish
Design controls polish
2014-07-03 01:08:15 +02:00
Volkan Gezer bf08e3a85e Merge pull request #9382 from owncloud/server2server-css
fix lineheight of server2server share
2014-07-03 00:39:37 +02:00
Jan-Christoph Borchardt 0df04975b0 use same logo for mobile as for when logged in, fix #9360 2014-07-02 23:33:20 +02:00
Jan-Christoph Borchardt 560c530875 hide text of download button, only show icon 2014-07-02 23:21:06 +02:00
Jan-Christoph Borchardt 0a91c22ebb shared view: remove whitespace glitch on right 2014-07-02 23:14:21 +02:00
Jan-Christoph Borchardt a94130509a fix nametext height, was higher than the row 2014-07-02 22:54:30 +02:00
Volkan Gezer 586c4236fd fix lineheight of server2server share 2014-07-02 21:46:52 +02:00
Vincent Petry ed29e7d160 Merge pull request #9329 from owncloud/sharing_check_target
don't move a share mount point into a different mount point
2014-07-02 21:01:03 +02:00
Vincent Petry f1f66ff686 Merge pull request #9373 from owncloud/design-fix-modified
shade color for modified dates again, fix #9363
2014-07-02 21:00:32 +02:00
Vincent Petry 615d037d3e Merge pull request #9364 from owncloud/sharing_rename_mount_points
[sharing] rename mount point of children if parent was renamed
2014-07-02 18:48:07 +02:00
Vincent Petry f4eb90e229 Merge pull request #9311 from owncloud/storage-not-available
Handle storages not being available in webui and webdav
2014-07-02 18:15:58 +02:00
Morris Jobke b6aeea8c0b simplify formula and add comment 2014-07-02 17:20:56 +02:00
Jan-Christoph Borchardt 053b0a4063 shade color for modified dates again, fix #9363 2014-07-02 16:37:15 +02:00
Jan-Christoph Borchardt 2a9fb130ec make sure table header is white instead of slightly grey 2014-07-02 15:40:52 +02:00
Bjoern Schiessle ea31ab7b5c rename mount point of children if parent was renamed 2014-07-02 15:39:38 +02:00