Morris Jobke
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
Morris Jobke
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
Morris Jobke
103c8c373a
Merge pull request #10120 from nextcloud/allow-to-disable-encryption
...
allow to disable encryption
2018-07-09 13:39:57 +02:00
Joas Schilling
5541d3dd84
Add visio mimetypes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-06 15:16:21 +02:00
Morris Jobke
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
Joas Schilling
3ade347b0d
Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailer
...
Upgrade to swiftmailer-6
2018-07-06 10:39:09 +02:00
Bjoern Schiessle
5d0fa12e12
allow to disable encryption
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-05 17:24:44 +02:00
Robin Appelman
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
John Molakvoæ (skjnldsv)
6a0552224d
getDeletedSharedWith method
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
e6e6b5648a
Make swift 6 compatible
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Roeland Jago Douma
0dd4a3e0cf
Kill php mail from settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Morris Jobke
7025f16017
Merge pull request #9345 from nextcloud/federation20
...
Federation 2.0
2018-07-03 23:13:47 +02:00
Morris Jobke
10b8a4a8b1
Revert "Fix undeclared method warning in phan"
...
This reverts commit f3093b2401
.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-03 17:46:11 +02:00
Morris Jobke
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
Morris Jobke
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
Morris Jobke
f3093b2401
Fix undeclared method warning in phan
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-02 15:38:49 +02:00
Robin Appelman
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
Bjoern Schiessle
7ff74ae8ed
cache results from ocm end-point discovery
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
Bjoern Schiessle
411bae5163
fix return type from send share
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
Bjoern Schiessle
cdf8abb060
look for correct OCM permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
84fc188dfc
some minor fixes and clode cleanup
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle
fab4e561f4
send reshare over OCM API
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
bbce8c3ea1
adjust to latest api version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
af178ef19a
check API Version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
db428ea547
send accept share notification (WIP)
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
6208f250e8
check if cloud federation api is ready
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
5cfe20675d
start implementing federated sharing 2.0
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Michael Weimann
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
blizzz
2f8ebe2b35
Merge pull request #10048 from nextcloud/feature/9760/systemd-logger
...
Systemd Logger
2018-06-30 00:57:30 +02:00
Morris Jobke
e4c3c481a2
Merge pull request #10038 from nextcloud/files-scan-home-only
...
Add option to only scan the home storage
2018-06-29 15:23:15 +02:00
Morris Jobke
69e92ea71a
Merge pull request #10053 from nextcloud/feature/7378/password-security-move
...
Move password change to security settings
2018-06-29 14:53:09 +02:00
Julius Härtl
ff2c819ed3
Move social buttons to the personal settings
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 14:12:05 +02:00
Julius Härtl
97c13debdc
Remove unneeded param from personal settings
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 13:35:07 +02:00
Julius Härtl
3f77b0fc8b
Move user password form to security settings
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 13:35:07 +02:00
Morris Jobke
478b95cc20
Try to not run into the white page of death and still log something in the web server error log
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 11:22:05 +02:00
Morris Jobke
326f07e756
Merge pull request #8854 from nextcloud/drop-old-sharing-code
...
Get rid of shareItem
2018-06-29 10:40:32 +02:00
Johannes Ernst
72340b2230
Added Systemd.log documentation to config.sample.php
...
Changed name of default system (not systemd) logger from ownCloud to Nextcloud, to be consistent
Fixed license per https://github.com/nextcloud/server/pull/9760#discussion_r195026784
Pulled upstream updates
Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
2018-06-29 10:37:46 +02:00
Johannes Ernst
0a65e62f29
Added a logger for systemd/journald
...
Added a unit test
Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
2018-06-29 10:37:45 +02:00
Morris Jobke
17a9024fac
Improved wording
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 10:33:12 +02:00
Arthur Schiwon
25d9c3e529
adjust backend and gui to update and changelog server
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
Arthur Schiwon
1e0761c6b8
adjust tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon
bafb6b3c29
display whats new info in admin settings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Morris Jobke
61842f66ee
Merge pull request #5623 from nextcloud/locale-setting
...
Add user locale/region setting
2018-06-29 08:03:43 +02:00
Morris Jobke
89b6ee1a45
Merge pull request #9773 from nextcloud/feature/noid/resource_booking
...
resource booking
2018-06-29 06:51:49 +02:00
Georg Ehrke
4c1e581f47
docblock version fixes
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-28 17:37:16 +02:00