Commit graph

200 commits

Author SHA1 Message Date
Vincent Petry
7a1048956f Fix preview animation on uploading
When adding/uploading files, the preview is now animated.
When loading a list of files directly the preview is displayed directly.
2014-07-17 12:42:09 +02:00
Thomas Müller
7159d6118e reduce share action text to the user name only 2014-07-14 21:11:50 +02:00
Vincent Petry
dd7529da98 Added mountType attribute and adapted Delete action text
Added mountType attribute for files/folder to indicated whether they are
regular, external or shared.

The client side then adapts the "Delete" action hint text based on this
information.

Only the mount roots must have the delete icon hint adapted.
To make this detectable on the client side, the mountType can now
be null, "shared", "shared-root", "external" or "external-root".

This also gives room to icon customization on the client side.
2014-07-14 10:36:04 +02:00
Vincent Petry
22653e21a2 Propagate file action changes to the file lists
Whenever an app needs to register an event late, it does that on the
original file actions object.

Since the file actions that the file list work on is a merged list, not
the original one, the registration event needs to be propagated there as
well.
2014-07-09 12:26:33 +02:00
Morris Jobke
45a4751f0e Merge pull request #9499 from owncloud/shares-hidetokenrecipient
Do not show recipient for link shares in file list
2014-07-07 20:02:59 +02:00
Morris Jobke
54a8dce380 Merge pull request #9415 from owncloud/external-sharedialog
Improved external share dialog
2014-07-07 19:51:54 +02:00
Vincent Petry
4ba492f28d Fixed shared list sorting
Use Array.sort instead of underscore's sortBy() as they don't use the
same method/function signature.
2014-07-07 16:49:32 +02:00
Vincent Petry
8ddff52c51 Do not show recipient for link shares in file list
In the "Shared with link" section, the share_with field can contain a
value when a password was set.

This fix prevents this value to be shown as it is not intended for the
end user.
2014-07-07 16:33:23 +02:00
Vincent Petry
130b8018a1 Improved external share dialog
Changed title, label and buttons.
Removed icon.
2014-07-07 15:57:26 +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
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
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
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
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
d2f3ff5c34 Merge pull request #9245 from owncloud/server2server-sharing-design-fixes
drop unneeded code
2014-07-02 15:34:57 +02:00
Vincent Petry
025b71d068 Use fileActionsReady to re-render sharing icons
Whenever file actions are modified, either by registering new actions or
when appending a new page of entries, the sharing app is now notified so
it can correctly refresh the sharing icon status.

Additionally, the core's loadIcons() method is also used to load the
existing shares and also refresh the sharing icons afterwards.
2014-07-01 21:32:04 +02:00
Vincent Petry
fd68034357 Fixed remote share password param detection 2014-07-01 17:34:01 +02:00
Joas Schilling
5e4ac548bb Use attr() instead of data() so the item ids work as intended
Fix #8841
2014-06-30 14:21:27 +02:00
Volkan Gezer
11788c9579 fix server share dialog title 2014-06-28 01:54:51 +02:00
Vincent Petry
13b7937381 Allow late registration of file actions in public page 2014-06-27 16:10:20 +02:00
Morris Jobke
d9aa8c9f0e drop unneeded code 2014-06-27 00:30:14 +02:00
Vincent Petry
363f8f3205 Do not clear URL hash when no external mount params given
Whenever external share parameters were passed through the URL hash, the
URL hash will now be cleared.

In other cases, the hash needs to be left alone because it is used as
workaround for the lack of history API in IE8 / IE9

Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that
does the same, including replacing the "+" with spaces.
2014-06-25 12:24:46 +02:00
Vincent Petry
9ef7410abe Fixed uploading by drag and drop into folder 2014-06-19 16:14:10 +02:00
icewind1991
8d1cf79152 Merge pull request #8399 from owncloud/server-server-sharing
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Robin Appelman
2219087df6 organize js a bit better 2014-06-17 13:47:36 +02:00
Lukas Reschke
1066f4ec9a Sanitize name of sharee
Fixes a XSS introduced with 271684dcfe
2014-06-14 20:45:10 +02:00
Bjoern Schiessle
84a651e46d add settings to disable server to server sharing 2014-06-14 10:22:38 +02:00
Robin Appelman
2005c162bd Fix prompting for password 2014-06-14 10:14:07 +02:00
Robin Appelman
30f5b2bd7c Improve detection of whether we're in the files app 2014-06-14 10:13:24 +02:00
Robin Appelman
cf5a72c103 Add interface for adding a public share to a different ownCloud instance 2014-06-14 10:13:24 +02:00
Robin Appelman
d7de35376d Add interface for accpeting external shares 2014-06-14 10:13:23 +02:00
Jörn Friedrich Dreyer
42bf466fa1 move mail template editor from core to standalone templateeditor repo 2014-06-13 12:00:23 +02:00
Jörn Friedrich Dreyer
7e8784c075 access admin settings result message correctly 2014-06-13 11:59:14 +02:00
Bjoern Schiessle
bf5e9357fc don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it 2014-06-06 09:55:59 +02:00
Robin Appelman
690e0b5070 Dont overwrite OCA.Sharing 2014-06-05 12:52:08 +02:00
Vincent Petry
e0c4e960d9 Merge pull request #8861 from owncloud/share-overview-linklist
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
Morris Jobke
7a20d22daa Merge pull request #8824 from owncloud/mail_template_editing_in_webui
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
Thomas Müller
fc1d6f4c3c fixes during test 2014-06-04 15:01:36 +02:00
Vincent Petry
816db7aef1 Fixed wording to "Shared by link" 2014-06-04 11:32:30 +02:00
Vincent Petry
b3fdda1751 Added "Shared with link" sidebar section in files app
Added section to only show link shares.

Please note that the filtering is currently done on the client side
which might not be the most efficient way of doing it.
2014-06-04 11:10:11 +02:00
Vincent Petry
af6a65cbf3 Do not update action icon recipients for file list
Since the files app doesn't have the recipient information on load it
cannot initially render the recipients in the action icons.

For this reason the action icon will not be updated with the recipients
after changing the shares, for consistency.
2014-06-04 10:48:01 +02:00
Vincent Petry
07f1b263c9 Use recipient display names when updating shares in the UI
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.

The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
Jörn Friedrich Dreyer
b5a145b297 convert mail template editor to app framework for a restful api 2014-06-03 16:53:03 +02:00
Vincent Petry
1297b2b883 Multiple fixes to sharing overview
- scrolling to next page now correctly renders share icons
- reshareing/unsharing a reshare will now still keep "Shared by" label
2014-06-03 11:04:57 +02:00
Jörn Friedrich Dreyer
37afab87b5 minimal mail template editor for administrators, refs #7177 2014-06-02 19:22:58 +02:00
Vincent Petry
640fbc016d Now using shareOwner for the share owner
Makes it consistent with the regular file list fileData
2014-06-02 18:52:31 +02:00
Vincent Petry
0944565f60 More unit tests and fixes for share 2014-06-02 18:08:56 +02:00
Vincent Petry
d677e3860d Added unit tests for share.js and share icon 2014-06-02 15:59:06 +02:00
Vincent Petry
7961d4a87e Update share action text to display owner/recipients
- when a share was changed, update the share action text
- added file data attribute "data-share-recipients"
2014-06-02 12:12:57 +02:00