Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove unused Storage->getLocalFolder | Robin Appelman | 2016-02-05 | 6 | -58/+0 |
| | |||||
* | Merge pull request #22143 from owncloud/fix_12385 | Thomas Müller | 2016-02-05 | 1 | -1/+1 |
|\ | | | | | When a user is removed we should remove the right shares | ||||
| * | When a user is removed we should remove the right shares | Roeland Jago Douma | 2016-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This means all the shares directly shared with them * Or all group shares having a special share with them This patch fixes the operator precedece (AND before OR). So before this patch: (share_with = <deleted user> AND share_type = 0) OR share_type=2 So it deleted all user specific shares Now: share_with = <deleted user> AND (share_type = 0 OR (share_type=2) | ||||
* | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2016-02-05 | 7 | -11/+13 |
|/ | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | Path should be relative | Roeland Jago Douma | 2016-02-04 | 1 | -1/+3 |
| | |||||
* | [Share 2.0] Add missing post_update_permissions hook | Roeland Jago Douma | 2016-02-04 | 2 | -0/+14 |
| | |||||
* | Merge pull request #21766 from farukuzun/master | Thomas Müller | 2016-02-04 | 1 | -0/+17 |
|\ | | | | | Add some mimetypes | ||||
| * | Introduce some mimetypes for richdocuments | Faruk Uzun | 2016-02-04 | 1 | -0/+17 |
| | | | | | | | | | | | | | | * application/vnd.lotus-wordpro * application/vnd.visio * application/vnd.wordperfect * application/msonenote | ||||
* | | Merge pull request #22111 from owncloud/use-intermediate-certificate | Thomas Müller | 2016-02-04 | 2 | -10/+21 |
|\ \ | | | | | | | Use intermediate root authority + sign other release channels | ||||
| * | | Also check daily and testing channel | Lukas Reschke | 2016-02-03 | 1 | -0/+2 |
| | | | |||||
| * | | Allow specifing the signing path | Lukas Reschke | 2016-02-03 | 2 | -10/+19 |
| | | | |||||
* | | | Also add type (file/folder) to IShare object | Roeland Jago Douma | 2016-02-04 | 4 | -3/+67 |
| | | | | | | | | | | | | We need this for the hooks :( | ||||
* | | | Make the share object lazy | Roeland Jago Douma | 2016-02-04 | 5 | -25/+66 |
| |/ |/| | | | | | | | Share providers can now just pass in a fileId. And the node will only be created once needed. | ||||
* | | Merge pull request #22110 from owncloud/comment-types-always-plural | Thomas Müller | 2016-02-04 | 5 | -13/+13 |
|\ \ | | | | | | | types shall always be plural | ||||
| * | | types shall always be plural | Arthur Schiwon | 2016-02-03 | 5 | -13/+13 |
| |/ | |||||
* | | Merge pull request #22072 from vincchan/trim-newusername-whitespace | Thomas Müller | 2016-02-04 | 1 | -0/+4 |
|\ \ | | | | | | | Do not allow username to have whitespace at the beginning or at the end | ||||
| * | | move whitspace check to user manager | Vincent Chan | 2016-02-03 | 1 | -0/+4 |
| | | | |||||
* | | | [Share 2.0] Fix shareManager | Roeland Jago Douma | 2016-02-03 | 3 | -63/+78 |
| | | | |||||
* | | | [Share 2.0] Fix defaultshare provider | Roeland Jago Douma | 2016-02-03 | 2 | -78/+57 |
| | | | |||||
* | | | [Share 2.0] Use strings for ids | Roeland Jago Douma | 2016-02-03 | 3 | -17/+26 |
| |/ |/| | | | | | | | | | | | | | | | | | | | * sharedWith * sharedBy * shareOwner Now all set/get strings with the id. (userId, groupId, federatedsharerId). This to avoid a huge amount of if statements | ||||
* | | Merge pull request #22071 from owncloud/cache-split-insert | Thomas Müller | 2016-02-03 | 4 | -44/+90 |
|\ \ | | | | | | | split cache->insert from cache->put | ||||
| * | | split cache->insert from cache->put | Robin Appelman | 2016-02-03 | 4 | -44/+90 |
| | | | |||||
* | | | Merge pull request #22070 from owncloud/share2_exceptions | Thomas Müller | 2016-02-03 | 4 | -14/+50 |
|\ \ \ | | | | | | | | | Add sharing exceptions to OCP | ||||
| * | | | [Share 2.0] Use GenericShareException | Roeland Jago Douma | 2016-02-02 | 1 | -10/+11 |
| | | | | |||||
| * | | | [Share 2.0] Add exceptions to OCP | Roeland Jago Douma | 2016-02-02 | 4 | -4/+39 |
| | | | | |||||
* | | | | Merge pull request #21997 from owncloud/checksums | Thomas Müller | 2016-02-03 | 5 | -7/+36 |
|\ \ \ \ | | | | | | | | | | | Checksums | ||||
| * | | | | Add store/retrieve checksums | Roeland Jago Douma | 2016-02-03 | 5 | -7/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add extra db column to filecache * Bump version * Update filecache code to actually handle checksum * Webdav code to store/retrieve checksums | ||||
* | | | | | Merge pull request #22081 from owncloud/mount-cache-invalid-storage | Thomas Müller | 2016-02-03 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | filter invalid storages from the mount cache early | ||||
| * | | | | filter invalid storages from the mount cache early | Robin Appelman | 2016-02-02 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #22059 from owncloud/comments-readmark-dav | Thomas Müller | 2016-02-03 | 1 | -1/+7 |
|\ \ \ \ | |/ / / |/| | | | Comments DAV methods for read mark manipulation (mark comments of a file as read) + return isUnread status | ||||
| * | | | update routine was lacking where statements :see_no_evil: | Arthur Schiwon | 2016-02-02 | 1 | -1/+7 |
| | | | | |||||
* | | | | Merge pull request #22013 from owncloud/share2_moveshare | Thomas Müller | 2016-02-02 | 4 | -3/+107 |
|\ \ \ \ | |_|/ / |/| | | | [Share 2.0] Allow moving of shares | ||||
| * | | | [Share 2.0] Allow moving of shares | Roeland Jago Douma | 2016-02-02 | 4 | -3/+107 |
| | | | | | | | | | | | | | | | | | | | | * Only recipient can move a share * Unit tests | ||||
* | | | | Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtags | Thomas Müller | 2016-02-02 | 7 | -32/+279 |
|\ \ \ \ | | | | | | | | | | | Issue 22041 activities for systemtags | ||||
| * | | | | Fix IManager::isFormattingFilteredObject() | Joas Schilling | 2016-02-02 | 1 | -5/+4 |
| | | | | | |||||
| * | | | | Add activities when a tag is (un-)assigned | Joas Schilling | 2016-02-02 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Dispatch events when tags are added/updated/deleted | Joas Schilling | 2016-02-02 | 3 | -13/+147 |
| | | | | | |||||
| * | | | | Dispatch some events when tags are un-/assigned | Joas Schilling | 2016-02-02 | 3 | -14/+124 |
| | | | | | |||||
* | | | | | Merge pull request #22057 from owncloud/share2_update_hash | Thomas Müller | 2016-02-02 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Update old password hashed for link shares on access | ||||
| * | | | | | Update old password hashed for link shares on access | Roeland Jago Douma | 2016-02-01 | 1 | -1/+3 |
| | |_|/ / | |/| | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16594 | ||||
* | | | | | Merge pull request #21988 from owncloud/allow-search-in-synced-addressbooks | Thomas Müller | 2016-02-02 | 2 | -127/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Allow search in synced addressbooks | ||||
| * | | | | The local address book is replaced now by the system addressbook as part of ↵ | Thomas Müller | 2016-02-02 | 2 | -127/+0 |
| | |_|/ | |/| | | | | | | | | | | the dav app | ||||
* | | | | getChildren should not return usergroup shares | Roeland Jago Douma | 2016-02-02 | 2 | -6/+7 |
| | | | | |||||
* | | | | [Share 2.0] Allow recipient to be passed in to getShareById | Roeland Jago Douma | 2016-02-02 | 4 | -24/+24 |
|/ / / | | | | | | | | | | | | | * This allows us to retrieve usergroup shares for a given id. If the user deleted a share or moved it this will be a different share | ||||
* | | | Merge pull request #20903 from owncloud/sharing-mount-option | Thomas Müller | 2016-02-02 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | Add mount option to disable sharing | ||||
| * | | | Add mount option to disable sharing | Robin Appelman | 2016-01-29 | 1 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #22015 from owncloud/share-no-permissions | Thomas Müller | 2016-02-02 | 1 | -2/+3 |
|\ \ \ \ | |_|_|/ |/| | | | Block shares that dont have the correct source permissions | ||||
| * | | | Block shares that dont have the correct source permissions | Robin Appelman | 2016-01-29 | 1 | -2/+3 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-02 | 2 | -0/+2 |
| |_|/ |/| | | |||||
* | | | Merge pull request #21967 from owncloud/comments-webdav | Thomas Müller | 2016-02-01 | 4 | -4/+187 |
|\ \ \ | | | | | | | | | Comments WebDAV adjustements |