wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26046 commits 157 branches 562 tags 714 MiB
Commit graph

531 commits

Author SHA1 Message Date
Robin Appelman
7b70343dc3 fix infinite loops with propagating etags on reshares 2015-08-03 17:33:12 +02:00
Morris Jobke
2d691c2fb4 Merge pull request #17381 from owncloud/fix_sharing_add_to_group 
[sharing] fix addToGroup hook
 2015-07-21 13:30:41 +02:00
Vincent Petry
3d6be69f25 Throw storage not available on guzzle error 
If the remote server is in maintenance mode, we must throw storage not
available exception instead of not found which might auto-remove the
share.
 2015-07-13 18:51:25 +02:00
Thomas Müller
14eef434ff Merge pull request #17290 from owncloud/remove-readonly-wrapper 
Replace readonly wrapper with permissions mask
 2015-07-06 15:36:11 +02:00
Joas Schilling
4dbc8ab77f Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activities 
Improve federated cloud sharing activities
 2015-07-06 10:23:33 +02:00
Bjoern Schiessle
763b601e4a use the correct user if we update the share table 2015-07-03 15:58:52 +02:00
Joas Schilling
2118713477 Add OCS api to get, accept and decline remote shares 2015-07-03 09:30:49 +02:00
Joas Schilling
ddb8cc2303 Use federated cloud id as a parameter type 2015-07-02 13:14:02 +02:00
Vincent Petry
aedf4848f7 Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block 
Fix duplicated line in doc block
 2015-07-02 13:00:22 +02:00
Joas Schilling
aa7c8ad191 Add the item name to the federated sahre activity 2015-07-02 12:28:48 +02:00
Joas Schilling
95faaad5cf Use the app constant to fix the grouping 2015-07-02 12:27:58 +02:00
Joas Schilling
7e3f8d3ac1 Use the item name when refering to the unaccepted remote share 2015-07-02 12:26:06 +02:00
Joas Schilling
bfcb8ffeb3 Merge pull request #17246 from owncloud/share-lock-owner-parent 
lock parent folders for the owner when locking a shared file as recipient
 2015-07-02 10:38:08 +02:00
Joas Schilling
a6ea91996c Fix duplicated line in doc block 2015-07-02 10:24:16 +02:00
Vincent Petry
9c06975bd5 Fix scanFile signature to avoid boring warning 2015-07-01 16:29:11 +02:00
Robin Appelman
dd20cd1995 remove no longer needed readonly wrapper 2015-07-01 15:45:54 +02:00
Robin Appelman
3c0be7d126 only lock the parent folders 2015-07-01 15:10:25 +02:00
Robin Appelman
d6f56ea609 lock parent folders for the owner when locking a shared file as recipient 2015-07-01 15:10:22 +02:00
Vincent Petry
5d3aa36355 Catch more error codes thrown by federated shares 
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.

This prevents unpredictable error codes to block access to unrelated
folders needlessly.
 2015-07-01 11:14:03 +02:00
Morris Jobke
044d2ece07 Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util 
Move core apps from OC_Log::write to OCP\Util
 2015-07-01 08:53:16 +02:00
Morris Jobke
f25b71f70e Merge pull request #15475 from rullzer/files_sharing_OCP_DB 
Move files sharing app (mostly) to OCP\DB
 2015-07-01 08:53:03 +02:00
Vincent Petry
b55f71ee03 Merge pull request #17083 from owncloud/share-etag-update-target 
take share target into account when updating recipient etags
 2015-06-29 09:10:37 +02:00
Lukas Reschke
d1f0ff372e Merge pull request #17163 from owncloud/update-licenses 
Update license headers
 2015-06-27 20:22:23 +02:00
Olivier Paroz
b30515ddda Signature of overriding method should match the parent 2015-06-26 17:45:04 +02:00
Thomas Müller
9558562883 Merge pull request #17082 from owncloud/shared-etag-propagate-file 
Fix etag propagation for single file shares
 2015-06-26 12:36:17 +02:00
Robin Appelman
0128a86df1 add some docs 2015-06-25 14:29:40 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Robin Appelman
c87ab65081 fix etag propagation for single file shares 2015-06-24 18:16:03 +02:00
Morris Jobke
4f2f8a6f28 [sharing] handle shares of users that aren't available anymore 
* properly handle the case where an abandoned share is left and
  simply skip it
 2015-06-23 18:22:36 +02:00
Robin Appelman
5e1865530b take share target into account when updating recipient etags 2015-06-22 18:21:54 +02:00
Morris Jobke
7550bf0917 Disable video preview if previews are disabled 2015-06-09 17:49:59 +02:00
Lukas Reschke
1cccb227c3 Merge pull request #16686 from owncloud/show_cloud_id 
show federated cloud id in the personal settings
 2015-06-02 17:05:33 +02:00
Bjoern Schiessle
6e5ed81064 show federated cloud id in the personal settings 2015-06-02 14:09:53 +02:00
Robin Appelman
661c9e2444 add changeLock to the storage api 2015-06-01 13:24:02 +02:00
Robin Appelman
536e187e51 add locking to the storage api 2015-06-01 13:22:56 +02:00
Thomas Müller
f9d04f62a8 Merge pull request #16440 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2015-05-19 22:12:35 +02:00
Joas Schilling
d832c4ae23 Fix unexisting class and broken doc 2015-05-19 15:27:50 +02:00
Scrutinizer Auto-Fixer
fdbc21fc6c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-05-19 11:23:06 +00:00
Roeland Jago Douma
dd3d0194a6 Move files sharing app (mostly) to OCP\DB 2015-05-18 11:06:23 +02:00
Roeland Jago Douma
7a8072e958 Move core apps from OC_Log::write to OCP\Util 2015-05-18 10:57:52 +02:00
Bjoern Schiessle
887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Robin Appelman
3b1dde7005 dont go trough the view when renaming/copying on shared storages 2015-05-12 17:09:37 +02:00
Morris Jobke
90d8e4bc00 Merge pull request #15815 from owncloud/unshare-etag-propagate 
Update etag of direct parent on unshare
 2015-05-11 13:42:20 +02:00
Lukas Reschke
d9746d8abd Fix PHPDoc for the ext. share controller 2015-05-04 18:06:16 +02:00
Morris Jobke
760ce3bd63 Fix DeleteOrphanedSharesJob 
* remove unneeded use statements
* the the interval properly in the constructor
* set the log level to debug (from info) - fixes #16036
 2015-05-04 13:58:58 +02:00
Joas Schilling
34181c3aef Correctly send Federate-Cloud Share Feedback against the remote share ID 2015-04-28 14:29:04 +02:00
Vincent Petry
65fbb5eda0 Update etag of direct parent on unshare 
Only call dirname() once instead of twice when propagating etags to the
recipient's parent folders.
 2015-04-28 13:11:23 +02:00
Joas Schilling
8f7c64253e Correctly generate the feedback URL for remote share 
The trailing slash was added in c78e3c4a7f
to correctly generate the encryption keys
 2015-04-28 11:28:54 +02:00
Robin Appelman
5304afbecb dont pass floats as timestamp to the changepropagator 2015-04-27 15:18:25 +02:00
Robin Appelman
32067f9e80 use microtime to prevent race conditions 2015-04-27 14:07:16 +02:00