Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22013 from owncloud/share2_moveshare | Thomas Müller | 2016-02-02 | 2 | -3/+30 |
|\ | | | | | [Share 2.0] Allow moving of shares | ||||
| * | [Share 2.0] Allow moving of shares | Roeland Jago Douma | 2016-02-02 | 2 | -3/+30 |
| | | | | | | | | | | * 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 | -0/+178 |
|\ \ | |/ |/| | Issue 22041 activities for systemtags | ||||
| * | Dispatch events when tags are added/updated/deleted | Joas Schilling | 2016-02-02 | 1 | -0/+85 |
| | | |||||
| * | Dispatch some events when tags are un-/assigned | Joas Schilling | 2016-02-02 | 1 | -0/+93 |
| | | |||||
* | | [Share 2.0] Allow recipient to be passed in to getShareById | Roeland Jago Douma | 2016-02-02 | 2 | -4/+9 |
|/ | | | | | * 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 | 1 | -1/+47 |
|\ | | | | | Comments WebDAV adjustements | ||||
| * | introduce comments read marke tables, comes with user cleanup after deletion | Arthur Schiwon | 2016-01-29 | 1 | -0/+19 |
| | | |||||
| * | Comments WebDAV adjustements | Arthur Schiwon | 2016-01-29 | 1 | -1/+28 |
| | | |||||
* | | Merge pull request #21989 from owncloud/make-csp-modifiable | Thomas Müller | 2016-02-01 | 5 | -323/+458 |
|\ \ | | | | | | | 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 | -323/+458 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -2/+6 |
|\ \ \ | | | | | | | | | 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 | -2/+6 |
| | |/ | |/| | | | | | | | | | | | | | 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 #22012 from owncloud/storagenotavailableexception-code | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Default to STATUS_ERROR in StorageNotAvailableException | ||||
| * | | | Default to STATUS_ERROR in StorageNotAvailableException | Robin McCorkell | 2016-01-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #21956 from owncloud/cross-cache-move | Thomas Müller | 2016-01-29 | 2 | -1/+5 |
|\ \ \ \ | |_|/ / |/| | | | Add fallback moveFromCache implementation | ||||
| * | | | Add fallback moveFromCache implementation | Robin Appelman | 2016-01-29 | 2 | -1/+5 |
| | | | | |||||
* | | | | Remove other broken usages in deprecated methods | Joas Schilling | 2016-01-29 | 1 | -35/+3 |
| | | | | |||||
* | | | | Deprecate the method and warn against using it | Joas Schilling | 2016-01-28 | 1 | -0/+2 |
| |_|/ |/| | | |||||
* | | | Merge pull request #21858 from owncloud/getMountsForFileId | Thomas Müller | 2016-01-28 | 1 | -0/+15 |
|\ \ \ | | | | | | | | | add IUserMountCache->getMountsForFileId | ||||
| * | | | add IUserMountCache->getMountsForFileId | Robin Appelman | 2016-01-27 | 1 | -0/+15 |
| |/ / | |||||
* | | | [Share 2.0] Remove setId and setProviderId from the interface | Roeland Jago Douma | 2016-01-28 | 1 | -18/+0 |
| | | | | | | | | | | | | Those should only ever be set by the providers | ||||
* | | | [Share 2.0] Fix interfaces and comments | Roeland Jago Douma | 2016-01-28 | 3 | -49/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | * 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/+8 |
| | | | |||||
* | | | [Share 2.0] Create IManger interface for share manager | Roeland Jago Douma | 2016-01-27 | 1 | -0/+210 |
| | | | |||||
* | | | [Share 2.0] Move IShare to OCP | Roeland Jago Douma | 2016-01-27 | 3 | -0/+474 |
| | | | |||||
* | | | clean cache interface | Robin Appelman | 2016-01-27 | 1 | -15/+0 |
|/ / | |||||
* | | Merge pull request #21741 from owncloud/l10n-improvements | Thomas Müller | 2016-01-27 | 1 | -0/+43 |
|\ \ | | | | | | | Move methods to the factory that are not related to translating, but to guessing/finding the language | ||||
| * | | Move finding the language files and creating the function out of the object | Joas Schilling | 2016-01-26 | 1 | -0/+10 |
| | | | |||||
| * | | Move findLanguage() and setLanguageFromRequest() to factory | Joas Schilling | 2016-01-26 | 1 | -0/+16 |
| | | | |||||
| * | | Move languageExists() to the factory | Joas Schilling | 2016-01-26 | 1 | -0/+8 |
| | | | |||||
| * | | Move findAvailableLanguages() to the factory | Joas Schilling | 2016-01-26 | 1 | -0/+9 |
| | | | |||||
* | | | Fix Oracle comparisons | Joas Schilling | 2016-01-26 | 1 | -25/+73 |
| | | | |||||
* | | | Adjust comments to the new constants | Joas Schilling | 2016-01-26 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #21894 from owncloud/refactor-csrf | Thomas Müller | 2016-01-26 | 1 | -3/+13 |
|\ \ | |/ |/| | Add new CSRF manager for unit testing purposes | ||||
| * | Add new CSRF manager for unit testing purposes | Lukas Reschke | 2016-01-25 | 1 | -3/+13 |
| | | | | | | | | This adds a new CSRF manager for unit testing purposes, it's interface is based upon https://github.com/symfony/security-csrf. Due to some of our required custom changes it is however not possible to use the Symfony component directly. | ||||
* | | Merge pull request #21892 from owncloud/issue-21890-parameters | Thomas Müller | 2016-01-25 | 1 | -0/+39 |
|\ \ | | | | | | | Add parameters types to IQueryBuilder | ||||
| * | | Add parameters to public interface | Joas Schilling | 2016-01-25 | 1 | -0/+39 |
| | | | |||||
* | | | Adding support of -1 as size to be passed into get and getFile | Thomas Müller | 2016-01-25 | 1 | -3/+3 |
|/ / | |||||
* / | Remove OC_Helper::imagePath and use the proper public interface | Morris Jobke | 2016-01-24 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #21719 from owncloud/move-notification-api-to-ocp | Thomas Müller | 2016-01-22 | 6 | -2/+487 |
|\ | | | | | Move the notification API to public namespace | ||||
| * | Allow automatic injection of the Manager | Joas Schilling | 2016-01-22 | 1 | -1/+1 |
| | | |||||
| * | Adjust the since on the interface | Joas Schilling | 2016-01-22 | 5 | -48/+48 |
| | | |||||
| * | Move the notification API to public namespace | Joas Schilling | 2016-01-22 | 6 | -1/+486 |
| | | |||||
* | | Merge pull request #18531 from owncloud/ext-user-credentials | Thomas Müller | 2016-01-22 | 4 | -1/+96 |
|\ \ | | | | | | | External storage 'Login credentials' auth mechanism | ||||
| * | | allow comparing clob using expressionbuilder->eq if you explicitly say ↵ | Robin Appelman | 2016-01-18 | 1 | -1/+3 |
| | | | | | | | | | | | | you're comparing strings | ||||
| * | | Introduce CredentialsManager for storage of credentials in DB | Robin McCorkell | 2016-01-18 | 2 | -0/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CredentialsManager performs a simple role, of storing and retrieving encrypted credentials from the database. Credentials are stored by user ID (which may be null) and credentials identifier. Credentials themselves may be of any type that can be JSON encoded. The rationale behind this is to avoid further (mis)use of oc_preferences, which was being used for all manner of data not related to user preferences. | ||||
| * | | Introduce IDBConnection::setValues() | Robin McCorkell | 2016-01-18 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | setValues() attempts to insert a new row, or failing that, update an existing row. The ability to set preconditions is also available. | ||||
* | | | Merge pull request #20768 from owncloud/mount-cache | Thomas Müller | 2016-01-22 | 3 | -0/+160 |
|\ \ \ | |_|/ |/| | | cache mountpoints in the db | ||||
| * | | clear mount cache when removing applicables | Robin Appelman | 2016-01-20 | 1 | -0/+19 |
| | | |