Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | fix performance issues | Bjoern Schiessle | 2014-10-10 | 1 | -18/+56 |
| | |||||
* | some small fixed, suggested by scrutinizer | Bjoern Schiessle | 2014-09-29 | 3 | -6/+5 |
| | |||||
* | on unshare only unshare childrens if there is no other parent available | Bjoern Schiessle | 2014-09-26 | 2 | -15/+63 |
| | |||||
* | only create a new share entry, if the user needs a different target name ↵ | Bjoern Schiessle | 2014-09-26 | 1 | -1/+1 |
| | | | | than the group share | ||||
* | for group shares we don't need a extra db entry of groupTarget equals itemTarget | Bjoern Schiessle | 2014-09-26 | 1 | -3/+3 |
| | |||||
* | for group shares only the parent has the up-to-date permission. Make sure ↵ | Bjoern Schiessle | 2014-09-26 | 1 | -1/+12 |
| | | | | 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 | ||||
* | call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all ↵ | Bjoern Schiessle | 2014-09-25 | 1 | -29/+5 |
| | | | | checks are executed, e.g. to check if the share is really visible | ||||
* | always select permissions, used in getItems() | Bjoern Schiessle | 2014-09-25 | 1 | -2/+3 |
| | |||||
* | some small fixes | Bjoern Schiessle | 2014-09-25 | 1 | -6/+1 |
| | |||||
* | only add a new row if it isn't a unique share, otherwise update the existing row | Bjoern Schiessle | 2014-09-24 | 1 | -1/+1 |
| | |||||
* | fix add user to group to work with grouped shares | Bjoern Schiessle | 2014-09-24 | 1 | -10/+18 |
| | |||||
* | generateTarget() will always find a unique target | Bjoern Schiessle | 2014-09-24 | 2 | -96/+80 |
| | |||||
* | unit tests for grouping of shares pointing to the same source | Bjoern Schiessle | 2014-09-22 | 1 | -1/+1 |
| | |||||
* | group shares and combine permissions | Bjoern Schiessle | 2014-09-22 | 1 | -237/+249 |
| | |||||
* | Merge pull request #10858 from owncloud/issue/10847 | VicDeo | 2014-09-09 | 1 | -1/+1 |
|\ | | | | | Use correct language package so the subject is correctly translated | ||||
| * | Use correct language package so the subject is correctly translated | Joas Schilling | 2014-09-04 | 1 | -1/+1 |
| | | | | | | | | Fix #10847 | ||||
* | | Readd TOKEN_LENGTH | kondou | 2014-09-04 | 2 | -1/+3 |
| | | |||||
* | | Use base62 and remove configuration options for link length | kondou | 2014-09-04 | 1 | -7/+2 |
| | | |||||
* | | Change config.sample entry and use MediumSecurity | kondou | 2014-09-04 | 1 | -1/+1 |
| | | |||||
* | | Adapt token size to new generation and add an option for free length ↵ | kondou | 2014-09-04 | 1 | -16/+5 |
| | | | | | | | | | | | | specification Minimum size is 3 = 46656 tokens, maximum size is 64, which is what our DB allows. | ||||
* | | Use a route instead of s.php and convert tokens asap | kondou | 2014-09-04 | 2 | -3/+20 |
| | |