summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #20903 from owncloud/sharing-mount-optionThomas Müller2016-02-021-0/+10
|\ \ \ | | | | | | | | Add mount option to disable sharing
| * | | Add mount option to disable sharingRobin Appelman2016-01-291-0/+10
| | | |
* | | | Merge pull request #22015 from owncloud/share-no-permissionsThomas Müller2016-02-021-2/+3
|\ \ \ \ | |_|/ / |/| | | Block shares that dont have the correct source permissions
| * | | Block shares that dont have the correct source permissionsRobin Appelman2016-01-291-2/+3
| | | |
* | | | Merge pull request #21967 from owncloud/comments-webdavThomas Müller2016-02-013-3/+140
|\ \ \ \ | | | | | | | | | | Comments WebDAV adjustements
| * | | | introduce comments read marke tables, comes with user cleanup after deletionArthur Schiwon2016-01-292-11/+91
| | | | |
| * | | | Comments WebDAV adjustementsArthur Schiwon2016-01-292-3/+60
| | |/ / | |/| |
* | | | Merge pull request #22028 from owncloud/share_hook_expirationdateThomas Müller2016-02-011-9/+23
|\ \ \ \ | | | | | | | | | | Share hook expirationdate
| * | | | Emit hook for expirationDate verificationRoeland Jago Douma2016-01-301-9/+23
| | | | |
* | | | | Merge pull request #21953 from owncloud/make-enable_avatars-more-robustThomas Müller2016-02-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Make enable_avatars setting more robust
| * | | | | Make enable_avatars setting more robustMorris Jobke2016-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * handles the setting in the same way everywhere * fixes #21949
* | | | | | Merge pull request #21989 from owncloud/make-csp-modifiableThomas Müller2016-02-015-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 Reschke2016-01-285-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_sharedwithmeThomas Müller2016-02-012-19/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add path filter to OCS Share API shared_with_me=true
| * | | | | Add path filter to OCS Share API ?shared_with_me=trueRoeland Jago Douma2016-01-292-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-moveThomas Müller2016-01-292-30/+124
|\ \ \ \ \ | |/ / / / |/| | | | Add fallback moveFromCache implementation
| * | | | Add fallback moveFromCache implementationRobin Appelman2016-01-292-30/+124
| | |/ / | |/| |
* | | | Merge pull request #21995 from owncloud/share2_delete_user_defined_group_sharesThomas Müller2016-01-291-9/+9
|\ \ \ \ | | | | | | | | | | [Share 2.0] When deleting a group share delete children
| * | | | [Share 2.0] When deleting a group share delete childrenRoeland Jago Douma2016-01-281-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 itJoas Schilling2016-01-281-0/+2
|/ / /
* | | fix cachejail->updateRobin Appelman2016-01-281-1/+1
| | |
* | | cleanup shared cacheRobin Appelman2016-01-283-4/+9
| | |
* | | Merge pull request #21858 from owncloud/getMountsForFileIdThomas Müller2016-01-281-6/+65
|\ \ \ | | | | | | | | add IUserMountCache->getMountsForFileId
| * | | Use new constantsJoas Schilling2016-01-271-7/+8
| | | |
| * | | add IUserMountCache->getMountsForFileIdRobin Appelman2016-01-271-0/+58
| |/ /
* | | [Share 2.0] Remove setId and setProviderId from the interfaceRoeland Jago Douma2016-01-281-2/+0
| | | | | | | | | | | | Those should only ever be set by the providers
* | | [Share 2.0] Fix interfaces and commentsRoeland Jago Douma2016-01-283-52/+55
| | | | | | | | | | | | | | | | | | | | | | | | * 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\IServerContainerRoeland Jago Douma2016-01-272-2/+5
| | |
* | | [Share 2.0] Create IManger interface for share managerRoeland Jago Douma2016-01-271-2/+4
| | |
* | | [Share 2.0] Move IShare to OCPRoeland Jago Douma2016-01-277-477/+44
| | |
* | | [Share 2.0] Fix IShareRoeland Jago Douma2016-01-273-105/+47
| | |
* | | Check whether ownCloud is installedLukas Reschke2016-01-272-5/+30
| | | | | | | | | | | | | | | | | | ownCloud might not yet be setup. This causes an issue as the user config requires a setup ownCloud. Thus this needs a block whether ownCloud is installed or not. Fixes https://github.com/owncloud/core/issues/21955
* | | Merge pull request #21923 from owncloud/fix-errors-after-installThomas Müller2016-01-272-12/+13
|\ \ \ | | | | | | | | Fix errors after install
| * | | Fix errors after installLukas Reschke2016-01-262-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing ownCloud the first time the first thing that an admin saw was an error message: > Error PHP touch(): Unable to create file owncloud.log because Permission denied at /var/www/owncloud/lib/private/log/owncloud.php#48 Or something related. This lead to a lot confusion as can be seen in our forum and in our issue tracker. This change should make the error messages disappear in most cases (e.g. where the file can actually be written). To test this: 1. On master install ownCloud and check owncloud.log => Error message 2. On this branch install ownCloud and check owncloud.log => No error message Fixes https://github.com/owncloud/core/issues/13736 and https://github.com/owncloud/core/issues/12893
* | | | Merge pull request #21940 from ↵Thomas Müller2016-01-271-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | owncloud/share2_do_not_returned_removed_group_shares [Share 2.0] Properly handle user deleted group shares
| * | | [Share 2.0] Properly handle user deleted group sharesRoeland Jago Douma2016-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If a user deletes a group share we create a special share entry. To the API this is just a normal group share for that user with permissions 0. But we should not return this.
* | | | In case the hint of the HintException is empty we better use the exception ↵Thomas Müller2016-01-271-0/+3
| | | | | | | | | | | | | | | | message
* | | | Merge pull request #21741 from owncloud/l10n-improvementsThomas Müller2016-01-275-259/+586
|\ \ \ \ | | | | | | | | | | Move methods to the factory that are not related to translating, but to guessing/finding the language
| * | | | Move class to legacy folderJoas Schilling2016-01-261-0/+0
| | | | |
| * | | | Add tests for findLanguage()Joas Schilling2016-01-261-7/+7
| | | | |
| * | | | Add tests for the factoryJoas Schilling2016-01-261-8/+8
| | | | |
| * | | | Fix the testsJoas Schilling2016-01-261-1/+1
| | | | |
| * | | | Deprecate OC_L10N in favor of a namespaces and DI versionJoas Schilling2016-01-264-15/+229
| | | | |
| * | | | Deprecate getFirstWeekDay() and getDateFormat() in favor of l()Joas Schilling2016-01-261-24/+10
| | | | |
| * | | | Move finding the language files and creating the function out of the objectJoas Schilling2016-01-262-98/+119
| | | | |
| * | | | Move validation and fallbacks of app and lang to the constructor/factoryJoas Schilling2016-01-262-14/+23
| | | | |
| * | | | Move findLanguage() and setLanguageFromRequest() to factoryJoas Schilling2016-01-263-99/+147
| | | | |
| * | | | Move languageExists() to the factoryJoas Schilling2016-01-262-8/+19
| | | | |
| * | | | Move findAvailableLanguages() to the factoryJoas Schilling2016-01-262-19/+57
| | | | |
* | | | | Merge pull request #21887 from owncloud/share2_updateShareThomas Müller2016-01-272-15/+160
|\ \ \ \ \ | | | | | | | | | | | | [Sharing 2.0] update share