Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions | Morris Jobke | 2015-07-08 | 1 | -10/+28 |
|\ | | | | | Fix the path for users which have an exception for a group share | ||||
| * | Make sure the owner always has the right path | Joas Schilling | 2015-07-07 | 1 | -3/+6 |
| | | |||||
| * | Fix the path for users which have an exception for a group share | Joas Schilling | 2015-07-02 | 1 | -7/+22 |
| | | |||||
* | | Remove OC_Appconfig | Thomas Müller | 2015-07-03 | 1 | -5/+5 |
| | | |||||
* | | Remove OC_Log | Thomas Müller | 2015-07-03 | 1 | -35/+35 |
| | | |||||
* | | owner is stored as 'uid_owner', not as 'owner' in the oc_share table | Bjoern Schiessle | 2015-07-02 | 1 | -2/+2 |
|/ | |||||
* | if it is a mount point we need to get the path from the mount manager | Bjoern Schiessle | 2015-06-30 | 1 | -3/+19 |
| | |||||
* | Merge pull request #17163 from owncloud/update-licenses | Lukas Reschke | 2015-06-27 | 2 | -1/+2 |
|\ | | | | | Update license headers | ||||
| * | update license headers and authors | Morris Jobke | 2015-06-25 | 2 | -1/+2 |
| | | |||||
* | | Merge pull request #17071 from owncloud/share-get-users-non-existing | Vincent Petry | 2015-06-26 | 1 | -2/+2 |
|\ \ | | | | | | | fix getUsersSharingFile with locking | ||||
| * | | fix getUsersSharingFile with locking | Robin Appelman | 2015-06-26 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #17008 from owncloud/fix-17006 | Björn Schießle | 2015-06-26 | 2 | -23/+69 |
|\ \ \ | |/ / |/| | | Improve splitting of username and remote adress when username contains an `@` | ||||
| * | | Use \OC\HintException and translate the hint | Joas Schilling | 2015-06-22 | 3 | -34/+9 |
| | | | |||||
| * | | Merge spliteUserRemote with fixRemoteUrlInShareWith | Joas Schilling | 2015-06-22 | 2 | -25/+44 |
| | | | |||||
| * | | make sure that we split username and server address at the first '@' from ↵ | Bjoern Schiessle | 2015-06-22 | 3 | -1/+53 |
| | | | | | | | | | | | | the right to allow usernames containing '@' | ||||
* | | | Merge pull request #17165 from ↵ | Thomas Müller | 2015-06-26 | 1 | -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 set | Bjoern Schiessle | 2015-06-25 | 1 | -1/+1 |
| | | | |||||
| * | | show nice display name for remote shares if possible | Bjoern Schiessle | 2015-06-25 | 1 | -2/+11 |
| |/ | |||||
* / | set NULL correctly in password update | Roeland Jago Douma | 2015-06-24 | 1 | -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 folder | Joas Schilling | 2015-05-06 | 1 | -0/+5 |
| | |||||
* | Merge pull request #15772 from ↵ | Joas Schilling | 2015-05-04 | 1 | -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-source | Joas Schilling | 2015-04-29 | 1 | -0/+2 |
| | | |||||
| * | Correctly select file cache values also when checking group shares | Joas Schilling | 2015-04-29 | 1 | -7/+7 |
| | | |||||
* | | Use internally \OCP\ILogger instead of \OC\Log | Morris Jobke | 2015-04-30 | 1 | -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/15589 | Morris Jobke | 2015-04-29 | 1 | -6/+9 |
|\ \ | | | | | | | Correctly generate the feedback URL for remote share | ||||
| * | | Fix scrutinizer complains and return type doc | Joas Schilling | 2015-04-28 | 1 | -4/+6 |
| | | | |||||
| * | | Correctly remove the protocol before prepeding it | Joas Schilling | 2015-04-28 | 1 | -0/+1 |
| | | | |||||
| * | | Correctly generate the feedback URL for remote share | Joas Schilling | 2015-04-28 | 1 | -2/+2 |
| |/ | | | | | | | | | The trailing slash was added in c78e3c4a7fa1d2f474ab58551e67a50e093f6ed8 to correctly generate the encryption keys | ||||
* | | Merge pull request #15906 from rullzer/fix_15777 | Morris Jobke | 2015-04-29 | 1 | -1/+1 |
|\ \ | |/ |/| | Password set via OCS API should not be double escaped | ||||
| * | Password set via OCS API should not be double escaped | Roeland Jago Douma | 2015-04-28 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #14764 from owncloud/shared-etag-propagate | Morris Jobke | 2015-04-28 | 1 | -0/+24 |
|\ \ | | | | | | | Propagate etags across shared storages | ||||
| * | | propagate etags for all user of a share | Robin Appelman | 2015-04-27 | 1 | -0/+12 |
| | | | |||||
| * | | Allow getting *all* share entries owned by a user | Robin Appelman | 2015-04-27 | 1 | -0/+12 |
| |/ | |||||
* / | fix several issues with doc blocks on share.php | Joas Schilling | 2015-04-28 | 1 | -8/+20 |
|/ | |||||
* | Merge pull request #15729 from owncloud/remove-unused-variables | Robin McCorkell | 2015-04-19 | 1 | -1/+1 |
|\ | | | | | Remove unused variables | ||||
| * | Remove unused variables | Morris Jobke | 2015-04-18 | 1 | -1/+1 |
| | | | | | | | | | | * should make scrutinizer a lot more happy * reduces maybe memory footprint | ||||
* | | fix followup issues with unneeded parameters | Morris Jobke | 2015-04-18 | 1 | -8/+8 |
|/ | |||||
* | Add "Reply-To" support to sharing mails and refactor code | Lukas Reschke | 2015-04-10 | 1 | -60/+100 |
| | |||||
* | Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares | Thomas Müller | 2015-04-09 | 1 | -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 share | Bjoern Schiessle | 2015-04-09 | 1 | -2/+7 |
| | | |||||
* | | Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude | Björn Schießle | 2015-04-09 | 1 | -17/+2 |
|\ \ | |/ |/| | Dont create exclude list for generating the share target | ||||
| * | Dont create exclude list for generating the share target | Robin Appelman | 2015-02-04 | 1 | -17/+2 |
| | | |||||
* | | Merge pull request #14987 from rullzer/ocs_password_fix2 | Morris Jobke | 2015-04-08 | 1 | -0/+84 |
|\ \ | | | | | | | OCS Fixes to allow setting of password without removing additional settings | ||||
| * | | No injections | Roeland Jago Douma | 2015-03-30 | 1 | -3/+7 |
| | | | |||||
| * | | OCS Fixes to allow setting of password without removing additional settings | Roeland Jago Douma | 2015-03-30 | 1 | -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 size | Bjoern Schiessle | 2015-04-07 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #15155 from owncloud/share-donotreturntrashedfiles | Morris Jobke | 2015-03-27 | 1 | -11/+48 |
|\ \ | | | | | | | Do not return shares for files outside "files" | ||||
| * | | Do not return shares for files outside "files" | Vincent Petry | 2015-03-27 | 1 | -11/+48 |
| | | | |||||
* | | | Merge pull request #13938 from owncloud/deprecate-iappconfig | Thomas Müller | 2015-03-27 | 1 | -3/+5 |
|\ \ \ | | | | | | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfig | ||||
| * | | | migrate share helper method to IConfig | Morris Jobke | 2015-03-18 | 1 | -3/+5 |
| | | | |