upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-28 01:28:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 49
52621 commits 889 branches 1198 tags 6.6 GiB
Commit graph

17530 commits

Author SHA1 Message Date
GretaD
d8338275c8 Fix languages empty array 
Signed-off-by: GretaD <gretadoci@gmail.com>
 2020-05-11 15:04:01 +02:00
Nextcloud bot
d460f4fc5a
[tx-robot] updated from transifex 2020-05-08 02:16:16 +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
Nextcloud bot
e8976b8e34
[tx-robot] updated from transifex 2020-05-01 02:16:58 +00:00
Nextcloud bot
f5da6c8f7a
[tx-robot] updated from transifex 2020-04-30 02:17:21 +00:00
Tekhnee
7c1abc54db Adhere to EMailTemplate interface in constructor call. 
Email creation appears to have been refactored lately but it looks like custom template-based emails were left out.

Signed-off-by: Tekhnee <info@tekhnee.org>
 2020-04-27 09:12:40 +00:00
Nextcloud bot
12ca86d8e2
[tx-robot] updated from transifex 2020-04-25 02:16:13 +00:00
Nextcloud bot
7fe5c516b5
[tx-robot] updated from transifex 2020-04-24 02:28:07 +00:00
Nextcloud bot
1e3698c8cf
[tx-robot] updated from transifex 2020-04-22 02:17:16 +00:00
Nextcloud bot
2cf8fab366
[tx-robot] updated from transifex 2020-04-21 02:16:49 +00: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
Nextcloud bot
e8f69b45eb
[tx-robot] updated from transifex 2020-04-20 02:16:22 +00: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
Nextcloud bot
46149ab80b
[tx-robot] updated from transifex 2020-04-18 02:16:37 +00:00
Arthur Schiwon
249d3a828c fix credentialsManager documentation and ensure userId to be used as string 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-04-16 09:54:49 +00:00
Nextcloud bot
73ef2f3e86
[tx-robot] updated from transifex 2020-04-16 02:17:41 +00:00
Roeland Jago Douma
65c6680e86
Merge pull request #20483 from nextcloud/backport/19936/stable18 
[stable18] Handle unset owner in sharing
 2020-04-15 20:20:29 +02:00
Robin Appelman
adf88bb418 Close the streams in writeStream even when there is an exception 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-15 08:49:53 +00:00
Joas Schilling
a717b38576 Handle unset owner in sharing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-04-14 18:37:12 +00:00
Morris Jobke
276a650d0f
Merge pull request #20163 from nextcloud/backport/19782/stable18 
[stable18] Use global used space in quota wrappen when external storage is included
 2020-04-14 14:08:20 +02:00
Roeland Jago Douma
734c1a4649
Merge pull request #20334 from nextcloud/backport/20284/stable18 
[stable18] Properly catch NoUserException during upload cleanup
 2020-04-14 10:59:24 +02:00
Nextcloud bot
b6e3512ab5
[tx-robot] updated from transifex 2020-04-14 02:16:59 +00:00
Nextcloud bot
1d27b80ac3
[tx-robot] updated from transifex 2020-04-13 02:19:54 +00:00
Nextcloud bot
b5aa8d0b0b
[tx-robot] updated from transifex 2020-04-11 02:18:47 +00:00
Roeland Jago Douma
000d62a4a5
Merge pull request #20366 from nextcloud/backport/20360/stable18 
[stable18] Try to use the display name of file transfers
 2020-04-10 08:35:21 +02:00
Nextcloud bot
8f90f4d89a
[tx-robot] updated from transifex 2020-04-10 02:18:34 +00:00
Nextcloud bot
9b9dc6d644
[tx-robot] updated from transifex 2020-04-09 02:18:36 +00:00
Joas Schilling
ed4927a266 Try to use the display name of file transfers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-04-08 17:38:14 +00:00
Nextcloud bot
014616ea7d
[tx-robot] updated from transifex 2020-04-08 02:18:55 +00:00
Nextcloud bot
877f3a1f12
[tx-robot] updated from transifex 2020-04-07 02:18:20 +00:00
Julius Härtl
ab699661ce Properly hint exceptions thrown by getUserFolder 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-04-06 16:47:55 +00:00
Nextcloud bot
0401c350e6
[tx-robot] updated from transifex 2020-04-06 02:18:13 +00:00
Nextcloud bot
33ee579031
[tx-robot] updated from transifex 2020-04-05 02:18:13 +00:00
Roeland Jago Douma
1fda7cef88
Merge pull request #20296 from nextcloud/backport/20293/stable18 
[stable18] fixes the return type of BeforeUserLoggedInEvent
 2020-04-04 21:35:55 +02:00
Nextcloud bot
4d9fa0213b
[tx-robot] updated from transifex 2020-04-04 02:18:00 +00:00
Arthur Schiwon
a93704c9cb fixes the return type of BeforeUserLoggedInEvent 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-04-03 19:30:37 +00:00
Nextcloud bot
3df6adb63d
[tx-robot] updated from transifex 2020-04-03 12:08:26 +00:00
Robin Appelman
bd5a8f7efb Dont always use the current users quota when calculating storage info 
instead pass the quota as parameter.

Without this fix, when 'quota_include_external_storage' is enabled, the
webui will show the quota configured for the admin for every user
instead of the users quota

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-01 12:26:29 +00:00
Roeland Jago Douma
a9db39170a
Merge pull request #20202 from nextcloud/backport/19978/stable18 
[stable18] Actually check if the owner is not null
 2020-04-01 09:50:03 +02:00
Nextcloud bot
78ec3680c2
[tx-robot] updated from transifex 2020-03-30 02:18:44 +00:00
Nextcloud bot
63d9341844
[tx-robot] updated from transifex 2020-03-29 02:20:24 +00:00
Nextcloud bot
7ffe3b3465
[tx-robot] updated from transifex 2020-03-28 02:18:25 +00:00
Roeland Jago Douma
874c468c02 Actually check if the owner is not null 
Else this can error out on storages that do not have an owner (e.g.
groupfolders).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-03-27 13:51:47 +00:00
Nextcloud bot
91a39ec03d
[tx-robot] updated from transifex 2020-03-27 02:18:30 +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
Robin Appelman
41a839a63d Use global used space in quota wrappen when external storage is included 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-03-25 13:18:59 +00:00
Nextcloud bot
bf88c3d9d6
[tx-robot] updated from transifex 2020-03-25 02:18:37 +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