Robin Appelman
d0e6fdba4d
combine if statements
2016-07-08 12:36:15 +02:00
Robin Appelman
f98cb9efa0
Fix type hinting
2016-07-08 12:35:50 +02:00
Robin Appelman
f0b9eba9c2
dont overwrite a variable with a different type
2016-07-08 12:35:23 +02:00
Lukas Reschke
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
Robin Appelman
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
Robin Appelman
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
Lukas Reschke
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Vincent Petry
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
Vincent Petry
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests
2016-06-22 10:29:40 +02:00
Joas Schilling
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable
2016-06-22 10:29:40 +02:00
Vincent Petry
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
Robin Appelman
bb465a7ab4
Catch exceptions while creating shared mounts ( #25077 )
2016-06-20 22:11:05 +02:00
Vincent Petry
a636078e6c
Make getShareFolder use given view instead of static FS
2016-06-17 11:11:59 +02:00
Robin Appelman
4f02bd1dff
disable cleanFolder for the federated share storage
2016-06-14 17:29:09 +02:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
Vincent Petry
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
Lukas Reschke
075bf73c80
Prevent access to shareinfo if share if read-only
2016-06-09 15:15:17 +02:00
Bjoern Schiessle
bb54ab0db8
add hide file list option
2016-06-09 15:15:17 +02:00
Roeland Jago Douma
b0dd0634e3
Bring back sharedstorage hooks
2016-06-09 14:00:02 +02:00
Robin Appelman
e7a55c4fef
handle path not being set in shared cache ( #24993 )
2016-06-09 13:59:59 +02:00
Roeland Jago Douma
4a3c67fdb4
Bring back sharedstorage hooks
2016-06-08 08:19:32 +02:00
Roeland Jago Douma
7c040c0bf9
Show the path relative to the requesting user
...
A share can only be requested by 3 'types' of people
* owner
* initiator
* recipient
So we have to get the path as the current user. Since that is the only
path that has any meaning to the user.
2016-06-07 15:09:19 +02:00
Robin Appelman
7a0254b15b
handle path not being set in shared cache ( #24993 )
2016-06-06 17:01:55 +02:00
Joas Schilling
5c8e0596e6
Allow public upload when the quota is unlimited
2016-06-02 15:27:16 +02:00
Torben Dannhauer
718f0757e4
Fix for #23066 ( #24689 )
2016-05-31 06:53:28 +02:00
Lukas Reschke
aba539703c
Update license headers
2016-05-26 19:57:24 +02:00
Joas Schilling
b72706b450
Move background job to PSR-4
2016-05-25 14:59:59 +02:00
Joas Schilling
3a716ae91c
Move lib/ to PSR-4
2016-05-25 14:59:59 +02:00
Joas Schilling
5001036fd4
Move classes from outside lib/ to PSR-4
2016-05-25 14:59:59 +02:00
Vincent Petry
465cf9fe9b
Merge pull request #24346 from lenz1111/fix_24331
...
Fix: Bugs in shared link with video #24331
2016-05-24 13:49:02 +02:00
Piotr Filiciak
11b2e98a30
video poster
2016-05-24 12:34:37 +02:00
Vincent Petry
adcf942901
Merge pull request #24750 from owncloud/lenz1111-share_download_range_requests_support
...
Http Range requests support in downloads
2016-05-23 21:01:26 +02:00
Björn Schießle
20852fd8c0
remove reshares and the mapping in the federated_reshares table on unshare from self
2016-05-20 21:15:16 +02:00
Björn Schießle
e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app
2016-05-20 21:15:16 +02:00
Björn Schießle
81e3787f9c
close cursor after select to avoid db lock
2016-05-20 21:15:11 +02:00
Björn Schießle
d23df4cba7
create re-share by owner and propagate unshare and unshare-from self request
...
correctly accross share owner and share initiator
2016-05-20 21:15:11 +02:00
Piotr Filiciak
9999e05660
Http Range requests support in downloads
...
Http range requests support is required for video preview
2016-05-20 18:16:44 +02:00
Roeland Jago Douma
354329acf2
Cleanup Files_Sharing CLASSPATH
...
* OC\Files\Cache\SharedScanner
* OC\Files\Cache\Shared_Cache
* OC\Files\Cache\Shared_Permissions
* OC\Files\Cache\Shared_Updater
* OC\Files\Cache\Shared_Watcher
* OCA\Files\Share\Maintainer
* OCA\Files\Share\Proxy
2016-05-02 16:15:40 +02:00
Roeland Jago Douma
45d618a133
Remove dead code
...
Ancient files_sharing updater code I came across.
2016-05-02 08:20:42 +02:00
Roeland Jago Douma
420b5273b1
There is no need to do old etag propagation
...
Etags are calculated differently now and don't require manual updating.
2016-04-30 10:40:45 +02:00
Robin Appelman
dbfdc6282a
do propagation in a single query
2016-04-25 16:18:59 +02:00
Björn Schießle
e10105474f
move federated sharing settings to the federatedfilesharing app
2016-04-22 14:55:40 +02:00
Björn Schießle
606b756a94
Merge pull request #23918 from owncloud/cruds-for-federated-shares
...
bring back CRUDS permissions for federated shares
2016-04-22 14:50:42 +02:00
Björn Schießle
e906796f99
ask for share-permissions on propfind
2016-04-20 17:47:32 +02:00
Roeland Jago Douma
b53d6598f1
Move moveFromCache to CacheJail
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
f27d7cbf99
Move copy- and moveFromStorage to jail
2016-04-19 14:04:00 +02:00
Robin Appelman
2f1c62ce0b
Only construct the storage when we start using it
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
c98fef8a51
Fix resolve path
2016-04-19 14:04:00 +02:00