summaryrefslogtreecommitdiffstats
path: root/lib/private/share
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-262-23/+69
|\ \ \ | |/ / |/| | Improve splitting of username and remote adress when username contains an `@`
| * | Use \OC\HintException and translate the hintJoas Schilling2015-06-223-34/+9
| | |
| * | Merge spliteUserRemote with fixRemoteUrlInShareWithJoas Schilling2015-06-222-25/+44
| | |
| * | make sure that we split username and server address at the first '@' from ↵Bjoern Schiessle2015-06-223-1/+53
| | | | | | | | | | | | the right to allow usernames containing '@'
* | | Merge pull request #17165 from ↵Thomas Müller2015-06-261-3/+12
|\ \ \ | |_|/ |/| | | | | | | | owncloud/federated_cloud_sharing_search_address_book Search address book for federated cloud id
| * | ne need to check twice if $row['share_with'] is setBjoern Schiessle2015-06-251-1/+1
| | |
| * | show nice display name for remote shares if possibleBjoern Schiessle2015-06-251-2/+11
| |/
* / set NULL correctly in password updateRoeland Jago Douma2015-06-241-1/+1
|/ | | | | Old code used 'NULL' but docterine wants null. Now it is possible again to remove the password from a link share.
* Fix the share mail notification when the item is in a folderJoas Schilling2015-05-061-0/+5
|
* Merge pull request #15772 from ↵Joas Schilling2015-05-041-7/+9
|\ | | | | | | | | owncloud/issue-15771-dont-restrict-permissions-for-share-owner Do not restrict permissions for the original owner
| * Ignore "parent" shares when the sharee is the owner of the reshare-sourceJoas Schilling2015-04-291-0/+2
| |
| * Correctly select file cache values also when checking group sharesJoas Schilling2015-04-291-7/+7
| |
* | Use internally \OCP\ILogger instead of \OC\LogMorris Jobke2015-04-301-2/+4
| | | | | | | | | | | | * 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
* | Merge pull request #15596 from owncloud/issue/15589Morris Jobke2015-04-291-6/+9
|\ \ | | | | | | Correctly generate the feedback URL for remote share
| * | Fix scrutinizer complains and return type docJoas Schilling2015-04-281-4/+6
| | |
| * | Correctly remove the protocol before prepeding itJoas Schilling2015-04-281-0/+1
| | |
| * | Correctly generate the feedback URL for remote shareJoas Schilling2015-04-281-2/+2
| |/ | | | | | | | | The trailing slash was added in c78e3c4a7fa1d2f474ab58551e67a50e093f6ed8 to correctly generate the encryption keys
* | Merge pull request #15906 from rullzer/fix_15777Morris Jobke2015-04-291-1/+1
|\ \ | |/ |/| Password set via OCS API should not be double escaped
| * Password set via OCS API should not be double escapedRoeland Jago Douma2015-04-281-1/+1
| |
* | Merge pull request #14764 from owncloud/shared-etag-propagateMorris Jobke2015-04-281-0/+24
|\ \ | | | | | | Propagate etags across shared storages
| * | propagate etags for all user of a shareRobin Appelman2015-04-271-0/+12
| | |
| * | Allow getting *all* share entries owned by a userRobin Appelman2015-04-271-0/+12
| |/
* / fix several issues with doc blocks on share.phpJoas Schilling2015-04-281-8/+20
|/
* Merge pull request #15729 from owncloud/remove-unused-variablesRobin McCorkell2015-04-191-1/+1
|\ | | | | Remove unused variables
| * Remove unused variablesMorris Jobke2015-04-181-1/+1
| | | | | | | | | | * should make scrutinizer a lot more happy * reduces maybe memory footprint
* | fix followup issues with unneeded parametersMorris Jobke2015-04-181-8/+8
|/
* Add "Reply-To" support to sharing mails and refactor codeLukas Reschke2015-04-101-60/+100
|
* Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_sharesThomas Müller2015-04-091-2/+7
|\ | | | | only create a db entry for the user in case of a name conflict on group share
| * only create a db entry for the user in case of a name conflict on group shareBjoern Schiessle2015-04-091-2/+7
| |
* | Merge pull request #13896 from owncloud/share-generatetarget-remove-excludeBjörn Schießle2015-04-091-17/+2
|\ \ | |/ |/| Dont create exclude list for generating the share target
| * Dont create exclude list for generating the share targetRobin Appelman2015-02-041-17/+2
| |
* | Merge pull request #14987 from rullzer/ocs_password_fix2Morris Jobke2015-04-081-0/+84
|\ \ | | | | | | OCS Fixes to allow setting of password without removing additional settings
| * | No injectionsRoeland Jago Douma2015-03-301-3/+7
| | |
| * | OCS Fixes to allow setting of password without removing additional settingsRoeland Jago Douma2015-03-301-0/+80
| | | | | | | | | | | | | | | | | | - Added setPassword to share.php - Fixed OCS API call - Added unit tests
* | | remove unencrypted_size from the cache, size will contain the unencrypted sizeBjoern Schiessle2015-04-071-1/+1
|/ /
* | Merge pull request #15155 from owncloud/share-donotreturntrashedfilesMorris Jobke2015-03-271-11/+48
|\ \ | | | | | | Do not return shares for files outside "files"
| * | Do not return shares for files outside "files"Vincent Petry2015-03-271-11/+48
| | |
* | | Merge pull request #13938 from owncloud/deprecate-iappconfigThomas Müller2015-03-271-3/+5
|\ \ \ | | | | | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfig
| * | | migrate share helper method to IConfigMorris Jobke2015-03-181-3/+5
| | | |
* | | | also call generateTarget for group share to add the correct prefix if ↵Bjoern Schiessle2015-03-261-4/+5
| |/ / |/| | | | | | | | share_folder is defined in config.php
* | | Update license headersJenkins for ownCloud2015-03-266-71/+116
| | |
* | | When the expiration date is enforced respect thisRoeland Jago Douma2015-03-191-1/+9
|/ / | | | | | | | | Make sure that we do not allow removing of the expiration date when this is enforced in the settings.
* | Merge pull request #13839 from ↵Morris Jobke2015-03-112-1/+31
|\ \ | | | | | | | | | | | | owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown Better finding the remote URL from user input in share dropdown
| * | Extract the remote host from user input in share dropdownJoas Schilling2015-02-232-1/+31
| |/ | | | | | | Fix #13678
* | Revert "Updating license headers"Morris Jobke2015-02-266-111/+76
| | | | | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36.
* | Updating license headersJenkins for ownCloud2015-02-236-76/+111
| |
* | Merge pull request #13979 from ↵Vincent Petry2015-02-111-5/+5
|\ \ | | | | | | | | | | | | owncloud/group-share-collition-wrong-type-in-post-hook Do not overwrite the shareType so the post hook is still correct
| * | Do not overwrite the shareType so the post hook is still correctJoas Schilling2015-02-091-5/+5
| |/
* / for password protected link shares the password is stored in shareWith, so ↵Bjoern Schiessle2015-02-051-2/+9
|/ | | | we need to set this manually to null for the hooks
* Merge pull request #13760 from owncloud/create_enc_key_for_remote_sharesMorris Jobke2015-01-291-9/+27
|\ | | | | make sure that we always create a public share key for remote shares