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
f2f1eab7f4
fix broken unit test ( #25198 )
2016-06-21 13:55:11 +02:00
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
c268ad1597
Add PHP unit test
2016-06-09 18:29:13 +02:00
bb54ab0db8
add hide file list option
2016-06-09 15:15:17 +02:00
72c5535492
Extend unit tests
2016-06-07 15:09:26 +02:00
2e2ece753f
Fix unit tests
2016-06-07 15:09:25 +02:00
aba539703c
Update license headers
2016-05-26 19:57:24 +02:00
3f0b2d148d
Move tests to PSR-4
2016-05-25 15:00:00 +02:00
5001036fd4
Move classes from outside lib/ to PSR-4
2016-05-25 14:59:59 +02:00
25f3110730
Fix ShareControllerTest ( #24824 )
2016-05-25 10:21:07 +02:00
7b25839bd5
use share initiator as fall back to access the file
...
in case of federated re-shares the owner can be a remote user.
Therefore we can't always use to owner to access the local file
2016-05-20 21:15:15 +02:00
5a1641bed2
move request handler for federated shares to the federated sharing app
2016-05-20 21:15:08 +02:00
320b1c3abf
Fix more failures
2016-05-19 10:11:42 +02:00
5c9103287f
Group fixup ( #24621 )
...
* Move used OC_Group_xx to \OC\Group
* Add (deprecated) legacy wrapper in legacy, OC_Group_xx
* Replace deprecated use of OC_Group_xx with \OC\Group\xx
2016-05-17 16:06:44 +02:00
8bfa532075
Fix test race condition
...
E-tag propagation replies on the mtime of the file. Order of events:
1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.
Now this goes right often when 1 and 2 happen in the same second.
However imagine
1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)
Now the mtime will be set to the same time. Thus not chaning the etag.
2016-05-11 14:07:37 +02:00
62bc53143e
Add locking to modifying operation of the OCS Share API
...
Fixes #17243
This is done in the OCS Share API instead of the share manager since we
want lazy shares in general. However when doing modifying calls via the
OCS Share API it is fine to force real nodes.
* Updated unit tests to work with logging
2016-04-30 10:32:35 +02:00
887045b790
Merge pull request #24027 from owncloud/translate_ocs_share
...
Translate OCS Share API error messages
2016-04-26 14:42:18 +02:00
5e9b618604
Translate OCS Share API error messages
...
For https://github.com/owncloud/core/issues/22209
2016-04-25 11:08:48 +02:00
74de72e75e
Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app
...
move federated sharing settings to the federatedfilesharing app
2016-04-25 10:19:46 +02:00
e10105474f
move federated sharing settings to the federatedfilesharing app
2016-04-22 14:55:40 +02:00
b7867e9368
Add unit tests for shared size propagation with encryption
2016-04-21 13:13:18 +02:00
cd01c440a0
Merge pull request #23919 from owncloud/cyclyc-share-dep-example
...
SharedStorage to new sharing code + cleanup
2016-04-20 20:37:27 +02:00
dd7e0d13e5
Move the group dummy backend to test
...
The dummy backend is only used for testing and should thus reside in
tests.
2016-04-19 15:13:31 +02:00
92abb5f23d
Fix tests
2016-04-19 14:04:00 +02:00
16df1c5188
apps: Fix typos (found by codespell) ( #23862 )
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 12:52:51 +02:00
db0c3bd535
Fix Share20OCSTest
2016-04-08 15:22:49 +02:00
db5ea95e29
Add capability to show if group sharing is enabled
...
fixes #23477
Now clients can correct wording to properly reflect who a user can share
with.
2016-04-04 19:35:01 +02:00
a9aa39efbf
Fix displaying owner before share icon in file list
...
Initial display of owner was missing
2016-03-30 18:09:02 +02:00
d5be21fe81
Merge pull request #23398 from owncloud/block_group_sharing
...
Allow blocking of group sharing
2016-03-22 21:28:13 +01:00
00f48ec37b
When the Share API is disabled do not return shares
...
Fixes #22668
Block everything in the OCS Share API
2016-03-22 19:43:23 +01:00
e69a09756b
Respect disabled group sharing in sharee endpoint
...
* Fix tests
2016-03-22 17:13:34 +01:00
52826d0e24
Block group sharing in API and in share manager
...
* Fix tests
2016-03-22 17:13:34 +01:00
f778e48ee5
Add webdav property for share info in PROPFIND response
2016-03-17 15:35:21 +01:00
7d42bdfde0
Specify the target user when unsharing a federated share
2016-03-14 14:34:05 +01:00
6509220f82
Fix intergration tests
2016-03-13 13:31:28 +01:00
517ef52560
Add mimetype to OCS Share API output
...
Fixes #23044
2016-03-10 15:41:17 +01:00
c353d51810
Remove Scrutinizer Auto Fixer
2016-03-01 17:48:23 +01:00
933f60e314
Update author information
...
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
5fe5233f41
Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs
...
Add autodiscovery support to server-to-server sharing implementation
2016-03-01 11:27:28 +01:00
73e145cf63
Merge pull request #22728 from owncloud/external-share-testremote
...
use ocs discover endpoint to test remote
2016-03-01 11:27:07 +01:00
8f95d69954
Fix tests
2016-03-01 07:01:52 +01:00
8924b0a0dc
Check correct permissions when resharing
...
Fixes #22675
Since we only get a share id we do not know the path for the sharer.
Now if we edit a share we start searching for shares for that user of
that node. And deduce the permissions that way.
* Intergration test added
* Fix unit tests
2016-02-29 19:30:14 +01:00
66536f912e
Merge pull request #22640 from owncloud/fix_22587
...
Remove delete permissions for read-only federated reshares
2016-02-26 10:48:07 +01:00
59028cced0
Add autodiscovery support to server-to-server sharing
...
Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
2016-02-26 09:26:55 +01:00
92cff0984d
Make file actions use icon CSS classes
...
This makes theming of file actions possible
2016-02-25 22:49:52 +01:00
0c9c7737b4
Remove delete permissions for read-only federated reshares
...
An incomming federated share is just a mount point. Therefor if we
request the permissions on the mountpoint DELETE permissions will be
returned (among others). Since we can always remove a mountpoint, update
a mount point.
However now when trying to reshare we will try to reshare with DELETE
permissions. Which is false.
This PR removes the delete permissions if it is a shared storage.
Basically a quick hack.
Fixes #22587
2016-02-25 12:19:38 +01:00
670557ffbb
Add unit tests for formatShare
2016-02-17 13:55:39 +01:00
2aa0b885f6
OCS Share API should not return invalid shares
...
Since we have lazy shares it can happen that a share is actually
invalid. See https://github.com/owncloud/core/issues/20908
This add checks for the get methods to handle the NotFound exception.
2016-02-17 13:55:39 +01:00
11707dffce
Merge pull request #22351 from owncloud/fix_22277
...
show remote server on federated share auto-complete
2016-02-13 18:25:04 +01:00
11abf2487c
add remote server to the result
2016-02-12 15:52:51 +01:00
745bfda41f
Fix migration step to avoind invisible shares
2016-02-11 13:29:23 +01:00
0284c60c3a
Add tests
2016-02-11 13:29:23 +01:00
f79fafcf06
Revert back to non-webdav download link for public URLs
...
Fixes issues with browsers not happy with the token.
Fixes activities which were not sent.
2016-02-10 19:09:52 +01:00
acd8c72d3d
add tests
2016-02-09 15:03:00 +01:00
359c62d90e
Fix unit tests
2016-02-09 15:03:00 +01:00
623a0e4637
Example hook check
2016-02-09 10:36:44 +01:00
38cbfed476
Fix unit test
2016-02-09 10:20:25 +01:00
698a6b07a8
Merge pull request #22206 from owncloud/share2_migration_with_federated
...
Update the migration step to include federated shares
2016-02-08 17:58:26 +01:00
3c4e511792
Update the migration step to include federated shares
...
Now federated shares will also be updated to the flat
reshare model.
2016-02-08 15:11:48 +01:00
a506f9ca3f
Respect not allowing outgoing shares
2016-02-08 11:30:48 +01:00
bec1de8a38
Update OCS Share API to use federated share provider
2016-02-08 11:30:48 +01:00
ca32778975
Even single shares are returned as array
...
When fetching a single share using ../shares/<ID> we should still return
an array of shares.
Fixes #22189
2016-02-08 10:11:22 +01:00
453ea6698d
[Share 2.0] Fix public link sharing
2016-02-03 19:25:29 +01:00
c1841892d0
[Share 2.0] Fix OCS endpoint
2016-02-03 19:25:29 +01:00
e34ec0a138
Merge pull request #22095 from owncloud/public_link_with_port
...
Public link downloads should work on instance on non default port
2016-02-03 16:06:54 +01:00
4bb96a5553
Construct valid URL
2016-02-03 11:29:36 +01:00
dc32f49c6e
[Share 2.0] Use GenericShareException
2016-02-02 14:23:45 +01:00
4d7130ad31
[Share 2.0] Add exceptions to OCP
2016-02-02 14:07:11 +01:00
6151a0540b
Update the initiator of the share as well in migration
2016-01-28 19:24:23 +01:00
b85770d636
Update reshares in batches as not to run out of memory
2016-01-28 19:24:23 +01:00
dc8d43575f
upgrade to sharing 2.0, remove hierarchical re-shares
2016-01-28 19:24:23 +01:00
2831884e74
Fix OCS unit tests after two share merges
...
* Use getNode
* Return IShare object so typechecking is happy
2016-01-28 13:17:16 +01:00
295de6aad7
Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_strings
...
Share2 ocs fix passing empty strings
2016-01-28 11:58:35 +01:00
1369f2c684
cleanup shared cache
2016-01-28 11:46:43 +01:00
34e912ab6b
[Share 2.0] Fix interfaces and comments
...
* Made comments more clear
* Removed unneeded methods
* IShares shareTime is now a proper DateTime object
* IShares getPath -> getNode & setPath -> setNode
* Fix unit tests
2016-01-28 07:54:09 +01:00
185b9c6edd
[Share 2.0] Move IShare to OCP
2016-01-27 22:04:37 +01:00
6957917b20
[Share 2.0] Allow using permissions to update link share
2016-01-27 20:36:36 +01:00
f5c45dfe7b
[Share 2.0] Still allow isolated updates
...
Still allow isolated updates of parameters
2016-01-27 20:36:31 +01:00
b321ceef60
[Share 2.0] Also handle empty parameter in updateShare
...
* More sanity checks
* More unit tests
2016-01-27 20:34:06 +01:00
35a3432793
[Share 2.0] When passing empty strings don't fail
...
The password and expiration date can be set to empty strings when
created. This is now handled gracefully.
2016-01-27 20:34:06 +01:00
d46cd6a245
Fix tests
2016-01-26 14:02:32 +01:00
18421e7e68
Directly get from the server container
...
* Updated unit tests
2016-01-20 21:12:26 +01:00
8734ebe505
[Share 2.0] Make link share download use share manager
2016-01-20 21:12:26 +01:00
717697313b
[Share 2.0] Move tests over the sharemanager
...
Nice side effect... pure unit tests!
2016-01-20 21:12:26 +01:00
d33e578665
[Share 2.0] Add share owner information to OCS Share API
2016-01-15 20:21:47 +01:00
5d0451b848
Safe teardowns
2016-01-14 12:54:42 +01:00
cbd3050f4c
[Share 2.0] Use full share id (providerId:shareId)
...
Now that we support multiple managers we communicate shares to the
outside as 'providerId:shareId'. This makes sures that id's are unique
when references from the OCS API.
However, since we do not want to break the OCS API v1 we need to
somewhat hack around this.
When we switch to OCS API v2 (which we should when we support more
custom providers). We will change the id to always be the fullShareId.
2016-01-13 16:35:15 +01:00
682821c71e
Happy new year!
2016-01-12 15:02:18 +01:00
be8125b8e2
Add unit tests to make sure we do not lower the search
2016-01-12 10:34:38 +01:00
98c4951f45
getLowStrengthGenerator does not do anything anymore
2016-01-11 19:59:15 +01:00
17a066c18e
Properly close db cursors
2016-01-08 20:27:01 +01:00
629bac22fd
Make sure to respect deleted group shares by user
2016-01-08 20:27:01 +01:00
066e3770bb
Make sure that permissions stay in sync for share_type 2
...
When a file/folder is shared with a group and one of the group members
moves this file/folder an extra entry is created in the share table.
When the permission of the group share is updated we used to only
sometimes update the shares for individual users.
* Added intergration tests
2016-01-08 20:27:01 +01:00
9b595474af
Fix public page URL JS test
...
Stub the port so it doesn't use the one configured by karma
2016-01-08 13:25:38 +01:00
601457d221
Merge pull request #20773 from owncloud/share2.0_create
...
[Sharing 2.0] create share
2016-01-07 14:57:05 +01:00
9742e9b113
Add token in webdav download link of public page
2016-01-07 13:37:18 +01:00
Lukas Reschke
Vincent Petry
Thomas Müller
Arthur Schiwon
Bjoern Schiessle
Roeland Jago Douma
Joas Schilling
Joas Schilling
Björn Schießle
Roeland Douma
Roeland Jago Douma
Robin Appelman
Stefan Weil
Thomas Müller