Commit graph

254 commits

Author SHA1 Message Date
Thomas Müller
9ec2850c78 Use mocks when testing isSharingDisabledForUser 2015-11-19 15:36:16 +01:00
Roeland Jago Douma
402e0afbc5 Fix Error message when sharing outside of group
For 
2015-11-09 15:52:17 +01:00
Bjoern Schiessle
4719305e3b cache result from parent folders 2015-11-04 09:27:29 +01:00
Stephen Colebrook
6feb31bf96 Allow separate templates for internal and external share notifications 2015-10-29 10:24:24 +01:00
Lukas Reschke
8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Roeland Jago Douma
9071e756a1 Fix for broken ajax/share.php endpoint
Even more code mess :(
All tests pass again. But I'm really not happy with this endpoint.
2015-10-23 09:24:03 +02:00
Thomas Müller
4f5ff9c105 Ensure the password is only hashed in case it's changed on the client - fixes 2015-10-22 17:32:40 +02:00
Robin Appelman
e46741cf5d detect object homestorage in share code 2015-10-16 21:41:51 +02:00
Roeland Jago Douma
8fdb12f8fb Check for error when resharing 2015-10-16 20:43:17 +02:00
Roeland Jago Douma
9e86d71cc5 When sharing with the owner show the path
The error message should contain the path that is being shared not the
numeric id.
2015-10-16 20:43:17 +02:00
Thomas Müller
3e87560033 Merge pull request from owncloud/fix_19678
Return path instead of itemsource
2015-10-14 12:38:38 +02:00
Roeland Jago Douma
06aaa059d1 Squash collection shares
If folder1 is shared to user2 and user3. And folder1/folder2 is shared
to user4 and user5 then getting all the users with access to
folder1/folder2 should only list user2 and user 3 once.

Previously this was done twice since we request the info two times.

This fix makes sure that we only append unique results to the array.

* Added test
2015-10-13 10:05:49 +02:00
Roeland Jago Douma
585e9cb0e9 Return path instead of itemsource
Fixes 

Errors should contain paths and not internal ids
2015-10-13 09:00:33 +02:00
Robin Appelman
59cf817308 Merge pull request from owncloud/etag-share-permissions-update
Mark shares as dirty when changing permissions
2015-10-06 18:09:12 +02:00
Thomas Müller
48ef5b6b3b OC_Log not longer exists 2015-10-06 14:18:22 +02:00
Robin Appelman
0817024e6f Mark shares as dirty when changing permissions 2015-10-06 11:38:41 +02:00
Thomas Müller
0385a62363 Merge pull request from owncloud/update-license-headers
update licence headers via script
2015-10-06 11:18:35 +02:00
Thomas Müller
da640adf68 Merge pull request from owncloud/share-donotreturnentrieswhenusernotingroup
Remove invalid share items from result when missing group membership
2015-10-06 09:24:22 +02:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Vincent Petry
1c7244c120 Remove invalid share items from result when missing group membership
Group shares usually have subshare entries for every user. In some
situations it can happen that the user was removed from the group but
the subshare entries still exist.

This fix makes sure that such subshare entries are not returned any more
as the user isn't in the group any more.
2015-10-05 17:21:34 +02:00
Joas Schilling
3bbb65998f Make sure all variables are defined 2015-10-05 12:03:36 +02:00
Joas Schilling
8de0773214 Make sure the share we found is for the same item 2015-10-05 11:55:37 +02:00
Roeland Jago Douma
9a373cb5bb Do not blindy copy expiration date on reshare
If a file/folder is reshared we should not blindly copy the expiration
date of the parent share. User/Group shares do not have expiration dates
currently, and thus this is always set to null.

Fixes 

* Added testcase
2015-09-25 13:06:05 +02:00
Vincent Petry
1911472b88 Discard expiration date from result for non-link shares 2015-09-17 13:45:26 +02:00
Arthur Schiwon
c17d022ca4 started to implement sharee list view. not completed yet, do not cry please. 2015-09-16 07:23:27 +02:00
Arthur Schiwon
ffd4e0dc5a split off expirationView 2015-09-16 07:23:26 +02:00
Arthur Schiwon
f9c232c4ce split off linkShareView 2015-09-16 07:23:26 +02:00
Arthur Schiwon
dcb084a617 split ShareDialogResharerInfoView from base view 2015-09-16 07:23:26 +02:00
Arthur Schiwon
83d91ddf20 further work on reimplementing the dialog layout 2015-09-16 07:23:25 +02:00
Arthur Schiwon
edd163a611 refactor share dialog for multi-purpose use (dropdown, sidebar) and better maintainability 2015-09-16 07:23:25 +02:00
Lukas Reschke
7cbf2bc56d Allow 0 and false as password
When we use the check for "empty" here passwords such as 0 will not work.

Fixes https://github.com/owncloud/password_policy/issues/8
2015-09-08 17:53:29 +02:00
Morris Jobke
7f8bca64cb Merge pull request from owncloud/share-prevent-twice
Prevent sharing twice with user when already a group
2015-09-04 18:26:50 +02:00
Vincent Petry
f100ef0fc6 Prevent sharing twice with user when already a group 2015-09-04 16:22:01 +02:00
Robin Appelman
8123df9489 setup owner when getting users for share 2015-09-03 14:34:46 +02:00
Vincent Petry
045f8cc971 Merge pull request from owncloud/ocs_share_create_with_expire
Allow to directly set the expireDate on a new (link)share
2015-08-30 10:50:12 +02:00
Roeland Jago Douma
2aff11c80b Actually validate the expire date on share
* Added more intergration tests
2015-08-30 10:31:43 +02:00
Joas Schilling
4e0e2eb222 Change log level of debugging logs to debug 2015-08-24 12:12:08 +02:00
Joas Schilling
e6eb74958f Remove unnecessary DB prefixes from existing query builder usages 2015-08-10 16:21:41 +02:00
Roeland Douma
73169b0edb Merge pull request from rullzer/no_multiple_remote_shares_of_same_file
Remote shares should be uique
2015-07-28 13:06:25 +02:00
Thomas Müller
632e39a750 Fix PHPDoc on setPassword 2015-07-23 16:11:06 +02:00
Thomas Müller
ac08685234 Use a hook to integrate sharing password verification 2015-07-23 14:44:48 +02:00
Joas Schilling
f77e5f411d Fix existing usages by removing the quotes 2015-07-21 15:25:47 +02:00
Joas Schilling
de348180ae Use the public interface and our method instead of the doctrine thing 2015-07-21 15:25:47 +02:00
Morris Jobke
2d691c2fb4 Merge pull request from owncloud/fix_sharing_add_to_group
[sharing] fix addToGroup hook
2015-07-21 13:30:41 +02:00
Roeland Jago Douma
fea71a81fd Cannot share the same file multiple times with remote user
Fix for 
It should not be possible to create multiple remote shares from user A
to user B of the same file/folder.
2015-07-15 12:42:40 +02:00
Morris Jobke
0fe81d2f21 Merge pull request from owncloud/fix-share-path-for-group-exceptions
Fix the path for users which have an exception for a group share
2015-07-08 10:33:42 +02:00
Joas Schilling
40eaf71a33 Make sure the owner always has the right path 2015-07-07 11:08:21 +02:00
Bjoern Schiessle
058d910f5e intproduce pre_addToGroup hook. we need to calculate the possible unique
targets before the user was added to the group otherwise we will always detect
a name collision
2015-07-06 17:24:05 +02:00
Thomas Müller
1385b1ec48 Remove OC_Appconfig 2015-07-03 18:00:16 +02:00
Thomas Müller
d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00