607e902070
Fix typo
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-04 15:56:29 +00:00
e6947bd6ca
Remember me is not an app_password
...
While technically they are stored the same. This session variable is
used to indicate that a user is using an app password to authenticate.
Like from a client. Or when having it generated automatically.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-04 15:56:24 +00:00
233d4164a6
Merge pull request #24553 from nextcloud/backport/24550/stable20
...
[stable20] Generate a new session id if the decrypting the session data fails
2020-12-04 16:09:52 +01:00
b1e9752169
Revert "Do not read certificate bundle from data dir by default"
...
This reverts commit 18b0d753f2
2020-12-04 13:37:10 +01:00
f52337e8be
Generate a new session id if the decrypting the session data fails
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-04 11:55:31 +00:00
ce953d1571
Merge pull request #24532 from nextcloud/backport/24409/stable20
...
[stable20] Also run repair steps when encryption is disabled but a legacy key is present
2020-12-03 12:22:41 +01:00
1a041f7ac7
Merge pull request #24530 from nextcloud/fix/stable20-nextcloud-log-normalizer
...
[stable20] Replace abandoned log normalizer with our fork
2020-12-03 11:14:46 +01:00
14d95cb2e3
Also handle legacy cipher support when encryption is disabled but an old master key is present
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-03 09:56:59 +00:00
67e5af58ed
Replace abandoned log normalizer with our fork
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-03 09:50:10 +01:00
428f0ec151
Fix vsprint parameter
...
%2\$; is not valid. On php7 this is just ignored but on php8 it gives an
error. %2\$s; works.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 08:20:04 +00:00
bdbb60a67b
Merge pull request #24509 from nextcloud/backport/23257/stable20
...
[stable20] Fix file size computation on 32bit platforms
2020-12-02 20:03:24 +01:00
a8780debd3
Add notification for user limit
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:44 +00:00
d2fd49c461
Allow subscription to indicate that a userlimit is reached
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:42 +00:00
dc7eb53a8f
Fix file size computation on 32bit platforms
...
Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
2020-12-02 15:27:30 +00:00
86da5013c8
Merge pull request #24325 from nextcloud/backport/24103/stable20
...
[stable20] Only check path for being accessible when the storage is a object home
2020-12-01 11:04:22 +01:00
2003995e32
Merge pull request #24353 from nextcloud/backport/24162/stable20
...
[stable20] set the display name of federated sharees from addressbook
2020-11-25 16:18:23 +01:00
4e6f0df777
send expected format of cloud id
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-25 14:16:08 +01:00
c9814c716a
set the display name of federated sharees from addressbook
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-24 22:52:31 +01:00
4b9d8c75ec
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:54:02 +00:00
866e273599
Only check path for being accessible when the storage is a object home
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-24 09:14:39 +00:00
347aaf23b2
Merge pull request #24249 from nextcloud/backport/24241/stable20
...
[stable20] Harden EncryptionLegacyCipher a bit
2020-11-20 22:42:17 +01:00
a8ba2df8e6
Simple typo in comments
2020-11-20 19:45:23 +00:00
e0e3334fc2
Merge pull request #24230 from nextcloud/backport/24007/stable20
...
[stable20] allow selecting multiple columns with SELECT DISTINCT
2020-11-20 14:27:27 +01:00
7fa352b28c
Merge pull request #24228 from nextcloud/backport/24135/stable20
...
[stable20] Fix nextcloud logo in email notifications misalignment
2020-11-20 14:23:00 +01:00
06286f8c0e
Harden EncryptionLegacyCipher a bit
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-20 13:18:25 +00:00
f65a89dd07
use file name instead of path in 'not allowed to share' message
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-19 21:44:42 +00:00
22bf656e02
allow selecting multiple columns with SELECT DISTINCT
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-19 21:41:13 +00:00
7ccf700432
Fix #23357
...
Signed-off-by: medcloud <42641918+medcloud@users.noreply.github.com>
2020-11-19 20:38:54 +00:00
8c398453ac
missing level
...
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-19 07:40:38 +00:00
cdbb2b3e4b
Merge pull request #24159 from nextcloud/backport/24069/stable20
...
[stable20] Fix default internal expiration date
2020-11-16 17:46:37 +01:00
182e28bfbc
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:16:57 +00:00
b14ec966c1
Merge pull request #24156 from nextcloud/backport/24112/stable20
...
[stable20] Set up FS before querying storage info in settings
2020-11-16 14:14:43 +01:00
32758894a4
Set up FS before querying storage info in settings
...
The personal info section of the personal settings is querying the
storage quota information. For this it requires the FS to be setup which
is not always guaranteed.
This fixes an issue where refreshing the settings page would cause it to
fail after Redis caches are full. It is likely that when Redis cache is
populated, some code path is initializing the FS, so it works so far.
But when the cache is populated, that code path is skipped so the FS is
not guaranteed to be setup...
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-11-16 11:06:35 +00:00
f10327b245
Don't throw on SHOW VERSION query
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 08:59:47 +00:00
bb52911d16
Create primary keys on all tables and add a command to create the afterwards
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:52 +01:00
f3c183b6c3
Replace the credentials table with one that can have empty user
...
Primary key columns on Oracle can not have empty strings
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:52 +01:00
dee42027ed
Don't try to update on NotNullConstraintViolationException, only on unique or foreign key
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
a66591ee79
Fix comparing the empty string for global credentials
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
97b0402984
Empty string is returned as null, but empty string in file cache is the root and exists
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
19816fe85f
Don't leave cursors open when tests fail
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 14:18:02 +00:00
5f3d62600e
Fix repair mimetype step to not leave stray cursors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 10:27:09 +01:00
73c2ad293b
Merge pull request #23998 from nextcloud/backport/23937/stable20
...
[stable20] Use query builder instead of OC_DB in OC\Files\*
2020-11-10 10:26:04 +01:00
bf6aa03eb3
Merge pull request #23995 from nextcloud/backport/23741/stable20
...
[stable20] Unlock when promoting to exclusive lock fails
2020-11-10 10:16:34 +01:00
8edc29bfef
Merge pull request #23955 from nextcloud/backport/23938/stable20
...
[stable20] Replace some usages of OC_DB in OC\Share\* with query builder
2020-11-10 08:59:54 +01:00
adcc942553
Use query builder instead of OC_DB in OC\Files\*
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 11:01:09 +00:00
0c4297cee9
Make sure root storage is valid before checking its size
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-09 10:05:54 +00:00
7298d037b2
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-09 10:03:15 +00:00
20885847c8
Merge pull request #23971 from nextcloud/backport/23936/stable20
...
[stable20] Use query builder instead of OC_DB in trashbin
2020-11-09 10:27:29 +01:00
a01da78f1d
Add explicit typecast for $value.
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-11-09 10:13:36 +01:00
b3dfa9290d
Update parameters
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:47 +00:00
Morris Jobke
Roeland Jago Douma
Roeland Jago Douma
Julius Härtl
Christoph Wurst
aler9
Arthur Schiwon
Carlos Ferreira
Robin Appelman
medcloud
Maxence Lange
Daniel Calviño Sánchez
Vincent Petry
Joas Schilling
John Molakvoæ (skjnldsv)
Ashod Nakashian
Daniel Kesselberg