| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | | | |||||
| * | | | | also call generateTarget for group share to add the correct prefix if ↵ | Bjoern Schiessle | 2015-03-26 | 1 | -4/+5 |
| | |/ / |/| | | | | | | | | share_folder is defined in config.php | ||||
| * | | | Update license headers | Jenkins for ownCloud | 2015-03-26 | 6 | -71/+116 |
| | | | | |||||
| * | | | When the expiration date is enforced respect this | Roeland Jago Douma | 2015-03-19 | 1 | -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 Jobke | 2015-03-11 | 2 | -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 dropdown | Joas Schilling | 2015-02-23 | 2 | -1/+31 |
| | |/ | | | | | | | Fix #13678 | ||||
| * | | Revert "Updating license headers" | Morris Jobke | 2015-02-26 | 6 | -111/+76 |
| | | | | | | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36. | ||||
| * | | Updating license headers | Jenkins for ownCloud | 2015-02-23 | 6 | -76/+111 |
| | | | |||||
| * | | Merge pull request #13979 from ↵ | Vincent Petry | 2015-02-11 | 1 | -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 correct | Joas Schilling | 2015-02-09 | 1 | -5/+5 |
| | |/ | |||||
| * / | for password protected link shares the password is stored in shareWith, so ↵ | Bjoern Schiessle | 2015-02-05 | 1 | -2/+9 |
| |/ | | | | we need to set this manually to null for the hooks | ||||
| * | Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares | Morris Jobke | 2015-01-29 | 1 | -9/+27 |
| |\ | | | | | make sure that we always create a public share key for remote shares | ||||
| | * | make sure that we always create a public share key for remote shares | Bjoern Schiessle | 2015-01-29 | 1 | -9/+27 |
| | | | |||||
| * | | remove trailing slash | Bjoern Schiessle | 2015-01-29 | 1 | -0/+1 |
| |/ | |||||
| * | Do not retrieve shares through group if user has no group | Vincent Petry | 2015-01-23 | 1 | -20/+22 |
| | | |||||
| * | Fix reshare permission change to not impair other deletion code | Vincent Petry | 2015-01-22 | 2 | -9/+21 |
| | | | | | | | | | | | | | | | 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. | ||||
| * | Fix getItemSharedWithUser for groups | Vincent Petry | 2015-01-16 | 1 | -9/+18 |
| | | | | | | | 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. | ||||
| * | don't delete share table entries for the unique name if re-share permission ↵ | Bjoern Schiessle | 2015-01-07 | 1 | -4/+4 |
| | | | | | was removed | ||||
| * | Next step in server-to-server sharing next generation, see #12285 | Bjoern Schiessle | 2014-12-19 | 3 | -69/+230 |
| | | | | | | | | | | | | | | | 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. | ||||
| * | reduce OC_Preferences, OC_Config and \OCP\Config usage | Morris Jobke | 2014-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | * files_encryption * files_versions * files_trashbin * tests * status.php * core * server container | ||||
| * | OCS API for server-to-server sharing | Bjoern Schiessle | 2014-12-04 | 1 | -3/+4 |
| | | |||||
| * | Merge pull request #12350 from mprokop/link_expiration | Morris Jobke | 2014-11-26 | 1 | -3/+6 |
| |\ | | | | | fix calculation of expiration date if there is a default expiration date... | ||||
| | * | Consolidate if statement, and update unit test | Miguel Prokop | 2014-11-21 | 1 | -4/+2 |
| | | | |||||
| | * | fix calculation of expiration date if there is a default expiration date set ↵ | Miguel Prokop | 2014-11-21 | 1 | -3/+8 |
| | | | | | | | | | (but not forced) and the user does not want the link to expire. | ||||
| * | | Replace deprecated constant with new class constant | Joas Schilling | 2014-11-25 | 1 | -6/+6 |
| | | | |||||
| * | | also check for the correct owner if it was submitted | Bjoern Schiessle | 2014-11-21 | 1 | -5/+10 |
| |/ | |||||
| * | Merge pull request #12226 from owncloud/remove-phpass | Thomas Müller | 2014-11-20 | 1 | -3/+1 |
| |\ | | | | | Remove phpass and migrate to new Hasher interface | ||||
| | * | Remove phpass and migrate to new Hasher interface | Lukas Reschke | 2014-11-17 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | 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. | ||||
| * | | only users can have a display name different from the id | Bjoern Schiessle | 2014-11-18 | 1 | -1/+4 |
| | | | |||||
| * | | make sure that we only find the shares from the correct share type if users ↵ | Bjoern Schiessle | 2014-11-18 | 1 | -2/+8 |
| | | | | | | | | | and groups with the same ID exists | ||||
| * | | make sure that we don't find the wrong shares if a user and a group have the ↵ | Bjoern Schiessle | 2014-11-18 | 1 | -6/+10 |
| |/ | | | | same ID | ||||
| * | Remove unreachable statement | Lukas Reschke | 2014-10-23 | 1 | -1/+0 |
| | | |||||
| * | always use the correct share type | Bjoern Schiessle | 2014-10-22 | 1 | -3/+3 |
| | | |||||
| * | Add option to include tags for shared items. | Bernhard Reiter | 2014-10-14 | 1 | -1/+52 |
| | | |||||
| * | distinguish between file dependent shares and other shares | Bjoern Schiessle | 2014-10-13 | 1 | -2/+3 |
| | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |