summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21997 from owncloud/checksumsThomas Müller2016-02-035-7/+36
|\ | | | | Checksums
| * Add store/retrieve checksumsRoeland Jago Douma2016-02-035-7/+36
| | | | | | | | | | | | | | * Add extra db column to filecache * Bump version * Update filecache code to actually handle checksum * Webdav code to store/retrieve checksums
* | Merge pull request #22081 from owncloud/mount-cache-invalid-storageThomas Müller2016-02-031-1/+1
|\ \ | |/ |/| filter invalid storages from the mount cache early
| * filter invalid storages from the mount cache earlyRobin Appelman2016-02-021-1/+1
| |
* | Merge pull request #22059 from owncloud/comments-readmark-davThomas Müller2016-02-031-1/+7
|\ \ | |/ |/| Comments DAV methods for read mark manipulation (mark comments of a file as read) + return isUnread status
| * update routine was lacking where statements :see_no_evil:Arthur Schiwon2016-02-021-1/+7
| |
* | Merge pull request #22013 from owncloud/share2_moveshareThomas Müller2016-02-024-3/+107
|\ \ | | | | | | [Share 2.0] Allow moving of shares
| * | [Share 2.0] Allow moving of sharesRoeland Jago Douma2016-02-024-3/+107
| | | | | | | | | | | | | | | * Only recipient can move a share * Unit tests
* | | Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtagsThomas Müller2016-02-027-32/+279
|\ \ \ | | | | | | | | Issue 22041 activities for systemtags
| * | | Fix IManager::isFormattingFilteredObject()Joas Schilling2016-02-021-5/+4
| | | |
| * | | Add activities when a tag is (un-)assignedJoas Schilling2016-02-021-0/+4
| | | |
| * | | Dispatch events when tags are added/updated/deletedJoas Schilling2016-02-023-13/+147
| | | |
| * | | Dispatch some events when tags are un-/assignedJoas Schilling2016-02-023-14/+124
| | | |
* | | | Merge pull request #22057 from owncloud/share2_update_hashThomas Müller2016-02-021-1/+3
|\ \ \ \ | | | | | | | | | | Update old password hashed for link shares on access
| * | | | Update old password hashed for link shares on accessRoeland Jago Douma2016-02-011-1/+3
| | |_|/ | |/| | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16594
* | | | Merge pull request #21988 from owncloud/allow-search-in-synced-addressbooksThomas Müller2016-02-022-127/+0
|\ \ \ \ | |_|_|/ |/| | | Allow search in synced addressbooks
| * | | The local address book is replaced now by the system addressbook as part of ↵Thomas Müller2016-02-022-127/+0
| | | | | | | | | | | | | | | | the dav app
* | | | getChildren should not return usergroup sharesRoeland Jago Douma2016-02-022-6/+7
| | | |
* | | | [Share 2.0] Allow recipient to be passed in to getShareByIdRoeland Jago Douma2016-02-024-24/+24
|/ / / | | | | | | | | | | | | * 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 #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
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-022-0/+2
| |_|/ |/| |
* | | Merge pull request #21967 from owncloud/comments-webdavThomas Müller2016-02-014-4/+187
|\ \ \ | | | | | | | | Comments WebDAV adjustements
| * | | introduce comments read marke tables, comes with user cleanup after deletionArthur Schiwon2016-01-293-11/+110
| | | |
| * | | Comments WebDAV adjustementsArthur Schiwon2016-01-293-4/+88
| | |/ | |/|
* | | 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-0110-329/+783
|\ \ \ \ \ | | | | | | | | | | | | 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-2810-329/+783
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-014-21/+23
|\ \ \ \ \ | | | | | | | | | | | | 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-294-21/+23
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-316-0/+10
| |_|_|_|/ |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-302-0/+4
| | | | |
* | | | | Merge pull request #21956 from owncloud/cross-cache-moveThomas Müller2016-01-294-31/+129
|\ \ \ \ \ | |_|/ / / |/| | | | Add fallback moveFromCache implementation
| * | | | Add fallback moveFromCache implementationRobin Appelman2016-01-294-31/+129
| | |_|/ | |/| |
* | | | 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.
* | | | Merge pull request #21987 from owncloud/issue-21980-too-many-job-send-mysql-awayThomas Müller2016-01-293-35/+7
|\ \ \ \ | | | | | | | | | | Do not create a loop that generates thousands of jobs
| * | | | Remove other broken usages in deprecated methodsJoas Schilling2016-01-291-35/+3
| | | | |
| * | | | Deprecate the method and warn against using itJoas Schilling2016-01-282-0/+4
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2016-01-292-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-282-6/+80
|\ \ \ | | | | | | | | add IUserMountCache->getMountsForFileId