summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22013 from owncloud/share2_moveshareThomas Müller2016-02-024-3/+107
|\
| * [Share 2.0] Allow moving of sharesRoeland Jago Douma2016-02-024-3/+107
* | Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtagsThomas Müller2016-02-027-32/+279
|\ \
| * | 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 accessRoeland Jago Douma2016-02-011-1/+3
* | | | Merge pull request #21988 from owncloud/allow-search-in-synced-addressbooksThomas Müller2016-02-022-127/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | The local address book is replaced now by the system addressbook as part of t...Thomas Müller2016-02-022-127/+0
* | | | 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
|/ / /
* | | Merge pull request #20903 from owncloud/sharing-mount-optionThomas Müller2016-02-021-0/+10
|\ \ \
| * | | 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 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
|\ \ \
| * | | 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
|\ \ \
| * | | 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 robustMorris Jobke2016-01-271-1/+1
* | | | | 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 de...Lukas Reschke2016-01-2810-329/+783
| | |_|_|/ | |/| | |
* | | | | 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=trueRoeland Jago Douma2016-01-294-21/+23
| | |_|_|/ | |/| | |
* | | | | Merge pull request #22012 from owncloud/storagenotavailableexception-codeThomas Müller2016-02-011-1/+1
|\ \ \ \ \
| * | | | | 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 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 childrenRoeland Jago Douma2016-01-281-9/+9
| | |_|/ | |/| |
* | | | Merge pull request #21987 from owncloud/issue-21980-too-many-job-send-mysql-awayThomas Müller2016-01-293-35/+7
|\ \ \ \
| * | | | 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
|\ \ \
| * | | Use new constantsJoas Schilling2016-01-271-7/+8
| * | | add IUserMountCache->getMountsForFileIdRobin Appelman2016-01-272-0/+73
| |/ /
* | | [Share 2.0] Remove setId and setProviderId from the interfaceRoeland Jago Douma2016-01-282-20/+0
* | | [Share 2.0] Fix interfaces and commentsRoeland Jago Douma2016-01-286-101/+106
* | | [Share 2.0] Add getShareManager to OCP\IServerContainerRoeland Jago Douma2016-01-273-2/+13
* | | [Share 2.0] Create IManger interface for share managerRoeland Jago Douma2016-01-272-2/+214