upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-14 19:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
52675 commits 1033 branches 1221 tags 8.4 GiB
Commit graph

4298 commits

Author SHA1 Message Date
Morris Jobke
64df6aaf85 Do not read certificate bundle from data dir by default 
Before the resources/config/ca-bundle.crt was only used when the list of custom
certificates was empty and the instance was not installed. But it should also
be used when the list is empty and the instance is installed.

This is inverting the logic to stop if the instance is not installed to use the
default bundle. And it also does this when the list is empty.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-05-25 17:53:23 +00:00
Morris Jobke
1d816add44
Merge pull request #20965 from nextcloud/backport/20033/stable18 
[stable18] Enable fseek for files in S3 storage
 2020-05-25 13:38:04 +02:00
Robin Appelman
136a716df0
add basic tests for s3 seeking and add some error handling if reopen return the wrong range 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-05-20 22:58:58 +02:00
Morris Jobke
d26c5103e6
Compress the appstore requests by default 
In test it reduced the transfered data from 5 MB to 2 MB. This should reduce the load on the appstore significantly.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-05-20 11:18:19 +02:00
Morris Jobke
f7b39e13a2
Cache appstore requests for 60 instead of 5 minutes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-05-20 11:18:19 +02:00
Clement Wong
43351ecd29 Fix http cache test 
Signed-off-by: Clement Wong <git@clement.hk>
 2020-05-13 14:40:18 +02:00
Morris Jobke
de4a71c915
Merge pull request #20574 from nextcloud/backport/16035/stable18 
[stable18] dont show remote and email options if we have an exact match for local user email
 2020-05-12 21:05:58 +02:00
Robin Appelman
e26c055fb4
dont show remote and email options if we have an exact match for local user email 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-05-12 16:30:48 +02:00
Roeland Jago Douma
b02a79b327 Use random_bytes 
Since we don't care if it is human readbale.
The code is backwards compatible with the old format.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-11 12:24:59 +00:00
Roeland Jago Douma
de43edca3b
Merge pull request #20763 from nextcloud/backport/20710/stable18 
[stable18] Fix Argon2 options checks
 2020-05-01 14:43:26 +02:00
MichaIng
e5f1523577 Fix Argon2 options checks 
The minimum for memory cost is 8 KiB per thread. Threads must be checked and set first to allow checking against the correct memory cost mimimum.
Options are now applied the following way:
- If config.php contains the setting with an integer higher or equal to the minimum, it is applied.
- If config.php contains the setting with an integer lower than the minimum, the minimum is applied.
- If config.php does not contain the setting or with no integer value, the PHP default is applied.

Signed-off-by: MichaIng <micha@dietpi.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-01 09:37:24 +00:00
Roeland Jago Douma
7b0819c511
Allow specifying a default expiration date 
This overrides the max expiration date.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-01 09:14:25 +02:00
Roeland Jago Douma
fc09807ae6
Merge pull request #20512 from nextcloud/backport/20246/stable18 
[stable18] Provide the proper language to the mailer
 2020-04-20 20:31:30 +02:00
