Commit Graph

17990 Commits

Author SHA1 Message Date
Roeland Jago Douma 6d6382a55d
Merge pull request #24354 from nextcloud/backport/24162/stable19
[stable19] set the display name of federated sharees from addressbook
2020-11-25 16:18:12 +01:00
Arthur Schiwon 29a452c693
send expected format of cloud id
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-25 14:32:30 +01:00
Arthur Schiwon 10a252c905
set the display name of federated sharees from addressbook
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-25 14:32:06 +01:00
lui87kw aecf4eff27 Extra white space to follow other ifs
Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
2020-11-25 11:55:16 +00:00
bladewing 43e401e3a2 Avoid substr() error when strpos returns false
"Exception: substr() expects parameter 3 to be int, bool given" can occur on Line 378 $mimePart = substr($icon, 0, strpos($icon, '-'));
This happens, when '-' is not found and strpos returns false instead of an int.
When this occurs, e.g., Activity hangs.

Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
2020-11-25 11:55:15 +00:00
Christoph Wurst 49299ed1c1 Fix the config key on the sharing expire checkbox
We don't use `shareapi_internal_enforce_expire_date` anywhere.
`shareapi_enforce_internal_expire_date` is the one we want.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-24 14:56:53 +00:00
Carlos Ferreira 8f9facccf0 Simple typo in comments 2020-11-20 19:48:09 +00:00
Nextcloud bot cf65cba574
[tx-robot] updated from transifex 2020-11-19 02:20:29 +00:00
Roeland Jago Douma 47ee460f86
Merge pull request #24160 from nextcloud/backport/24069/stable19
[stable19] Fix default internal expiration date
2020-11-16 19:17:46 +01:00
Julius Härtl 8de8bd2326
Merge pull request #24076 from nextcloud/backport/23741/stable19
[stable19] Unlock when promoting to exclusive lock fails
2020-11-16 17:07:05 +01:00
Daniel Calviño Sánchez dd70a20da0 Fix default internal expiration date
The default expiration date for internal shares was set from the default
link expiration date instead of the internal one.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:20:11 +00:00
Joas Schilling eecac68459 Don't throw on SHOW VERSION query
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 09:02:52 +00:00
Nextcloud bot fa9b2278fa
[tx-robot] updated from transifex 2020-11-14 02:19:57 +00:00
Ashod Nakashian da7f445179 Unlock when promoting to exclusive lock fails
In certain cases changeLock to EXCLUSIVE fails
and throws LockedException. This leaves the
file locked as SHARED in file_put_contents,
which prevents retrying (because on second
call file_put_contents takes another SHARED
lock on the same file, and changeLock doesn't
allow more than a single SHARED lock to promote
to EXCLUSIVE).

