Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | Allow specifing the signing path | Lukas Reschke | 2016-02-03 | 2 | -10/+21 |
| | | |||||
* | | Also add type (file/folder) to IShare object | Roeland Jago Douma | 2016-02-04 | 1 | -0/+80 |
| | | | | | | | | We need this for the hooks :( | ||||
* | | Unit test for delete lazy shares | Roeland Jago Douma | 2016-02-04 | 1 | -0/+33 |
| | | |||||
* | | Add unit tests | Roeland Jago Douma | 2016-02-04 | 1 | -0/+79 |
| | | |||||
* | | Make the share object lazy | Roeland Jago Douma | 2016-02-04 | 2 | -49/+50 |
| | | | | | | | | | | 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 | 2 | -32/+32 |
|\ \ | | | | | | | types shall always be plural | ||||
| * | | types shall always be plural | Arthur Schiwon | 2016-02-03 | 2 | -32/+32 |
| |/ | |||||
* | | Merge pull request #22101 from owncloud/comments-filerow | Thomas Müller | 2016-02-03 | 1 | -1/+2 |
|\ \ | | | | | | | Add file row indicator for unread comments | ||||
| * | | Reset comments read marker after loading comments | Vincent Petry | 2016-02-03 | 1 | -0/+1 |
| | | | |||||
| * | | Add file row indicator for unread comments | Vincent Petry | 2016-02-03 | 1 | -1/+1 |
| | | | |||||
* | | | [Share 2.0] Fix shareManager | Roeland Jago Douma | 2016-02-03 | 1 | -170/+176 |
| | | | |||||
* | | | [Share 2.0] Fix defaultshare provider | Roeland Jago Douma | 2016-02-03 | 1 | -229/+112 |
| |/ |/| | |||||
* | | Merge pull request #22098 from owncloud/cleanup-core-apps | Thomas Müller | 2016-02-03 | 1 | -3/+3 |
|\ \ | | | | | | | Cleanup core apps | ||||
| * | | Make sure tests don't leave a stray directory behind | Joas Schilling | 2016-02-03 | 1 | -3/+3 |
| |/ | |||||
* | | Merge pull request #22070 from owncloud/share2_exceptions | Thomas Müller | 2016-02-03 | 2 | -6/+6 |
|\ \ | |/ |/| | Add sharing exceptions to OCP | ||||
| * | [Share 2.0] Use GenericShareException | Roeland Jago Douma | 2016-02-02 | 1 | -3/+3 |
| | | |||||
| * | [Share 2.0] Add exceptions to OCP | Roeland Jago Douma | 2016-02-02 | 2 | -3/+3 |
| | | |||||
* | | Added JS unit tests for comments | Vincent Petry | 2016-02-02 | 1 | -0/+12 |
| | | |||||
* | | Merge pull request #22054 from vincchan/vincchan/fix#20199 | Thomas Müller | 2016-02-02 | 1 | -5/+0 |
|\ \ | |/ |/| | Move data protection check to javascript | ||||
| * | Move data protection check to javascript | Vincent Chan | 2016-02-01 | 1 | -5/+0 |
| | | | | | | | | fixes #20199 | ||||
* | | Merge pull request #22013 from owncloud/share2_moveshare | Thomas Müller | 2016-02-02 | 2 | -0/+142 |
|\ \ | | | | | | | [Share 2.0] Allow moving of shares | ||||
| * | | [Share 2.0] Allow moving of shares | Roeland Jago Douma | 2016-02-02 | 2 | -0/+142 |
| | | | | | | | | | | | | | | | * 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 | 2 | -9/+35 |
|\ \ \ | | | | | | | | | Issue 22041 activities for systemtags | ||||
| * | | | Dispatch events when tags are added/updated/deleted | Joas Schilling | 2016-02-02 | 1 | -1/+14 |
| | | | | |||||
| * | | | Dispatch some events when tags are un-/assigned | Joas Schilling | 2016-02-02 | 2 | -8/+21 |
| | | | | |||||
* | | | | Merge pull request #22057 from owncloud/share2_update_hash | Thomas Müller | 2016-02-02 | 1 | -0/+21 |
|\ \ \ \ | | | | | | | | | | | 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 | -0/+21 |
| |/ / / | | | | | | | | | | | | | 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 | -114/+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 | -114/+0 |
| |/ / | | | | | | | | | | the dav app | ||||
* / / | [Share 2.0] Allow recipient to be passed in to getShareById | Roeland Jago Douma | 2016-02-02 | 1 | -0/+38 |
|/ / | | | | | | | | | * 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 #21967 from owncloud/comments-webdav | Thomas Müller | 2016-02-01 | 2 | -1/+78 |
|\ \ | |/ |/| | Comments WebDAV adjustements | ||||
| * | introduce comments read marke tables, comes with user cleanup after deletion | Arthur Schiwon | 2016-01-29 | 2 | -2/+59 |
| | | |||||
| * | Comments WebDAV adjustements | Arthur Schiwon | 2016-01-29 | 2 | -1/+21 |
| | | |||||
* | | Merge pull request #22028 from owncloud/share_hook_expirationdate | Thomas Müller | 2016-02-01 | 1 | -19/+111 |
|\ \ | | | | | | | Share hook expirationdate | ||||
| * | | Add Unit tests | Roeland Jago Douma | 2016-01-30 | 1 | -19/+111 |
| | | | |||||
* | | | Merge pull request #21989 from owncloud/make-csp-modifiable | Thomas Müller | 2016-02-01 | 5 | -19/+533 |
|\ \ \ | | | | | | | | | 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 | -19/+533 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -3/+75 |
|\ \ \ \ | |_|/ / |/| | | | 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 | 1 | -3/+75 |
| | |/ | |/| | | | | | | | | | | | | | 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 | -2/+33 |
|\ \ \ | |/ / |/| | | Add fallback moveFromCache implementation | ||||
| * | | Add fallback moveFromCache implementation | Robin Appelman | 2016-01-29 | 2 | -2/+33 |
| | | | |||||
* | | | [Share 2.0] When deleting a group share delete children | Roeland Jago Douma | 2016-01-28 | 1 | -56/+58 |
| |/ |/| | | | | | | | | | 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. | ||||
* | | Merge pull request #21858 from owncloud/getMountsForFileId | Thomas Müller | 2016-01-28 | 1 | -7/+125 |
|\ \ | | | | | | | add IUserMountCache->getMountsForFileId | ||||
| * | | Fix failing oracle and postgres tests | Joas Schilling | 2016-01-27 | 1 | -2/+2 |
| | | | |||||
| * | | add IUserMountCache->getMountsForFileId | Robin Appelman | 2016-01-27 | 1 | -7/+125 |
| |/ | |||||
* | | [Share 2.0] Fix interfaces and comments | Roeland Jago Douma | 2016-01-28 | 2 | -73/+73 |
| | | | | | | | | | | | | | | | | * Made comments more clear * Removed unneeded methods * IShares shareTime is now a proper DateTime object * IShares getPath -> getNode & setPath -> setNode * Fix unit tests | ||||
* | | [Share 2.0] Add getShareManager to OCP\IServerContainer | Roeland Jago Douma | 2016-01-27 | 1 | -0/+2 |
| | | |||||
* | | [Share 2.0] Move IShare to OCP | Roeland Jago Douma | 2016-01-27 | 2 | -24/+26 |
| | | |||||
* | | [Share 2.0] Fix IShare | Roeland Jago Douma | 2016-01-27 | 1 | -3/+3 |
| | |