cc9073c251
Merge pull request #10179 from nextcloud/mount-filter
...
Add the option to filter mounts for a user
2018-07-11 16:29:09 +02:00
a11d198a06
Sanitize parameters in createSessionToken() while logging
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-11 14:26:57 +02:00
6da2b7c4f6
Separate fopen into read and write methods
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-11 12:08:37 +02:00
f1469e34aa
Add fopen method to ISimpleFile
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-11 10:29:03 +02:00
af20f1dd4b
Merge pull request #10125 from nextcloud/feature/9496/comic_mimetypes
...
Add comicbook mimetypes
2018-07-11 09:21:29 +02:00
0e0dd2a90b
[tx-robot] updated from transifex
2018-07-11 00:12:15 +00:00
0fe115a536
Add repair step
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-10 21:27:35 +02:00
3ad6084891
Add the option to filter mounts for a user
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-10 16:49:26 +02:00
a22bc0e787
[tx-robot] updated from transifex
2018-07-10 08:21:14 +00:00
79801ad263
Suppress potential SQL injection warning as they are false positives
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 14:55:47 +02:00
8a64433ec9
Add repair job for pending cron jobs
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 14:53:37 +02:00
8b1084adfe
Only wait for cron if fix for endless wait is included
...
* see https://github.com/nextcloud/server/issues/9992
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 14:53:37 +02:00
a1a29d14c8
Unlock failed cron jobs and set a high "last_checked" value to avoid 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>
2018-07-09 14:51:02 +02:00
103c8c373a
Merge pull request #10120 from nextcloud/allow-to-disable-encryption
...
allow to disable encryption
2018-07-09 13:39:57 +02:00
5541d3dd84
Add visio mimetypes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-06 15:16:21 +02:00
422c805e26
Merge pull request #10116 from nextcloud/lock-negative
...
prevent lock values from going negative with memcache backend
2018-07-06 14:50:18 +02:00
3ade347b0d
Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailer
...
Upgrade to swiftmailer-6
2018-07-06 10:39:09 +02:00
5d0fa12e12
allow to disable encryption
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-05 17:24:44 +02:00
a9b8fb090c
Fix remnants of refactoring
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-05 17:09:38 +02:00
3d5acbb1d0
prevent lock values from going negative with memcache backend
...
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>
2018-07-05 14:39:10 +02:00
ced8789f5c
Fix PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-05 12:43:57 +02:00
6a0552224d
getDeletedSharedWith method
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
d805959e81
Add API to undelete delete group shares
...
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>
2018-07-05 12:43:56 +02:00
be7db1573d
Swift to \Swift_Mailer as abstraction
...
* \Swift_Mailer handles starting the transport etc properly
* Fixed tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
e6e6b5648a
Make swift 6 compatible
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
0dd4a3e0cf
Kill php mail from settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
7025f16017
Merge pull request #9345 from nextcloud/federation20
...
Federation 2.0
2018-07-03 23:13:47 +02:00
10b8a4a8b1
Revert "Fix undeclared method warning in phan"
...
This reverts commit f3093b2401
2018-07-03 17:46:11 +02:00
aa64584d67
Merge pull request #10080 from nextcloud/bugfix/noid/fix-phan-warning
...
Fix undeclared method warning in phan
2018-07-02 17:40:39 +02:00
48b7499fa4
Merge pull request #10079 from nextcloud/search-double-slash
...
fix double slash in search result path when the result is in a submount
2018-07-02 15:49:27 +02:00
f3093b2401
Fix undeclared method warning in phan
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-02 15:38:49 +02:00
922c851494
fix double slash in search result path when the result is in a submount
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-02 14:17:38 +02:00
7ff74ae8ed
cache results from ocm end-point discovery
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
411bae5163
fix return type from send share
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
cdf8abb060
look for correct OCM permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
8d4da30bf5
add support for different share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
e251b34a8c
cleanup variable naming, it is actually a resource type
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
84fc188dfc
some minor fixes and clode cleanup
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
957b27f282
replace \OCP\Federation\Exception\ShareNotFoundException with the generic \OCP\Share\Exception\ShareNotFound exception
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
fab4e561f4
send reshare over OCM API
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
c572e84ad9
detect correctly if a share was send successful
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
8889e14c7c
implement accept share notification
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
bbce8c3ea1
adjust to latest api version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
af178ef19a
check API Version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
db428ea547
send accept share notification (WIP)
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
a3948e8a12
use new API to send a federated share if possible
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
6208f250e8
check if cloud federation api is ready
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
21e64ec7f4
implement receiving of federated shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
5cfe20675d
start implementing federated sharing 2.0
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
03a5856541
Disables the maintenance warning for the maintenance command itself.
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-07-01 20:54:19 +02:00
Morris Jobke
Julius Härtl
Nextcloud bot
Roeland Jago Douma
Robin Appelman
Joas Schilling
Joas Schilling
Bjoern Schiessle
John Molakvoæ (skjnldsv)
Michael Weimann