Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update routine was lacking where statements :see_no_evil: | Arthur Schiwon | 2016-02-02 | 1 | -1/+7 |
| | |||||
* | set read marker via proppatch against entity | Arthur Schiwon | 2016-02-01 | 3 | -1/+43 |
| | |||||
* | Return isUnread property per comment | Arthur Schiwon | 2016-02-01 | 5 | -8/+104 |
| | |||||
* | Merge pull request #21967 from owncloud/comments-webdav | Thomas Müller | 2016-02-01 | 12 | -8/+590 |
|\ | | | | | Comments WebDAV adjustements | ||||
| * | url encode id | Arthur Schiwon | 2016-01-29 | 1 | -1/+1 |
| | | |||||
| * | introduce comments read marke tables, comes with user cleanup after deletion | Arthur Schiwon | 2016-01-29 | 7 | -14/+213 |
| | | |||||
| * | standardize datetime output | Arthur Schiwon | 2016-01-29 | 1 | -1/+1 |
| | | |||||
| * | Comments WebDAV adjustements | Arthur Schiwon | 2016-01-29 | 9 | -7/+390 |
| | | |||||
* | | Merge pull request #21909 from owncloud/files-external-visibility | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ \ | | | | | | | Prevent invalid storages being displayed in the storages view | ||||
| * | | Prevent invalid storages being displayed in the storages view | Robin McCorkell | 2016-01-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #22028 from owncloud/share_hook_expirationdate | Thomas Müller | 2016-02-01 | 2 | -28/+134 |
|\ \ \ | | | | | | | | | Share hook expirationdate | ||||
| * | | | Add Unit tests | Roeland Jago Douma | 2016-01-30 | 1 | -19/+111 |
| | | | | |||||
| * | | | Emit hook for expirationDate verification | Roeland Jago Douma | 2016-01-30 | 1 | -9/+23 |
| | | | | |||||
* | | | | Merge pull request #22046 from owncloud/improved_error_handling | Thomas Müller | 2016-02-01 | 3 | -4/+10 |
|\ \ \ \ | | | | | | | | | | | Improved error handling | ||||
| * | | | | catch all exceptions | Björn Schießle | 2016-02-01 | 2 | -0/+6 |
| | | | | | |||||
| * | | | | add context to the error messages | Björn Schießle | 2016-02-01 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #21953 from owncloud/make-enable_avatars-more-robust | Thomas Müller | 2016-02-01 | 4 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Make enable_avatars setting more robust | ||||
| * | | | | | Make enable_avatars setting more robust | Morris Jobke | 2016-01-27 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * handles the setting in the same way everywhere * fixes #21949 | ||||
* | | | | | | Merge pull request #22045 from owncloud/ext-storage-auth-backend-rewording | Thomas Müller | 2016-02-01 | 3 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Reword external storage auth backends | ||||
| * | | | | | | Reword external storage auth backends | Vincent Petry | 2016-02-01 | 3 | -3/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #22004 from Pookay/patch-1 | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix the result at the bottom on IE | ||||
| * | | | | | | Fix the result at the bottom on IE | Pookay | 2016-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | view issue #21898 | ||||
* | | | | | | | Merge pull request #22021 from ↵ | Thomas Müller | 2016-02-01 | 1 | -2/+15 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-system-addressbook-sync-with-encryption Catch potential exceptions when accessing the users avatar - e.g. iss… | ||||
| * | | | | | | | Catch potential exceptions when accessing the users avatar - e.g. issues ↵ | Thomas Müller | 2016-01-29 | 1 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the encrypted file system - fixes #21983 | ||||
* | | | | | | | | Merge pull request #22034 from matthias-g/patch-1 | Thomas Müller | 2016-02-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Update explanation in comment of how to enable the debug mode | ||||
| * | | | | | | | Update explanation of how to enable debug mode | matthias-g | 2016-01-30 | 1 | -2/+2 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #21989 from owncloud/make-csp-modifiable | Thomas Müller | 2016-02-01 | 15 | -348/+1316 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 | 15 | -348/+1316 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -31/+131 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add path filter to OCS Share API shared_with_me=true | ||||
| * | | | | | | | | Add intergration test | Roeland Jago Douma | 2016-01-29 | 1 | -0/+22 |
| | | | | | | | | | |||||
| * | | | | | | | | Add path filter to OCS Share API ?shared_with_me=true | Roeland Jago Douma | 2016-01-29 | 6 | -31/+109 |
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #21999 from owncloud/properly-decode-cached-objects | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [user_ldap] properly decode cached objects | ||||
| * | | | | | | | | [user_ldap] properly decode cached objects | Morris Jobke | 2016-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #21896 | ||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-01 | 4 | -0/+48 |
| | | | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-31 | 48 | -4/+186 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-30 | 20 | -0/+50 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #22018 from owncloud/occ-external-delete | Thomas Müller | 2016-01-29 | 2 | -0/+116 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add delete command for external storages | ||||
| * | | | | | | | | Add delete command for external storages | Robin Appelman | 2016-01-29 | 2 | -0/+116 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #21956 from owncloud/cross-cache-move | Thomas Müller | 2016-01-29 | 6 | -33/+162 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add fallback moveFromCache implementation | ||||
| * | | | | | | | | Add fallback moveFromCache implementation | Robin Appelman | 2016-01-29 | 6 | -33/+162 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #21790 from owncloud/ext-auth-user-provided | Vincent Petry | 2016-01-29 | 18 | -57/+463 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Add user provided auth mechanism | ||||
| * | | | | | | | inject logger | Robin Appelman | 2016-01-29 | 6 | -11/+33 |
| | | | | | | | | |||||
| * | | | | | | | Dont set null values when validating storage definition | Robin Appelman | 2016-01-29 | 3 | -6/+12 |
| | | | | | | | | |||||
| * | | | | | | | minor fixes | Robin Appelman | 2016-01-29 | 3 | -7/+11 |
| | | | | | | | | |||||
| * | | | | | | | set auth mechanism in tests | Robin Appelman | 2016-01-29 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | remove custom controler for user provided password auth | Robin Appelman | 2016-01-29 | 7 | -141/+97 |
| | | | | | | | | |||||
| * | | | | | | | dont show user provided auth as option for personal mounts | Robin Appelman | 2016-01-29 | 3 | -3/+5 |
| | | | | | | | | |||||
| * | | | | | | | Allow setting user provided credentials from the personal settings page | Robin Appelman | 2016-01-29 | 6 | -44/+180 |
| | | | | | | | |