da640adf68
Merge pull request #19577 from owncloud/share-donotreturnentrieswhenusernotingroup
...
Remove invalid share items from result when missing group membership
2015-10-06 09:24:22 +02:00
b945d71384
update licence headers via script
2015-10-05 21:15:52 +02:00
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
3bbb65998f
Make sure all variables are defined
2015-10-05 12:03:36 +02:00
8de0773214
Make sure the share we found is for the same item
2015-10-05 11:55:37 +02:00
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 #19119
* Added testcase
2015-09-25 13:06:05 +02:00
1911472b88
Discard expiration date from result for non-link shares
2015-09-17 13:45:26 +02:00
c17d022ca4
started to implement sharee list view. not completed yet, do not cry please.
2015-09-16 07:23:27 +02:00
ffd4e0dc5a
split off expirationView
2015-09-16 07:23:26 +02:00
f9c232c4ce
split off linkShareView
2015-09-16 07:23:26 +02:00
dcb084a617
split ShareDialogResharerInfoView from base view
2015-09-16 07:23:26 +02:00
83d91ddf20
further work on reimplementing the dialog layout
2015-09-16 07:23:25 +02:00
edd163a611
refactor share dialog for multi-purpose use (dropdown, sidebar) and better maintainability
2015-09-16 07:23:25 +02:00
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
7f8bca64cb
Merge pull request #18833 from owncloud/share-prevent-twice
...
Prevent sharing twice with user when already a group
2015-09-04 18:26:50 +02:00
f100ef0fc6
Prevent sharing twice with user when already a group
2015-09-04 16:22:01 +02:00
8123df9489
setup owner when getting users for share
2015-09-03 14:34:46 +02:00
045f8cc971
Merge pull request #18651 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
2aff11c80b
Actually validate the expire date on share
...
* Added more intergration tests
2015-08-30 10:31:43 +02:00
4e0e2eb222
Change log level of debugging logs to debug
2015-08-24 12:12:08 +02:00
e6eb74958f
Remove unnecessary DB prefixes from existing query builder usages
2015-08-10 16:21:41 +02:00
73169b0edb
Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_file
...
Remote shares should be uique
2015-07-28 13:06:25 +02:00
632e39a750
Fix PHPDoc on setPassword
2015-07-23 16:11:06 +02:00
ac08685234
Use a hook to integrate sharing password verification
2015-07-23 14:44:48 +02:00
f77e5f411d
Fix existing usages by removing the quotes
2015-07-21 15:25:47 +02:00
de348180ae
Use the public interface and our method instead of the doctrine thing
2015-07-21 15:25:47 +02:00
2d691c2fb4
Merge pull request #17381 from owncloud/fix_sharing_add_to_group
...
[sharing] fix addToGroup hook
2015-07-21 13:30:41 +02:00
fea71a81fd
Cannot share the same file multiple times with remote user
...
Fix for #17183
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
0fe81d2f21
Merge pull request #17330 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
40eaf71a33
Make sure the owner always has the right path
2015-07-07 11:08:21 +02:00
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
1385b1ec48
Remove OC_Appconfig
2015-07-03 18:00:16 +02:00
d3ac73c0c9
Remove OC_Log
2015-07-03 18:00:16 +02:00
8294ad71fc
Fix the path for users which have an exception for a group share
2015-07-02 15:35:31 +02:00
f52eec765c
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 10:49:22 +02:00
44ec3dd110
if it is a mount point we need to get the path from the mount manager
2015-06-30 15:08:18 +02:00
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
0684cc15dc
Merge pull request #17071 from owncloud/share-get-users-non-existing
...
fix getUsersSharingFile with locking
2015-06-26 18:27:53 +02:00
c338999032
fix getUsersSharingFile with locking
2015-06-26 16:31:52 +02:00
b318b9cf17
Merge pull request #17008 from owncloud/fix-17006
...
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
6c3a4282e5
Merge pull request #17165 from owncloud/federated_cloud_sharing_search_address_book
...
Search address book for federated cloud id
2015-06-26 10:53:02 +02:00
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
a288d0eea3
ne need to check twice if $row['share_with'] is set
2015-06-25 12:14:46 +02:00
dd9dfc4461
show nice display name for remote shares if possible
2015-06-25 12:14:03 +02:00
6977eff106
set NULL correctly in password update
...
Old code used 'NULL' but docterine wants null. Now it is possible again
to remove the password from a link share.
2015-06-24 12:37:59 +02:00
738b78f1b0
Use \OC\HintException and translate the hint
2015-06-22 15:34:06 +02:00
2b7e5f841a
Merge spliteUserRemote with fixRemoteUrlInShareWith
2015-06-22 15:25:23 +02:00
d38a378b8c
make sure that we split username and server address at the first '@' from the right to allow usernames containing '@'
2015-06-22 15:25:23 +02:00
b4471c2591
Fix the share mail notification when the item is in a folder
2015-05-06 15:44:19 +02:00
59c657da53
Merge pull request #15772 from owncloud/issue-15771-dont-restrict-permissions-for-share-owner
...
Do not restrict permissions for the original owner
2015-05-04 15:07:37 +02:00
fbba7a61cb
Use internally \OCP\ILogger instead of \OC\Log
...
* this is the preparation for some upcoming logger related changes
* also fixes an issue in the public interface where we request
an internal class as parameter
2015-04-30 11:52:30 +02:00
f524ae261a
Ignore "parent" shares when the sharee is the owner of the reshare-source
2015-04-29 14:18:46 +02:00
3c37cbdfe7
Correctly select file cache values also when checking group shares
2015-04-29 14:12:12 +02:00
8c7db2536d
Merge pull request #15596 from owncloud/issue/15589
...
Correctly generate the feedback URL for remote share
2015-04-29 10:52:43 +02:00
7df7a3b360
Merge pull request #15906 from rullzer/fix_15777
...
Password set via OCS API should not be double escaped
2015-04-29 10:44:25 +02:00
2eecfcbb80
Fix scrutinizer complains and return type doc
2015-04-28 11:28:55 +02:00
9fb7d0bca9
Correctly remove the protocol before prepeding it
2015-04-28 11:28:54 +02:00
8f7c64253e
Correctly generate the feedback URL for remote share
...
The trailing slash was added in c78e3c4a7f
2015-04-28 11:28:54 +02:00
de8c15e1a4
Merge pull request #14764 from owncloud/shared-etag-propagate
...
Propagate etags across shared storages
2015-04-28 10:58:50 +02:00
73bb3a22f6
Password set via OCS API should not be double escaped
2015-04-28 10:33:19 +02:00
46083006e1
fix several issues with doc blocks on share.php
2015-04-28 08:40:47 +02:00
30ad56813a
propagate etags for all user of a share
2015-04-27 14:07:15 +02:00
518d5aadf5
Allow getting *all* share entries owned by a user
2015-04-27 14:07:15 +02:00
80b892e7ed
Merge pull request #15729 from owncloud/remove-unused-variables
...
Remove unused variables
2015-04-19 12:38:29 +01:00
e837927ad5
fix followup issues with unneeded parameters
2015-04-18 17:02:39 +02:00
ccf47f40aa
Remove unused variables
...
* should make scrutinizer a lot more happy
* reduces maybe memory footprint
2015-04-18 16:35:19 +02:00
e3ad99d252
Add "Reply-To" support to sharing mails and refactor code
2015-04-10 17:30:07 +02:00
5abbf6d5b0
Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares
...
only create a db entry for the user in case of a name conflict on group share
2015-04-09 23:37:02 +02:00
0710db77bc
Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude
...
Dont create exclude list for generating the share target
2015-04-09 14:51:15 +02:00
332ea77865
only create a db entry for the user in case of a name conflict on group share
2015-04-09 11:16:08 +02:00
103d451459
Merge pull request #14987 from rullzer/ocs_password_fix2
...
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
0eee3a2618
remove unencrypted_size from the cache, size will contain the unencrypted size
2015-04-07 13:30:28 +02:00
0bf06d6691
No injections
2015-03-30 20:07:12 +02:00
b0aa17b13f
OCS Fixes to allow setting of password without removing additional settings
...
- Added setPassword to share.php
- Fixed OCS API call
- Added unit tests
2015-03-30 14:00:50 +02:00
f4dc9e6bf3
Merge pull request #15155 from owncloud/share-donotreturntrashedfiles
...
Do not return shares for files outside "files"
2015-03-27 17:05:14 +01:00
4d12c4a38b
Merge pull request #13938 from owncloud/deprecate-iappconfig
...
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
80f83ab5e0
Do not return shares for files outside "files"
2015-03-27 13:25:23 +01:00
223cca2a07
also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php
2015-03-26 22:31:45 +01:00
b585d87d9d
Update license headers
2015-03-26 11:44:36 +01:00
3c39658a1c
When the expiration date is enforced respect this
...
Make sure that we do not allow removing of the expiration date when this
is enforced in the settings.
2015-03-19 10:07:17 +01:00
378eef7eb4
migrate share helper method to IConfig
2015-03-18 13:07:39 +01:00
dbade19362
Merge pull request #13839 from owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown
...
Better finding the remote URL from user input in share dropdown
2015-03-11 14:38:41 +01:00
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
2015-02-26 11:37:37 +01:00
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01:00
b180724cd0
Extract the remote host from user input in share dropdown
...
Fix #13678
2015-02-23 11:28:41 +01:00
fbbb9fe0fd
Merge pull request #13979 from owncloud/group-share-collition-wrong-type-in-post-hook
...
Do not overwrite the shareType so the post hook is still correct
2015-02-11 15:23:13 +01:00
31b93ac19a
Do not overwrite the shareType so the post hook is still correct
2015-02-09 12:59:29 +01:00
1448f281b7
for password protected link shares the password is stored in shareWith, so we need to set this manually to null for the hooks
2015-02-05 17:23:59 +01:00
2e34db2bb3
Dont create exclude list for generating the share target
2015-02-04 17:08:03 +01:00
b1d8d88df8
Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares
...
make sure that we always create a public share key for remote shares
2015-01-29 17:54:04 +01:00
c78e3c4a7f
make sure that we always create a public share key for remote shares
2015-01-29 14:23:14 +01:00
82de50d5b9
remove trailing slash
2015-01-29 14:03:09 +01:00
8fa3e7a6bf
Do not retrieve shares through group if user has no group
2015-01-23 15:11:06 +01:00
9f137ac259
Fix reshare permission change to not impair other deletion code
...
A recent change that prevents reshare permission changes to delete group
share children had the side-effect of also preventing group share
children deletion when it needed to be done.
This fix adds an extra flag to isolate the "reshare permission change"
deletion case and keep the other ones as they were before, not only to
fix the regression but also fix other potential regressions in code that
uses this method.
Also updated the comment because now Helper::delete() is no longer
limited to reshares but also applies to group share children.
2015-01-22 10:12:47 +01:00
40931a8b0d
Fix getItemSharedWithUser for groups
...
Fixed SQL query for whenever a user has more than one group.
Added missing $owner where clause for group lookup.
Added unit tests for the group cases.
2015-01-16 18:11:13 +01:00
b6f63e9b3d
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 16:36:13 +01:00
24993280ed
Next step in server-to-server sharing next generation, see #12285
...
Beside some small improvements and bug fixes this will probably the final state for OC8.
To test this you need to set up two ownCloud instances. Let's say:
URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".
The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.
If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
0d4f0ab871
reduce OC_Preferences, OC_Config and \OCP\Config usage
...
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
698ecbf308
OCS API for server-to-server sharing
2014-12-04 13:18:13 +01:00
60e4aa120f
Merge pull request #12350 from mprokop/link_expiration
...
fix calculation of expiration date if there is a default expiration date...
2014-11-26 10:19:12 +01:00
Thomas Müller
Morris Jobke
Vincent Petry
Joas Schilling
Roeland Jago Douma
Arthur Schiwon
Lukas Reschke
Robin Appelman
Roeland Douma
Bjoern Schiessle
Björn Schießle
Joas Schilling
Robin McCorkell
Jenkins for ownCloud