upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20
53456 commits 1040 branches 1221 tags 8.4 GiB
Commit graph

17771 commits

Author SHA1 Message Date
Nextcloud bot
702ba16f7e
[tx-robot] updated from transifex 2021-01-19 02:21:14 +00:00
Nextcloud bot
cff55f0858
[tx-robot] updated from transifex 2021-01-18 02:19:56 +00:00
Nextcloud bot
c201cf5f11
[tx-robot] updated from transifex 2021-01-17 02:20:23 +00:00
Nextcloud bot
442ce2c919
[tx-robot] updated from transifex 2021-01-13 02:20:48 +00:00
Nextcloud bot
8e391f86e3
[tx-robot] updated from transifex 2021-01-12 02:20:18 +00:00
Nextcloud bot
d0a63ad7cd
[tx-robot] updated from transifex 2021-01-11 02:20:22 +00:00
Nextcloud bot
fe9a0ce36a
[tx-robot] updated from transifex 2021-01-09 02:22:03 +00:00
Nextcloud bot
fe8f095824
[tx-robot] updated from transifex 2021-01-08 02:22:58 +00:00
Julius Härtl
68a0639450
Show unique displayname context in the sharing input 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-05 10:09:23 +01:00
Nextcloud bot
f9a5ac3638
[tx-robot] updated from transifex 2021-01-05 02:21:54 +00:00
Nextcloud bot
1028b91e3f
[tx-robot] updated from transifex 2021-01-03 02:21:24 +00:00
Nextcloud bot
17f9e34051
[tx-robot] updated from transifex 2021-01-01 02:21:29 +00:00
Nextcloud bot
8ba550df85
[tx-robot] updated from transifex 2020-12-31 02:27:29 +00:00
Nextcloud bot
025c8698bc
[tx-robot] updated from transifex 2020-12-30 02:19:36 +00:00
Nextcloud bot
3a6a1543f1
[tx-robot] updated from transifex 2020-12-29 02:20:19 +00:00
Roeland Jago Douma
046f913034
Merge pull request #24800 from nextcloud/backport/24796/stable18 
[stable18] Actually set the TTL on redis set
 2020-12-22 09:10:56 +01:00
Nextcloud bot
7ec42a3155
[tx-robot] updated from transifex 2020-12-22 02:19:33 +00:00
Roeland Jago Douma
0c0064a9f0 Actually set the TTL on redis set 
Else well the keys remain for ever and ever.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-21 13:55:55 +00:00
Nextcloud bot
c6d596fd1b
[tx-robot] updated from transifex 2020-12-20 02:19:57 +00:00
Nextcloud bot
7be2a551a4
[tx-robot] updated from transifex 2020-12-18 02:20:37 +00:00
Nextcloud bot
cac5aa4529
[tx-robot] updated from transifex 2020-12-15 02:22:40 +00:00
Nextcloud bot
27b1c69f84
[tx-robot] updated from transifex 2020-12-12 02:19:13 +00:00
Nextcloud bot
625e7b1145
[tx-robot] updated from transifex 2020-12-10 02:20:44 +00:00
Nextcloud bot
6e7d46cc21
[tx-robot] updated from transifex 2020-12-08 02:20:49 +00:00
Roeland Jago Douma
4ec5b3a82e
Merge pull request #24565 from nextcloud/backport/24552/stable18 
[stable18] Remember me is not an app_password
 2020-12-07 11:57:32 +01:00
Nextcloud bot
c1a8ddda0d
[tx-robot] updated from transifex 2020-12-07 02:21:08 +00:00
Nextcloud bot
e95d0f5bc4
[tx-robot] updated from transifex 2020-12-06 02:19:55 +00:00
Nextcloud bot
dae5b54b20
[tx-robot] updated from transifex 2020-12-05 02:19:18 +00:00
Morris Jobke
29ee385927 Fix typo 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-12-04 15:57:07 +00:00
Roeland Jago Douma
7dbb6ea7ba 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:57:04 +00:00
Roeland Jago Douma
56604b02a8 Generate a new session id if the decrypting the session data fails 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-04 12:00:38 +00:00
Nextcloud bot
bcce5ba67b
[tx-robot] updated from transifex 2020-12-04 02:19:50 +00:00
Nextcloud bot
673c6deb5c
[tx-robot] updated from transifex 2020-12-03 02:20:18 +00:00
Christoph Wurst
0b8ec429fd
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-12-01 22:20:28 +01:00
Nextcloud bot
8ae8f2e76d
[tx-robot] updated from transifex 2020-12-01 02:20:14 +00:00
lui87kw
3952be00ec Extra white space to follow other ifs 
Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
 2020-11-25 11:55:21 +00:00
bladewing
0057f85ad7 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:20 +00:00
Julius Härtl
ccd28f2e64
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 15:37:48 +01:00
Carlos Ferreira
cf7fe02b43 Simple typo in comments 2020-11-20 19:50:55 +00:00
Nextcloud bot
eb8959debd
[tx-robot] updated from transifex 2020-11-19 02:20:37 +00:00
Roeland Jago Douma
5aca22f825
Merge pull request #24078 from nextcloud/backport/23168/stable18 
[stable18] add mount point to quota warning message
 2020-11-16 19:29:10 +01:00
Roeland Jago Douma
93b9cab7b2
Merge pull request #24161 from nextcloud/backport/24069/stable18-fix-default-internal-expiration-date 
[stable18] Fix default internal expiration date
 2020-11-16 19:17:33 +01:00
Julius Härtl
396a50fb24
Merge pull request #24077 from nextcloud/backport/23741/stable18 2020-11-16 17:06:12 +01:00
Daniel Calviño Sánchez
bae712b68e 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 15:37:12 +01:00
Joas Schilling
353947a7db Don't throw on SHOW VERSION query 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-16 09:05:44 +00:00
Nextcloud bot
e8fbff407e
[tx-robot] updated from transifex 2020-11-14 02:20:06 +00:00
Joas Schilling
e29eb55f8b
Only use index of mount point when it is there 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-12 20:27:49 +01:00
Robin Appelman
141eaab9c4
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 20:26:11 +01:00
Ashod Nakashian
a428cfeb26 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:46 +00:00
Roeland Jago Douma
dafd09d30b
Merge pull request #23953 from nextcloud/backport/23922/stable18 
[stable18] Improve query type detection
 2020-11-12 14:16:27 +01:00