To avoid this case, we catch the LockedException
and unlock before re-throwing.

Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2020-11-12 19:07:35 +00:00
Joas Schilling b9db1cede3
Only use index of mount point when it is there
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 14:44:43 +01:00
Robin Appelman f70abf4939
add mount point to quota warning message
makes it more clear to the user what the quota applies to

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-12 14:39:12 +01:00
Joas Schilling d5dfaf42a8 Fix iLike() falsely turning escaped % and _ into wildcards
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 09:27:28 +00:00
Nextcloud bot b1efe1896b
[tx-robot] updated from transifex 2020-11-11 02:20:31 +00:00
John Molakvoæ 8ff6d748c8
Removed config.js 2020-11-09 17:14:36 +01:00
Morris Jobke 91242c9f0a
Merge pull request #23634 from nextcloud/backport/23374/stable19
[stable19] Only retry fetching app store data once every 5 minutes in case it fails
2020-11-09 16:59:56 +01:00
Julius Härtl 5aef556016
Only retry fetching app store data once every 5 minutes in case it fails
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-09 11:50:00 +01:00
John Molakvoæ (skjnldsv) 40a2cf96be Make sure root storage is valid before checking its size
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-09 10:08:17 +00:00
Nextcloud bot b516a58acf
[tx-robot] updated from transifex 2020-11-09 02:19:11 +00:00
Joas Schilling ce718ebd7b Improve query type detection
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:23:20 +00:00
Morris Jobke f97048f0d0
Merge pull request #23931 from nextcloud/backport/23917/stable19
[stable19] Do not emit UserCreatedEvent twice
2020-11-06 21:58:15 +01:00
Tobias Assmann dff10238de fix: also remove use statement of UserCreatedEvent
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
2020-11-06 09:58:02 +00:00
Tobias Assmann ed46c5c94a fix: no more translation from postCreateUser hook to UserCreatedEvent anymore, as event is already emitted in user manager
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
2020-11-06 09:58:00 +00:00
Roeland Jago Douma d24ca17168 Bearer must be in the start of the auth header
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 08:23:52 +00:00
Julius Härtl 9bd25d2a7f
Merge pull request #23777 from nextcloud/backport/23024/stable19 2020-11-05 18:06:12 +01:00
Morris Jobke 1b2b478ff5 No need to check if there is an avatar available, because it is generated on the fly nowadays
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-02 18:13:11 +00:00
Julius Härtl c5792f698a
Add occ command to set theming values
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-02 16:23:43 +01:00
Nextcloud bot 6b68cbd9ac
[tx-robot] updated from transifex 2020-11-01 02:18:42 +00:00
Nextcloud bot 815fe50c8a
[tx-robot] updated from transifex 2020-10-31 02:19:06 +00:00
Morris Jobke bbc586a1e4
Merge pull request #23760 from nextcloud/backport/23752/stable19
[stable19] inform the user when flow config data exceeds thresholds
2020-10-29 08:54:25 +01:00
Nextcloud bot c0662a9d46
[tx-robot] updated from transifex 2020-10-29 02:19:35 +00:00
Arthur Schiwon 4967d5b2ba inform the user when flow config data exceeds thresholds
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-10-28 15:11:14 +00:00
Morris Jobke 2561f4c02a Use lib instead if core as l10n module in OC_Files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-27 16:32:42 +00:00
Nextcloud bot 238435f9b5
[tx-robot] updated from transifex 2020-10-27 02:18:54 +00:00
Roeland Jago Douma bb13f940f4 Log the route not found exception on a lower level
This should be logged but it is not that critical to wanner level 3

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-25 09:02:47 +00:00
Roeland Jago Douma af8ed35a1b Fix updates of NULL appconfig values
The comparisson of NULL is a bit special.
So we need to handle this a tad beter else it might not replace NULL
values. or allow you to set NULL values on updates.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-23 08:47:35 +00:00
Nextcloud bot bca309a7ff
[tx-robot] updated from transifex 2020-10-20 02:18:58 +00:00
Morris Jobke c48076c645
Clear cached app config while waiting for the SCSSCache to finish processing the file
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 18:18:26 +02:00
Morris Jobke f962fdf39a SCSSCacher - Lock should not be removed
This is within the failed lock acquiring branch. So the lock is free by another process and should not be removed because the cached file (that was created by the process having the lock) appeared on the filesystem.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 11:30:10 +00:00
Morris Jobke 6a1540dd98 Provide log statements for SCSS cache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 07:52:43 +00:00
Nextcloud bot 97f6388df2
[tx-robot] updated from transifex 2020-10-14 02:19:06 +00:00
Nextcloud bot 17dd0b8248
[tx-robot] updated from transifex 2020-10-13 02:18:49 +00:00
Christoph Wurst cc0976aaa0 Add template typing to the QBMapper
The QBMapper is kind of a generic type, though this concept does not
exist in php. Hence you have a lot of type coercion in subtypes (mappers
in the individual apps) because you suddenly don't expect an Entity[]
but your specific type.

Luckily Psalm lets us type those. Then in the subclass you can
psalm-implement the mapper with a concrete type and psalm will do all
the magic to ensure types are used correctly.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-12 11:15:10 +00:00
Nextcloud bot 8ac3a6d954
[tx-robot] updated from transifex 2020-10-09 02:18:54 +00:00
Roeland Jago Douma 84a58957d5
Merge pull request #23214 from nextcloud/backport/22937/stable19
[stable19] Allow configuring the activity update interval of token
2020-10-08 11:52:45 +02:00
Nextcloud bot bafa390482
[tx-robot] updated from transifex 2020-10-08 02:18:54 +00:00