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
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
14fde6650c
Merge pull request #25003 from owncloud/fix_ocs_path_response
...
Fix OCS Share API path response
2016-06-10 16:49:50 +02:00
075bf73c80
Prevent access to shareinfo if share if read-only
2016-06-09 15:15:17 +02:00
bb54ab0db8
add hide file list option
2016-06-09 15:15:17 +02:00
b0dd0634e3
Bring back sharedstorage hooks
2016-06-09 14:00:02 +02:00
Roeland Jago Douma
Lukas Reschke
Roeland Jago Douma
Vincent Petry
Robin Appelman
Joas Schilling
Björn Schießle
Morris Jobke
Robin Appelman
Lukas Reschke
Joas Schilling
Arthur Schiwon