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

469 commits

Author SHA1 Message Date
Joas Schilling
320b1c3abf
Fix more failures 2016-05-19 10:11:42 +02:00
Roeland Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Thomas Müller
887045b790 Merge pull request #24027 from owncloud/translate_ocs_share 
Translate OCS Share API error messages
 2016-04-26 14:42:18 +02:00
Roeland Jago Douma
5e9b618604
Translate OCS Share API error messages 
For https://github.com/owncloud/core/issues/22209
 2016-04-25 11:08:48 +02:00
Björn Schießle
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
Björn Schießle
e10105474f
move federated sharing settings to the federatedfilesharing app 2016-04-22 14:55:40 +02:00
Robin Appelman
b7867e9368 Add unit tests for shared size propagation with encryption 2016-04-21 13:13:18 +02:00
Thomas Müller
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
Roeland Jago Douma
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
Roeland Jago Douma
92abb5f23d
Fix tests 2016-04-19 14:04:00 +02:00
Stefan Weil
16df1c5188 apps: Fix typos (found by codespell) (#23862) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-12 12:52:51 +02:00
Roeland Jago Douma
db0c3bd535
Fix Share20OCSTest 2016-04-08 15:22:49 +02:00
Roeland Jago Douma
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
Vincent Petry
a9aa39efbf Fix displaying owner before share icon in file list 
Initial display of owner was missing
 2016-03-30 18:09:02 +02:00
Thomas Müller
d5be21fe81 Merge pull request #23398 from owncloud/block_group_sharing 
Allow blocking of group sharing
 2016-03-22 21:28:13 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
e69a09756b Respect disabled group sharing in sharee endpoint 
* Fix tests
 2016-03-22 17:13:34 +01:00
Roeland Jago Douma
52826d0e24 Block group sharing in API and in share manager 
* Fix tests
 2016-03-22 17:13:34 +01:00
Vincent Petry
f778e48ee5 Add webdav property for share info in PROPFIND response 2016-03-17 15:35:21 +01:00
Robin Appelman
7d42bdfde0 Specify the target user when unsharing a federated share 2016-03-14 14:34:05 +01:00
Roeland Jago Douma
6509220f82 Fix intergration tests 2016-03-13 13:31:28 +01:00
Roeland Jago Douma
517ef52560 Add mimetype to OCS Share API output 
Fixes #23044
 2016-03-10 15:41:17 +01:00
Lukas Reschke
c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke
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
Thomas Müller
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
Thomas Müller
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
Lukas Reschke
8f95d69954 Fix tests 2016-03-01 07:01:52 +01:00
Roeland Jago Douma
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
Thomas Müller
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
Lukas Reschke
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
Roeland Jago Douma
92cff0984d Make file actions use icon CSS classes 
This makes theming of file actions possible
 2016-02-25 22:49:52 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
670557ffbb Add unit tests for formatShare 2016-02-17 13:55:39 +01:00
Roeland Jago Douma
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
Thomas Müller
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
Bjoern Schiessle
11abf2487c add remote server to the result 2016-02-12 15:52:51 +01:00
Roeland Jago Douma
745bfda41f Fix migration step to avoind invisible shares 2016-02-11 13:29:23 +01:00
Roeland Jago Douma
0284c60c3a Add tests 2016-02-11 13:29:23 +01:00
Vincent Petry
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
Robin Appelman
acd8c72d3d add tests 2016-02-09 15:03:00 +01:00
Roeland Jago Douma
359c62d90e Fix unit tests 2016-02-09 15:03:00 +01:00
Roeland Jago Douma
623a0e4637 Example hook check 2016-02-09 10:36:44 +01:00
Roeland Jago Douma
38cbfed476 Fix unit test 2016-02-09 10:20:25 +01:00
Thomas Müller
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
Roeland Jago Douma
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
Roeland Jago Douma
a506f9ca3f Respect not allowing outgoing shares 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
bec1de8a38 Update OCS Share API to use federated share provider 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
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