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

170 commits

Author SHA1 Message Date
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
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
Joas Schilling
40eaf71a33 Make sure the owner always has the right path 2015-07-07 11:08:21 +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
Joas Schilling
8294ad71fc Fix the path for users which have an exception for a group share 2015-07-02 15:35:31 +02:00
Bjoern Schiessle
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
Vincent Petry
0684cc15dc Merge pull request #17071 from owncloud/share-get-users-non-existing 
fix getUsersSharingFile with locking
 2015-06-26 18:27:53 +02:00
Robin Appelman
c338999032 fix getUsersSharingFile with locking 2015-06-26 16:31:52 +02:00
Björn Schießle
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
Thomas Müller
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
Bjoern Schiessle
a288d0eea3 ne need to check twice if $row['share_with'] is set 2015-06-25 12:14:46 +02:00
Bjoern Schiessle
dd9dfc4461 show nice display name for remote shares if possible 2015-06-25 12:14:03 +02:00
Roeland Jago Douma
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
Joas Schilling
738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Joas Schilling
2b7e5f841a Merge spliteUserRemote with fixRemoteUrlInShareWith 2015-06-22 15:25:23 +02:00
Bjoern Schiessle
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
Joas Schilling
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
Joas Schilling
f524ae261a Ignore "parent" shares when the sharee is the owner of the reshare-source 2015-04-29 14:18:46 +02:00
Joas Schilling
3c37cbdfe7 Correctly select file cache values also when checking group shares 2015-04-29 14:12:12 +02:00
Morris Jobke
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
Morris Jobke
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
Joas Schilling
2eecfcbb80 Fix scrutinizer complains and return type doc 2015-04-28 11:28:55 +02:00
Joas Schilling
9fb7d0bca9 Correctly remove the protocol before prepeding it 2015-04-28 11:28:54 +02:00
Joas Schilling
8f7c64253e Correctly generate the feedback URL for remote share 
The trailing slash was added in c78e3c4a7f
to correctly generate the encryption keys
 2015-04-28 11:28:54 +02:00
Morris Jobke
de8c15e1a4 Merge pull request #14764 from owncloud/shared-etag-propagate 
Propagate etags across shared storages
 2015-04-28 10:58:50 +02:00
Roeland Jago Douma
73bb3a22f6 Password set via OCS API should not be double escaped 2015-04-28 10:33:19 +02:00
Joas Schilling
46083006e1 fix several issues with doc blocks on share.php 2015-04-28 08:40:47 +02:00
Robin Appelman
30ad56813a propagate etags for all user of a share 2015-04-27 14:07:15 +02:00
Robin Appelman
518d5aadf5 Allow getting *all* share entries owned by a user 2015-04-27 14:07:15 +02:00
Morris Jobke
e837927ad5 fix followup issues with unneeded parameters 2015-04-18 17:02:39 +02:00
Bjoern Schiessle
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
Morris Jobke
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
Bjoern Schiessle
0eee3a2618 remove unencrypted_size from the cache, size will contain the unencrypted size 2015-04-07 13:30:28 +02:00
Roeland Jago Douma
0bf06d6691 No injections 2015-03-30 20:07:12 +02:00
Roeland Jago Douma
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
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