summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Correctly init empty arraysJoas Schilling2018-07-122-2/+2
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2018-07-122-12/+14
|
* Merge pull request #10204 from nextcloud/fix/noid/strict_csp_evalMorris Jobke2018-07-111-1/+1
|\ | | | | Disallow eval on the StrictEvalCSP
| * Disallow eval on the StrictEvalCSPRoeland Jago Douma2018-07-111-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9895 from nextcloud/fed-group-sharesMorris Jobke2018-07-1110-3/+111
|\ \ | |/ |/| implement federated group sharing
| * update autoloaderBjoern Schiessle2018-07-112-0/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * start to get fed group shares into the share dialogBjoern Schiessle2018-07-112-0/+80
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * translate nextcloud share types to OCM share typesBjoern Schiessle2018-07-111-1/+5
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * log error messgageBjoern Schiessle2018-07-111-0/+1
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * implement federated group sharesBjoern Schiessle2018-07-114-2/+23
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #10179 from nextcloud/mount-filterMorris Jobke2018-07-112-1/+30
|\ \ | | | | | | Add the option to filter mounts for a user
| * | Add the option to filter mounts for a userRobin Appelman2018-07-102-1/+30
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Sanitize parameters in createSessionToken() while loggingMorris Jobke2018-07-111-0/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Separate fopen into read and write methodsJulius Härtl2018-07-112-5/+26
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Add fopen method to ISimpleFileJulius Härtl2018-07-112-0/+20
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #10125 from nextcloud/feature/9496/comic_mimetypesMorris Jobke2018-07-111-0/+17
|\ \ | | | | | | Add comicbook mimetypes
| * | Add repair stepRoeland Jago Douma2018-07-101-0/+17
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / [tx-robot] updated from transifexNextcloud bot2018-07-116-2/+82
|/
* [tx-robot] updated from transifexNextcloud bot2018-07-1026-12/+186
|
* Suppress potential SQL injection warning as they are false positivesMorris Jobke2018-07-092-0/+4
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Add repair job for pending cron jobsMorris Jobke2018-07-094-0/+78
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Only wait for cron if fix for endless wait is includedMorris Jobke2018-07-091-2/+6
| | | | | | * see https://github.com/nextcloud/server/issues/9992 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Unlock failed cron jobs and set a high "last_checked" value to avoid ↵Morris Jobke2018-07-091-0/+9
| | | | | | | | | continous re-check * fixes issue where cronjobs of a not-loaded app are marked as "still running" because there is a "reserved_at" value stored * fixed #9992 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #10120 from nextcloud/allow-to-disable-encryptionMorris Jobke2018-07-091-2/+6
|\ | | | | allow to disable encryption
| * allow to disable encryptionBjoern Schiessle2018-07-051-2/+6
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Add visio mimetypesJoas Schilling2018-07-061-0/+17
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #10116 from nextcloud/lock-negativeMorris Jobke2018-07-061-2/+8
|\ \ | | | | | | prevent lock values from going negative with memcache backend
| * | prevent lock values from going negative with memcache backendRobin Appelman2018-07-051-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | This can be caused by the code releasing more locks then it acquires, once the lock value becomes negative it's likely that it will never be able to change into an exclusive lock again. Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailerJoas Schilling2018-07-062-33/+24
|\ \ \ | | | | | | | | Upgrade to swiftmailer-6
| * | | Swift to \Swift_Mailer as abstractionRoeland Jago Douma2018-07-041-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \Swift_Mailer handles starting the transport etc properly * Fixed tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Make swift 6 compatibleRoeland Jago Douma2018-07-041-26/+16
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Kill php mail from settingsRoeland Jago Douma2018-07-041-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Fix remnants of refactoringMorris Jobke2018-07-051-2/+2
| |_|/ |/| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Fix PHPDocMorris Jobke2018-07-051-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | getDeletedSharedWith methodJohn Molakvoæ (skjnldsv)2018-07-052-0/+33
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Add API to undelete delete group sharesRoeland Jago Douma2018-07-054-0/+74
| |/ |/| | | | | | | | | | | | | | | | | | | When a group share is deleted we keep track of this in the DB. Right now it is only possible for a recipient to get back the share by asking the sharer to delete it and to share it again. This doesn't scale. This endpoint makes it possible to get back the share. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9345 from nextcloud/federation20Morris Jobke2018-07-0321-5/+1702
|\ \ | | | | | | Federation 2.0
| * | cache results from ocm end-point discoveryBjoern Schiessle2018-07-021-0/+11
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | fix return type from send shareBjoern Schiessle2018-07-022-2/+3
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | look for correct OCM permissionsBjoern Schiessle2018-07-021-1/+1
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add support for different share typesBjoern Schiessle2018-07-021-0/+9
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | cleanup variable naming, it is actually a resource typeBjoern Schiessle2018-07-022-19/+17
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | some minor fixes and clode cleanupBjoern Schiessle2018-07-0212-4/+95
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | replace \OCP\Federation\Exception\ShareNotFoundException with the generic ↵Bjoern Schiessle2018-07-025-35/+9
| | | | | | | | | | | | | | | | | | \OCP\Share\Exception\ShareNotFound exception Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | send reshare over OCM APIBjoern Schiessle2018-07-023-5/+7
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | detect correctly if a share was send successfulBjoern Schiessle2018-07-021-1/+1
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | implement accept share notificationBjoern Schiessle2018-07-024-3/+113
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | adjust to latest api versionBjoern Schiessle2018-07-028-29/+61
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | check API VersionBjoern Schiessle2018-07-021-1/+5
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | send accept share notification (WIP)Bjoern Schiessle2018-07-027-24/+108
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>