55af6b45f7
More tests
...
* PreviewController test
* PublicPreview test
* Versions Preview test
* Trash Preview test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
3822bceea2
Move publicpreview over
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
39573e602d
Merge pull request #1978 from nextcloud/remove-send-mail-option
...
Remove send mail option
2016-11-02 22:36:05 +01:00
d235c4833f
remove the 'shareapi_allow_mail_notification' setting
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 21:17:05 +01:00
7e701504be
Remove upload_limit in files app as it is not needed with PUT upload ( #26069 )
...
The web UI now uses for PUT uploads which aren't restricted by PHP's
upload_max_filesize and post_max_size
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 20:43:35 +01:00
f556c58c22
remove 'send mail notification' option from sharing, replaced by send-by-mail feature
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:30:38 +01:00
ffebc050d0
Merge pull request #1887 from nextcloud/downstream-26370
...
Added functions to check etag of elements - integration tests
2016-11-02 14:57:45 +01:00
e5bc45c349
Fix OCS API to be able to remove group shares from self as recipient
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-02 08:49:58 +01:00
6e52091c8e
remove unused variable
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:11:30 +01:00
6d7520b1e2
unit tests updated and new added
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
7436e45c91
if we have a exact match, either for the federated cloud id or for the
...
email address we only return the exact match. It is highly unlikely
that the exact same email address and federated cloud id exists
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
392c8a115f
unified way to display remote shares and mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
8c8a019b7e
show correct display name if we have the user in one of our address books
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
60a3893ca8
improve search for federated cloud ids and email adresses
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
77f74b9780
handle case if no share-by-mail share provider is loaded
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
96c40d14a1
update permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
a17c6a485d
add share by mail share provider
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
0a6f02801f
introduce share by mail, ui part
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
01a85a98f2
Merge pull request #1876 from nextcloud/shareesAPI_email
...
Add ShareesAPI E-mail search
2016-10-25 13:53:59 +02:00
a28528a254
Add ShareesAPI E-mail search
...
* Allow to search for SHARE_TYPE_EMAIL (4)
* Added tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 14:59:32 +02:00
b130267e58
Import the used classes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-24 14:33:54 +02:00
f589f1a1d6
Move files_sharing Controllers => Controller
...
lib/Controller is the default location for controllers. So lets put them
all in there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 11:46:25 +02:00
ea07bbc562
Move Share20OCS to ShareAPIController
...
It was already a controller just still residing in its old location.
* Moved ShareAPIController to user plain userID instead of user object
* Moved Share20OCS to ShareAPIController
* Removed initisation of class from Application.php and leave it to the
AppFramework
* Fixed tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 09:52:34 +02:00
e0d919bbfc
Adding Open Graph Support for public shares http://ogp.me/
...
In case no preview is available we display the ownCloud logo
Fix unit test
2016-10-21 21:42:40 +02:00
246bb9f33d
Move OC\Files\Storage\Shared to the right namespace
2016-10-20 20:27:44 +02:00
b112493d1a
Adjust wording to make the separation between sharing and files clearer
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-18 17:18:14 +02:00
2de59d8a2a
remove unneeded unlock
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:40 +02:00
f63f0aa1ae
get node by path as fallback
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
9754724c8b
fix getting recipient share in ocs api
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
1b3b816a0a
re-use the share node while formating if we already have it
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:35 +02:00
37eded7e7c
Always unlock node after trying to create a share
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:29 +02:00
671f16f706
Add icons to activity navigation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-05 11:38:06 +02:00
498b7399c1
Inject IHTTPClientService
...
Otherwise the unit test execution will do a ton of external HTTP requests which fail and then timeout…
See https://blackfire.io/profiles/compare/3c67acfa-a11e-4aec-bcd4-c945b006f01e/graph for reference
Pretty similar to https://github.com/nextcloud/server/pull/1565
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-29 00:26:20 +02:00
118c9d58fe
Fix fed share test call to return proper result
...
Fixes an issue where retrying a previously failed federated share would
not properly reset the availability flag because the return value was
undefined instead of "true".
2016-09-20 12:11:26 +02:00
fb52b1af67
Allow increasing permissions for share owner
...
In some cases, the owner of the share is also recipient through a group
share. The owner must still be able to increase permissions in that
situation.
2016-09-13 09:40:59 +02:00
ba104233b0
Move remote_shares OCS endpoint to AppFramework
2016-09-09 07:40:33 +02:00
c16aefcff5
Merge pull request #1317 from nextcloud/add-sharing-disclaimer
...
Adding a optional disclaimer to the anonymous upload page
2016-09-08 21:18:28 +02:00
6bb95de1c5
Adding a optional disclaimer to the anonymous upload page
2016-09-08 18:44:27 +02:00
9adf78c155
dont show shares you own in "shared with you"
2016-09-07 18:38:08 +02:00
a0af513a4a
Merge pull request #1201 from nextcloud/usermountcache-orphanedshare
...
[master] Usermountcache orphanedshare
2016-08-31 15:07:13 +02:00
423378ea17
Added closeCursor in SharedMount numeric id
2016-08-30 19:49:31 +02:00
669b0bc2ae
Prevent error with orphaned shares when updating user mount cache
2016-08-30 19:49:23 +02:00
ec9fd67bc5
Allow space for federated share id search
2016-08-30 11:11:59 +02:00
6c365cb06d
A shared storage is never a home storage - fixes #25582
2016-08-29 14:13:26 +02:00
2fdda01b4b
Sharee API to AppFramework
...
* Move to OCSController
* Move to Controller folder
* Use automatic DI
* Use function parameters
* Updated tests
2016-08-26 11:36:09 +02:00
a1ed8207e9
HTTPHelper is deprecated
...
Use the IClientService instead
2016-08-24 21:30:39 +02:00
352d22e473
Do not error on NotFoundException
...
Since this exception can be thrown when a shared file is in the
trashbin there is no need to spam the log like crazy.
Fixes #938
2016-08-24 08:18:08 +02:00
a0c2342c20
prevent infinite recursion while getting storage from mount
2016-08-23 14:52:18 +02:00
1e7c108bff
handle failed shares
2016-08-22 12:32:39 +02:00
3ed01e8459
Lazy init shared storage
2016-08-22 12:27:56 +02:00
95570d607c
reuse existing root id
2016-08-22 12:27:20 +02:00
af074eb2b7
Move updateShare and getShares over to use proper parameters
...
* Update tests
2016-08-17 20:45:29 +02:00
22e23f3045
Use parameters in createShare
...
* Fix tests
2016-08-17 20:45:27 +02:00
9daf41e05a
Add files drop capability for clients
2016-08-13 14:02:09 +02:00
ba922c9f73
Merge pull request #807 from nextcloud/ocs_dataresponse
...
OCSController requires DataResponse
2016-08-10 22:36:25 +02:00
67d016833d
Merge pull request #810 from nextcloud/shared-cachethepropagatorinstance
...
Store the shared propagator instance
2016-08-10 17:24:57 +02:00
4006763f5b
Move the Share20OCS code over to use the proper DataResponse
2016-08-10 12:40:32 +02:00
412b5c5407
Store the shared propagator instance
...
This instead of recreating it for every call.
2016-08-10 10:57:49 +02:00
a999420c75
get shared storage storage id without setting up the storage
2016-08-09 15:52:13 +02:00
70eef2a82e
Merge pull request #445 from nextcloud/ocs_share_to_appframework
...
OCS Share API to appframework
2016-08-08 14:59:59 +02:00
0556e40d3e
Fix tests
2016-08-05 14:17:32 +02:00
d9418c105e
Add OCSShareAPIMiddleware tests
2016-08-05 14:17:32 +02:00
4504d7f5e9
DataResponse required ['data' => DATA]
2016-08-05 14:17:31 +02:00
7fdc2f32fa
More exceptions
2016-08-05 14:17:31 +02:00
3a31b2875b
Add OCSShareAPIMiddleware
...
* This will cleanup the locks after each request
* Move check for enabled share api to the middleware
2016-08-05 14:17:31 +02:00
8b160077f1
Throw OCSNotFoundExceptions
2016-08-05 14:17:25 +02:00
54f21bccdf
Remove unneeded wrapper
2016-08-05 14:17:25 +02:00
a32caa4904
Convert Share API to use the AppFramework
2016-08-05 14:17:25 +02:00
f37fa6e45c
Move Share backends to PSR-4 instead of using class path ( #24941 )
2016-08-05 14:13:41 +02:00
2404f6a5a7
Make share target consistent when grouping group share with user share
...
In some situations, a group share is created before a user share, and
the recipient renamed the received share before the latter is created.
In this situation, the "file_target" was already modified and the second
created share must align to the already renamed share.
To achieve this, the MountProvider now groups only by "item_source"
value and sorts by share time. This makes it so that the least recent
share is selected as super-share and its "file_target" value is then
adjusted in all grouped shares.
This fixes the issue where this situation would have different
"file_target" values resulting in two shared folders appearing instead
of one.
2016-08-03 10:16:28 +02:00
714d7ec936
Improved share grouping readability + fixed test
2016-08-03 10:16:28 +02:00
04d5465228
Group shares with same source and target
...
Fixes #24575
Note that this is a very limited solution and eventually we want smarter
merging!
2016-08-03 10:16:28 +02:00
4e5fb74773
Do not allow to delete/update group shares as a group member
2016-08-02 10:50:35 +02:00
0215b004da
Update with robin
2016-07-21 18:13:58 +02:00
813f0a0f40
Fix apps/
2016-07-21 18:13:57 +02:00
f7d26e4aa5
Merge pull request #414 from nextcloud/files_sharing_event_dispatcher
...
Files sharing event dispatcher
2016-07-18 16:10:21 +02:00
773250be24
Cleanup coding style
2016-07-18 13:35:35 +02:00
1c5e082ee1
Add eventdispatcher to public link view
2016-07-18 13:35:35 +02:00
ea3035aa0e
Move JS inclusion to Controller
...
* This way we can easier load files conditionally
2016-07-18 13:34:32 +02:00
ff54141639
Move SetupFromToken to ShareManager
2016-07-18 10:53:49 +02:00
40328114f9
Merge pull request #379 from nextcloud/create_federated_share_on_mount
...
Create federated share on mount
2016-07-18 09:22:48 +02:00
dc53788711
remove unused parameter
2016-07-14 16:39:48 +02:00
76736731eb
Allow shares with create permissions only aswell
2016-07-14 10:27:29 +02:00
d0e6fdba4d
combine if statements
2016-07-08 12:36:15 +02:00
f98cb9efa0
Fix type hinting
2016-07-08 12:35:50 +02:00
f0b9eba9c2
dont overwrite a variable with a different type
2016-07-08 12:35:23 +02:00
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
2a72eff9ee
Fix getting the certificate bundle for dav external storage ( #25274 )
...
* Fix getting the certificate bundle for dav external storages
* Log the original exception in dav external storage
2016-06-27 22:26:43 +02:00
88ef163276
handle unavailable fed shares while testing for availability ( #25277 )
...
* More explicit http status codes
* handle unavailable fed shares while testing for availability
2016-06-27 21:34:28 +02:00
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
955635c7aa
Add explicit delete permission to link shares
...
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.
This fix makes sure we include delete permissions in the share
permissions, which now become 15.
In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests
2016-06-22 10:29:40 +02:00
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable
2016-06-22 10:29:40 +02:00
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
bb465a7ab4
Catch exceptions while creating shared mounts ( #25077 )
2016-06-20 22:11:05 +02:00
a636078e6c
Make getShareFolder use given view instead of static FS
2016-06-17 11:11:59 +02:00
4f02bd1dff
disable cleanFolder for the federated share storage
2016-06-14 17:29:09 +02:00
Roeland Jago Douma
Morris Jobke
Bjoern Schiessle
Vincent Petry
Joas Schilling
Thomas Müller
Joas Schilling
Robin Appelman
Lukas Reschke
Roeland Jago Douma
Robin Appelman
Lukas Reschke