Bjoern Schiessle
0eee3a2618
remove unencrypted_size from the cache, size will contain the unencrypted size
2015-04-07 13:30:28 +02:00
Morris Jobke
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
Vincent Petry
80f83ab5e0
Do not return shares for files outside "files"
2015-03-27 13:25:23 +01:00
Bjoern Schiessle
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
Jenkins for ownCloud
b585d87d9d
Update license headers
2015-03-26 11:44:36 +01:00
Roeland Jago Douma
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
Morris Jobke
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
Morris Jobke
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
.
2015-02-26 11:37:37 +01:00
Jenkins for ownCloud
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01:00
Joas Schilling
b180724cd0
Extract the remote host from user input in share dropdown
...
Fix #13678
2015-02-23 11:28:41 +01:00
Vincent Petry
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
Joas Schilling
31b93ac19a
Do not overwrite the shareType so the post hook is still correct
2015-02-09 12:59:29 +01:00
Bjoern Schiessle
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
Morris Jobke
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
Bjoern Schiessle
c78e3c4a7f
make sure that we always create a public share key for remote shares
2015-01-29 14:23:14 +01:00
Bjoern Schiessle
82de50d5b9
remove trailing slash
2015-01-29 14:03:09 +01:00
Vincent Petry
8fa3e7a6bf
Do not retrieve shares through group if user has no group
2015-01-23 15:11:06 +01:00
Vincent Petry
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
Vincent Petry
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
Bjoern Schiessle
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
Bjoern Schiessle
698ecbf308
OCS API for server-to-server sharing
2014-12-04 13:18:13 +01:00
Joas Schilling
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
Bjoern Schiessle
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
Thomas Müller
cbb9caf030
Merge pull request #12226 from owncloud/remove-phpass
...
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
Bjoern Schiessle
ea4eedd35a
only users can have a display name different from the id
2014-11-18 11:46:28 +01:00
Bjoern Schiessle
367468ff1f
make sure that we only find the shares from the correct share type if users and groups with the same ID exists
2014-11-18 11:11:49 +01:00
Bjoern Schiessle
5192641447
make sure that we don't find the wrong shares if a user and a group have the same ID
2014-11-18 11:03:08 +01:00
Lukas Reschke
8595b76df2
Remove phpass and migrate to new Hasher interface
...
This PR removes phpass and migrates to the new Hasher interface.
Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
Lukas Reschke
c30b7f8197
Remove unreachable statement
2014-10-23 23:03:14 +02:00
Bjoern Schiessle
b7718bc212
always use the correct share type
2014-10-22 11:48:29 +02:00
Bernhard Reiter
7e9baafc53
Add option to include tags for shared items.
2014-10-14 00:06:07 +02:00
Bjoern Schiessle
c6c9a51b11
distinguish between file dependent shares and other shares
2014-10-13 15:04:54 +02:00
Bjoern Schiessle
3431d547a9
fix performance issues
2014-10-10 12:16:26 +02:00
Bjoern Schiessle
6e7acb8ae0
some small fixed, suggested by scrutinizer
2014-09-29 11:23:18 +02:00
Bjoern Schiessle
2a4da7fe09
on unshare only unshare childrens if there is no other parent available
2014-09-26 16:58:47 +02:00
Bjoern Schiessle
e115a7043f
only create a new share entry, if the user needs a different target name than the group share
2014-09-26 13:19:15 +02:00
Bjoern Schiessle
ed85055d31
for group shares we don't need a extra db entry of groupTarget equals itemTarget
2014-09-26 13:10:31 +02:00
Bjoern Schiessle
d242e518f9
for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self
2014-09-26 13:01:54 +02:00
Bjoern Schiessle
968152113e
always select permissions, used in getItems()
2014-09-25 12:35:11 +02:00
Bjoern Schiessle
d5fc011c90
some small fixes
2014-09-25 11:29:57 +02:00
Bjoern Schiessle
07d43df713
only add a new row if it isn't a unique share, otherwise update the existing row
2014-09-24 14:02:02 +02:00
Bjoern Schiessle
bd268c35f5
generateTarget() will always find a unique target
2014-09-24 14:02:01 +02:00
Bjoern Schiessle
9105e17307
unit tests for grouping of shares pointing to the same source
2014-09-22 17:54:47 +02:00
Bjoern Schiessle
89c3b650e6
group shares and combine permissions
2014-09-22 17:25:15 +02:00
kondou
a10411d2bc
Readd TOKEN_LENGTH
2014-09-04 19:09:26 +02:00
kondou
226b203e20
Use base62 and remove configuration options for link length
2014-09-04 16:20:20 +02:00
kondou
c2d8eabd71
Change config.sample entry and use MediumSecurity
2014-09-04 15:52:23 +02:00
kondou
3bf725d7e0
Adapt token size to new generation and add an option for free length specification
...
Minimum size is 3 = 46656 tokens, maximum size is 64, which is what our DB allows.
2014-09-04 15:24:33 +02:00
kondou
2a4c51389c
Use a route instead of s.php and convert tokens asap
2014-09-04 15:23:55 +02:00
Robin Appelman
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00