Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | types shall always be plural | Arthur Schiwon | 2016-02-03 | 3 | -6/+6 |
| | |||||
* | Merge pull request #22071 from owncloud/cache-split-insert | Thomas Müller | 2016-02-03 | 3 | -44/+77 |
|\ | | | | | split cache->insert from cache->put | ||||
| * | split cache->insert from cache->put | Robin Appelman | 2016-02-03 | 3 | -44/+77 |
| | | |||||
* | | Merge pull request #22070 from owncloud/share2_exceptions | Thomas Müller | 2016-02-03 | 3 | -37/+13 |
|\ \ | | | | | | | 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 | 3 | -27/+2 |
| | | | |||||
* | | | Merge pull request #21997 from owncloud/checksums | Thomas Müller | 2016-02-03 | 4 | -7/+28 |
|\ \ \ | | | | | | | | | Checksums | ||||
| * | | | Add store/retrieve checksums | Roeland Jago Douma | 2016-02-03 | 4 | -7/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 2 | -0/+77 |
|\ \ \ | |_|/ |/| | | [Share 2.0] Allow moving of shares | ||||
| * | | [Share 2.0] Allow moving of shares | Roeland Jago Douma | 2016-02-02 | 2 | -0/+77 |
| | | | | | | | | | | | | | | | * 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 | 5 | -32/+101 |
|\ \ \ | | | | | | | | | 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 | 2 | -13/+62 |
| | | | | |||||
| * | | | Dispatch some events when tags are un-/assigned | Joas Schilling | 2016-02-02 | 2 | -14/+31 |
| | |/ | |/| | |||||
* | | | 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 | 1 | -118/+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 | 1 | -118/+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 | 2 | -20/+15 |
|/ / | | | | | | | | | * 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 |
| | | | |||||
* | | | Merge pull request #21967 from owncloud/comments-webdav | Thomas Müller | 2016-02-01 | 3 | -3/+140 |
|\ \ \ | | | | | | | | | Comments WebDAV adjustements | ||||
| * | | | introduce comments read marke tables, comes with user cleanup after deletion | Arthur Schiwon | 2016-01-29 | 2 | -11/+91 |
| | | | | |||||
| * | | | Comments WebDAV adjustements | Arthur Schiwon | 2016-01-29 | 2 | -3/+60 |
| | |/ | |/| | |||||
* | | | Merge pull request #22028 from owncloud/share_hook_expirationdate | Thomas Müller | 2016-02-01 | 1 | -9/+23 |
|\ \ \ | | | | | | | | | Share hook expirationdate | ||||
| * | | | Emit hook for expirationDate verification | Roeland Jago Douma | 2016-01-30 | 1 | -9/+23 |
| | | | | |||||
* | | | | Merge pull request #21953 from owncloud/make-enable_avatars-more-robust | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Make enable_avatars setting more robust | ||||
| * | | | | Make enable_avatars setting more robust | Morris Jobke | 2016-01-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * handles the setting in the same way everywhere * fixes #21949 | ||||
* | | | | | Merge pull request #21989 from owncloud/make-csp-modifiable | Thomas Müller | 2016-02-01 | 5 | -6/+325 |
|\ \ \ \ \ | | | | | | | | | | | | | Add public API to give developers the possibility to adjust the global CSP defaults | ||||
| * | | | | | Add public API to give developers the possibility to adjust the global CSP ↵ | Lukas Reschke | 2016-01-28 | 5 | -6/+325 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defaults Allows to inject something into the default content policy. This is for example useful when you're injecting Javascript code into a view belonging to another controller and cannot modify its Content-Security-Policy itself. Note that the adjustment is only applied to applications that use AppFramework controllers. To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`, $policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`. To test this add something like the following into an `app.php` of any enabled app: ``` $manager = \OC::$server->getContentSecurityPolicyManager(); $policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false); $policy->addAllowedFrameDomain('asdf'); $policy->addAllowedScriptDomain('yolo.com'); $policy->allowInlineScript(false); $manager->addDefaultPolicy($policy); $policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false); $policy->addAllowedFontDomain('yolo.com'); $manager->addDefaultPolicy($policy); $policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false); $policy->addAllowedFrameDomain('banana.com'); $manager->addDefaultPolicy($policy); ``` If you now open the files app the policy should be: ``` Content-Security-Policy:default-src 'none';script-src yolo.com 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src yolo.com 'self';connect-src 'self';media-src 'self';frame-src asdf banana.com 'self' ``` | ||||
* | | | | | Merge pull request #22022 from owncloud/share_ocs_filter_path_sharedwithme | Thomas Müller | 2016-02-01 | 2 | -19/+17 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add path filter to OCS Share API shared_with_me=true | ||||
| * | | | | Add path filter to OCS Share API ?shared_with_me=true | Roeland Jago Douma | 2016-01-29 | 2 | -19/+17 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | This allows all clients to quickly get the share info for a given path. Instead of returning everything and filtering it then manually on the client side. | ||||
* | | | | Merge pull request #21956 from owncloud/cross-cache-move | Thomas Müller | 2016-01-29 | 2 | -30/+124 |
|\ \ \ \ | |/ / / |/| | | | Add fallback moveFromCache implementation | ||||
| * | | | Add fallback moveFromCache implementation | Robin Appelman | 2016-01-29 | 2 | -30/+124 |
| | |/ | |/| | |||||
* | | | Merge pull request #21995 from owncloud/share2_delete_user_defined_group_shares | Thomas Müller | 2016-01-29 | 1 | -9/+9 |
|\ \ \ | | | | | | | | | [Share 2.0] When deleting a group share delete children | ||||
| * | | | [Share 2.0] When deleting a group share delete children | Roeland Jago Douma | 2016-01-28 | 1 | -9/+9 |
| | |/ | |/| | | | | | | | | | | | | | For group shares we can have children. Those are custom shares when a user has moved or deleted a group share. Those also have to be deleted if the group share is removed. | ||||
* / | | Deprecate the method and warn against using it | Joas Schilling | 2016-01-28 | 1 | -0/+2 |
|/ / | |||||
* | | fix cachejail->update | Robin Appelman | 2016-01-28 | 1 | -1/+1 |
| | | |||||
* | | cleanup shared cache | Robin Appelman | 2016-01-28 | 3 | -4/+9 |
| | | |||||
* | | Merge pull request #21858 from owncloud/getMountsForFileId | Thomas Müller | 2016-01-28 | 1 | -6/+65 |
|\ \ | | | | | | | add IUserMountCache->getMountsForFileId | ||||
| * | | Use new constants | Joas Schilling | 2016-01-27 | 1 | -7/+8 |
| | | | |||||
| * | | add IUserMountCache->getMountsForFileId | Robin Appelman | 2016-01-27 | 1 | -0/+58 |
| |/ |