Roeland Jago Douma
7550043371
Provide the proper language to the mailer 
Else we can't properly translate the footer in the recipients e-mail
language.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-04-18 11:37:05 +02:00
Arthur Schiwon
a544996910 add DB tests for credentials manager 
these are actually expected to FAIL, because NULL as a userid is not
allowed in the schema, but documented to be used on the source

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-04-16 09:54:49 +00:00
Joas Schilling
5aa47e5549 Check the user on remote wipe 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-25 15:50:12 +00:00
Julius Härtl
6e7a833016 Remove admin_notifications since it is obsolete since Nextcloud 14 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-03-24 13:56:18 +00:00
Daniel Kesselberg
6d04819868 Add message for DoesNotExistException 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-03-02 15:20:38 +00:00
Joas Schilling
8d5c51730b Strip of users home path from share api message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-02-22 20:26:27 +00:00
Arthur Schiwon
cb1c0d7221 when we receive intentional empty whats new info, do not try to show it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-02-14 09:08:03 +00:00
Arthur Schiwon
53fb638ac6 disable timeout on app install via cli 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-02-12 16:34:58 +00:00
Daniel Kesselberg
2a5ae7ab48 Add test to trigger "Trying to access array offset on value of type int" 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-02-06 20:32:23 +00:00
Roeland Jago Douma
9687febed7 Allow selecting the hashing algorithm 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-02-04 10:32:42 +00:00
Daniel Kesselberg
5ce0b44960 Make sure to catch php errors during job execution 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-02-03 08:55:22 +00:00
Christoph Wurst
8aecb95aa4 Do not encode contacts menu mailto links 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-01-30 08:46:09 +00:00
Arthur Schiwon
a68533e5a6 add hub bundle for easy post-installation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-01-27 07:21:09 +00:00
Joas Schilling
f52c9d759f
Adjust unit test for #19017 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-01-21 08:45:58 +01:00
Julius Härtl
14f6030140 CHeck if file already exists during file creation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-14 07:35:31 +00:00
Georg Ehrke
889933b353 AppFetcher: Distinguish between fileName and endpointName 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-01-12 20:10:07 +00:00
Christoph Wurst
7768cbb19e Clean up 2FA provider registry when a user is deleted 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-01-09 10:35:04 +00:00
Roeland Jago Douma
a673c597ed
Fix the LoggerTests for phpunit 
Less deprecation warnings. YAY.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 09:06:52 +01:00
Daniel Kesselberg
d393b1612b
Modify regex to match some other chromium browsers 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-27 17:24:52 +01:00
Georg Ehrke
f0bef8881d
Restore old behavior allowing to set custom appstore 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-12-22 15:06:31 +01:00
Julius Härtl
de5384466c
Return empty template for default creators 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-16 17:22:53 +01:00
Joas Schilling
faf58e4cac
Merge pull request #17018 from nextcloud/feature/noid/allow-to-force-enable-via-cli 
Allow to force enable apps via CLI
 2019-12-16 12:34:27 +01:00
Roeland Jago Douma
3b8fbf129e
Merge pull request #18384 from nextcloud/fix/18255/global_config_to_always_accept 
config.php setting to always accept internal shares
 2019-12-16 09:50:45 +01:00
Roeland Jago Douma
bb4264c565
config.php setting to always accept internal shares 
Part of #18255

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-16 09:07:25 +01:00
blizzz
f7674c592c
Merge pull request #17494 from nextcloud/fix/16340/ignore-invalid-json 
Return a default user record if json is broken
 2019-12-13 15:43:36 +01:00
Joas Schilling
3eee359d7f
Allow to force enable apps via CLI 
Co-authored-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-13 13:06:12 +01:00
Christoph Wurst
b97d90e0c3
Log critical fallback to user default if we can't parse the JSON 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-13 12:39:29 +01:00
Christoph Wurst
b81b824da1
Add typed events for the filesystem/scanner 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-13 09:41:05 +01:00
Roeland Jago Douma
c6e51924c8
Merge pull request #18236 from nextcloud/bugfix/noid/always-detect-mimetype-by-content-in-workflows 
Allow to detect mimetype by content
 2019-12-12 11:19:55 +01:00
Roeland Jago Douma
8473a09499
REVERT ME: comment out failing gz detection test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-12 08:24:46 +01:00
John Molakvoæ (skjnldsv)
edf8893479
Fix tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-12-10 23:44:17 +01:00
Roeland Jago Douma
eb8ca3783c
Viewer should be always enabled 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-10 20:06:30 +01:00
Joas Schilling
059968e1c7
Pick a shorter name for the transfer ownership table 
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-10 11:01:26 +01:00
Joas Schilling
6ad7e75708
Update the unit test to dataProviders 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-10 09:11:44 +01:00
Roeland Jago Douma
72155009fa
Merge pull request #18184 from nextcloud/bugfix/noid/is-trusted-domain 
Move overwritehost check to isTrustedDomain
 2019-12-09 21:37:22 +01:00
Daniel Kesselberg
29575c4d36
Move custom definition logic into method 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-09 12:10:19 +01:00
Daniel Kesselberg
64aba49461
Ensure that we don't merge broken json. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-09 12:09:43 +01:00