upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-19 13:39:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54
55847 commits 982 branches 1224 tags 9.6 GiB
Commit graph

18428 commits

Author SHA1 Message Date
Vincent Petry
d4d009fc8e Don't log params of imagecreatefromstring 
To prevent flooding the log with actual image data.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2020-12-04 09:45:29 +00:00
Nextcloud bot
a53871f629
[tx-robot] updated from transifex 2020-12-04 02:19:34 +00:00
Roeland Jago Douma
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
Morris Jobke
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
Julius Härtl
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
Christoph Wurst
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
Roeland Jago Douma
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
Nextcloud bot
6093d1bcc1
[tx-robot] updated from transifex 2020-12-03 02:20:01 +00:00
Roeland Jago Douma
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
Morris Jobke
a8780debd3 Add notification for user limit 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-12-02 17:24:44 +00:00
Morris Jobke
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
aler9
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
Roeland Jago Douma
3fb850940f
Set frame-ancestors to none if none are filled 
frame-ancestors doesn't fall back to default-src. So when we apply a
very restricted CSP we should make sure to set it to 'none' and not
leave it empty.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-01 22:23:13 +01:00
Morris Jobke
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
Nextcloud bot
965614f3e2
[tx-robot] updated from transifex 2020-12-01 02:19:56 +00:00
Roeland Jago Douma
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
Arthur Schiwon
4e6f0df777
send expected format of cloud id 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-11-25 14:16:08 +01:00
Arthur Schiwon
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
Christoph Wurst
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
Julius Härtl
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
Morris Jobke
347aaf23b2
Merge pull request #24249 from nextcloud/backport/24241/stable20 
[stable20] Harden EncryptionLegacyCipher a bit
 2020-11-20 22:42:17 +01:00
Carlos Ferreira
a8ba2df8e6 Simple typo in comments 2020-11-20 19:45:23 +00:00
Morris Jobke
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
Morris Jobke
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
Roeland Jago Douma
06286f8c0e Harden EncryptionLegacyCipher a bit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-11-20 13:18:25 +00:00
Robin Appelman
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
Robin Appelman
22bf656e02 allow selecting multiple columns with SELECT DISTINCT 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-11-19 21:41:13 +00:00
medcloud
7ccf700432 Fix #23357 
Signed-off-by: medcloud <42641918+medcloud@users.noreply.github.com>
 2020-11-19 20:38:54 +00:00
Maxence Lange
8c398453ac missing level 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-11-19 07:40:38 +00:00
Nextcloud bot
6a4ced077e
[tx-robot] updated from transifex 2020-11-19 02:20:21 +00:00
Daniel Calviño Sánchez
cdbb2b3e4b
Merge pull request #24159 from nextcloud/backport/24069/stable20 
[stable20] Fix default internal expiration date
 2020-11-16 17:46:37 +01:00
Daniel Calviño Sánchez
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
Roeland Jago Douma
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
Roeland Jago Douma
bca0633e2b
Merge pull request #24147 from nextcloud/backport/24146/stable20 
[stable20] Don't throw on SHOW VERSION query
 2020-11-16 12:08:56 +01:00
Vincent Petry
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
Joas Schilling
7a821da1bc
Merge pull request #24079 from nextcloud/backport/24053/stable20 
[stable20] Make is_user_defined nullable so we can store false on oracle
 2020-11-16 11:23:17 +01:00
Joas Schilling
f10327b245 Don't throw on SHOW VERSION query 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-16 08:59:47 +00:00
Nextcloud bot
66b6ccc69e
[tx-robot] updated from transifex 2020-11-14 02:19:47 +00:00
Morris Jobke
ca363131d9 Dump autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-11-12 20:46:59 +00:00
Joas Schilling
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
Joas Schilling
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
Joas Schilling
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
Joas Schilling
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
Joas Schilling
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
Joas Schilling
8ff0523c3d
Make sure columns with an empty default are nullable for Oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-12 12:57:51 +01:00
Joas Schilling
60ca39bb53
Merge pull request #24033 from nextcloud/backport/23993/stable20 
[stable20] Don't leave cursors open
 2020-11-11 10:56:53 +01:00
Nextcloud bot
3d3cebc321
[tx-robot] updated from transifex 2020-11-11 02:20:23 +00:00
Joas Schilling
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
Joas Schilling
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
Morris Jobke
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