summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21909 from owncloud/files-external-visibilityThomas Müller2016-02-011-1/+1
|\ | | | | Prevent invalid storages being displayed in the storages view
| * Prevent invalid storages being displayed in the storages viewRobin McCorkell2016-01-261-1/+1
| |
* | Merge pull request #22028 from owncloud/share_hook_expirationdateThomas Müller2016-02-012-28/+134
|\ \ | | | | | | Share hook expirationdate
| * | Add Unit testsRoeland Jago Douma2016-01-301-19/+111
| | |
| * | Emit hook for expirationDate verificationRoeland Jago Douma2016-01-301-9/+23
| | |
* | | Merge pull request #22046 from owncloud/improved_error_handlingThomas Müller2016-02-013-4/+10
|\ \ \ | | | | | | | | Improved error handling
| * | | catch all exceptionsBjörn Schießle2016-02-012-0/+6
| | | |
| * | | add context to the error messagesBjörn Schießle2016-02-011-4/+4
| | | |
* | | | Merge pull request #21953 from owncloud/make-enable_avatars-more-robustThomas Müller2016-02-014-4/+4
|\ \ \ \ | | | | | | | | | | Make enable_avatars setting more robust
| * | | | Make enable_avatars setting more robustMorris Jobke2016-01-274-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | * handles the setting in the same way everywhere * fixes #21949
* | | | | Merge pull request #22045 from owncloud/ext-storage-auth-backend-rewordingThomas Müller2016-02-013-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Reword external storage auth backends
| * | | | | Reword external storage auth backendsVincent Petry2016-02-013-3/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #22004 from Pookay/patch-1Thomas Müller2016-02-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix the result at the bottom on IE
| * | | | | Fix the result at the bottom on IEPookay2016-01-291-1/+1
| | | | | | | | | | | | | | | | | | view issue #21898
* | | | | | Merge pull request #22021 from ↵Thomas Müller2016-02-011-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üller2016-01-291-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | with the encrypted file system - fixes #21983
* | | | | | | Merge pull request #22034 from matthias-g/patch-1Thomas Müller2016-02-011-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Update explanation in comment of how to enable the debug mode
| * | | | | | Update explanation of how to enable debug modematthias-g2016-01-301-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #21989 from owncloud/make-csp-modifiableThomas Müller2016-02-0115-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 Reschke2016-01-2815-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_sharedwithmeThomas Müller2016-02-017-31/+131
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add path filter to OCS Share API shared_with_me=true
| * | | | | | | Add intergration testRoeland Jago Douma2016-01-291-0/+22
| | | | | | | |
| * | | | | | | Add path filter to OCS Share API ?shared_with_me=trueRoeland Jago Douma2016-01-296-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-codeThomas Müller2016-02-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Default to STATUS_ERROR in StorageNotAvailableException
| * | | | | | | Default to STATUS_ERROR in StorageNotAvailableExceptionRobin McCorkell2016-01-291-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #21999 from owncloud/properly-decode-cached-objectsThomas Müller2016-02-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [user_ldap] properly decode cached objects
| * | | | | | | [user_ldap] properly decode cached objectsMorris Jobke2016-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #21896
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-014-0/+48
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-3148-4/+186
| |_|_|_|/ / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-3020-0/+50
| | | | | | |
* | | | | | | Merge pull request #22018 from owncloud/occ-external-deleteThomas Müller2016-01-292-0/+116
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add delete command for external storages
| * | | | | | | Add delete command for external storagesRobin Appelman2016-01-292-0/+116
| | | | | | | |
* | | | | | | | Merge pull request #21956 from owncloud/cross-cache-moveThomas Müller2016-01-296-33/+162
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add fallback moveFromCache implementation
| * | | | | | | | Add fallback moveFromCache implementationRobin Appelman2016-01-296-33/+162
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #21790 from owncloud/ext-auth-user-providedVincent Petry2016-01-2918-57/+463
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Add user provided auth mechanism
| * | | | | | | inject loggerRobin Appelman2016-01-296-11/+33
| | | | | | | |
| * | | | | | | Dont set null values when validating storage definitionRobin Appelman2016-01-293-6/+12
| | | | | | | |
| * | | | | | | minor fixesRobin Appelman2016-01-293-7/+11
| | | | | | | |
| * | | | | | | set auth mechanism in testsRobin Appelman2016-01-291-0/+1
| | | | | | | |
| * | | | | | | remove custom controler for user provided password authRobin Appelman2016-01-297-141/+97
| | | | | | | |
| * | | | | | | dont show user provided auth as option for personal mountsRobin Appelman2016-01-293-3/+5
| | | | | | | |
| * | | | | | | Allow setting user provided credentials from the personal settings pageRobin Appelman2016-01-296-44/+180
| | | | | | | |
| * | | | | | | expose user provided credentials for admin mountsRobin Appelman2016-01-292-1/+10
| | | | | | | |
| * | | | | | | Add user provided credentials mechanismRobin Appelman2016-01-294-1/+142
| | | | | | | |
| * | | | | | | Fix invalid storages not showing in directory listingRobin Appelman2016-01-292-1/+130
|/ / / / / / /
* | | | | | | Merge pull request #21660 from owncloud/sharing2_update_resharesThomas Müller2016-01-294-46/+496
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | upgrade to sharing 2.0, remove hierarchical re-shares
| * | | | | | | Update the initiator of the share as well in migrationRoeland Jago Douma2016-01-283-7/+74
| | | | | | | |
| * | | | | | | Update reshares in batches as not to run out of memoryRoeland Jago Douma2016-01-282-14/+97
| | | | | | | |
| * | | | | | | upgrade to sharing 2.0, remove hierarchical re-sharesBjörn Schießle2016-01-284-48/+348
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #21992 from owncloud/share-dialog-error-handlingThomas Müller2016-01-292-7/+158
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Properly forward error messages in share dialog
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 11:33:09 +0000