upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-25 03:43:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 39
58482 commits 783 branches 1189 tags 6.5 GiB
Commit graph

58482 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Molakvoæ
2efd975380
Merge pull request #30064 from nextcloud/backport/30046/stable21 2021-12-03 09:03:21 +01:00
Nextcloud bot
448b41feda
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-03 02:29:34 +00:00
Christoph Wurst
645bea5a04 Close open cursor in the caldav back-end 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-12-03 02:03:37 +00:00
John Molakvoæ
c8c198715e
Merge pull request #30023 from nextcloud/backport/30018/stable21 2021-12-02 22:27:49 +01:00
Christopher Ng
89b309d8aa Fix collaborative tags styles 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2021-12-02 20:01:07 +00:00
John Molakvoæ
51721e8013
Merge pull request #30061 from nextcloud/fix/stable21/jsunit-job 2021-12-02 20:51:27 +01:00
Christopher Ng
408ac4d6c0 Add missing node version matrix for jsunit job 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2021-12-02 19:18:28 +00:00
Joas Schilling
60562154b0
Merge pull request #30039 from nextcloud/backport/30028/stable21 
[stable21] Fix log_query config flag
 2021-12-02 17:13:01 +01:00
Joas Schilling
cabc6eaec6 Fix log_query config flag 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-02 09:41:33 +00:00
Nextcloud bot
f84196b41b
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-02 02:29:32 +00:00
Christoph Wurst
003bf0fc6e
Merge pull request #29997 from nextcloud/backport/27732/stable21 
[stable21] Fix LDAPProviderFactory not found
 2021-12-01 19:01:54 +01:00
Arthur Schiwon
9a4f7172d0 unset ldap provider when disabling user_ldap 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-12-01 08:27:56 +00:00
Arthur Schiwon
26c66d210d ensure that factoryClass exisits before instantiation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-12-01 08:27:56 +00:00
Nextcloud bot
31679bd344
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-01 02:31:07 +00:00
Christoph Wurst
086e79eecd
Merge pull request #29979 from nextcloud/backport/29974/stable21 
[stable21] Let repair step query exceptions bubble up
 2021-11-30 14:33:43 +01:00
Christoph Wurst
56fb21769f Include previous execption for repair steps that don't exist 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-11-30 12:03:51 +00:00
Christoph Wurst
bb91d5bd69 Let repair step query exceptions bubble up 
And hide the type error caused by a constructor call with missing
arguments.

`new $repairStep();` only works for the rare case that no arguments are
required. Anything else will throw. Then we previously hid the trace of
the more important query exception.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-11-30 12:03:51 +00:00
Nextcloud bot
46a264b2a2
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-30 02:26:45 +00:00
Nextcloud bot
b1b5f9755b
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-29 02:25:31 +00:00
Nextcloud bot
d42c2ed50e
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-28 02:24:00 +00:00
Nextcloud bot
b675d50092
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-27 02:26:20 +00:00
MichaIng
6d8cf37f06
Merge pull request #29907 from nextcloud/backport/29902/stable21 
[stable21] Check for invalid characters before trimming
 2021-11-26 14:22:04 +01:00
Nextcloud bot
5bafc9a729
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-26 02:46:29 +00:00
MichaIng
e5daae9101
Merge pull request #29803 from nextcloud/backport/29632/stable21 
[stable21] fix imagecreatetruecolor() error
 2021-11-25 17:14:08 +01:00
MichaIng
5006fc178d
Merge pull request #28199 from nextcloud/backport/26936/stable21 
[stable21] better cleanup of filecache when deleting an external storage
 2021-11-25 17:10:29 +01:00
Joas Schilling
9cc47c5e1f Correctly set the response after a ClientException as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-11-25 15:34:35 +00:00
Joas Schilling
933a967896 Add an integration test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-11-25 15:34:35 +00:00
Joas Schilling
f700abc889 Check for invalid characters before trimming 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-11-25 15:34:35 +00:00
blizzz
2dd3b6f0b1
Merge pull request #29851 from nextcloud/backport/29836/stable21 
[stable21] Make sure mapping cache is cleared when deleting a user
 2021-11-25 13:08:04 +01:00
Nextcloud bot
df1f11ca00
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-25 02:25:26 +00:00
Pytal
0e1e95e372
Merge pull request #29883 from nextcloud/backport/28519/stable21 2021-11-24 11:03:59 -08:00
Julius Härtl
a830688418 Add active user count to occ user:report 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-11-24 14:03:52 +00:00
MichaIng
9db07032d5 Use pre-v22 query commands 
Signed-off-by: MichaIng <micha@dietpi.com>
 2021-11-24 14:47:23 +01:00
Robin Appelman
a3dc399e2f better cleanup of filecache when deleting an external storage 
this way it can delete the cache entries even with per-user credentials

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-11-24 14:47:23 +01:00
Christoph Wurst
d0c5a24f81
Merge pull request #29764 from nextcloud/backport/29752/stable21 
[stable21] Explicitly allow some routes without 2FA
 2021-11-24 14:39:05 +01:00
Nextcloud bot
28f41da186
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-24 02:26:17 +00:00
Vincent Petry
7f8c8b1462
Merge pull request #29853 from nextcloud/backport/29835/stable21 
[stable21] Fix getting subnet of ipv4 mapped ipv6 addresses
 2021-11-23 14:03:35 +01:00
Vincent Petry
264b329aaf Type hint in IpAddress 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
 2021-11-23 10:28:20 +00:00
Vincent Petry
d9a5f2867e Improve normalizer detecting IPv4 inside of IPv6 
The subnet for an IPv4 address inside of IPv6 is now returned in its
IPv4 form.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-11-23 10:28:20 +00:00
Vincent Petry
87af149292 Fix getting subnet of ipv4 mapped ipv6 addresses 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-11-23 10:28:20 +00:00
Côme Chilliet
fb376f5132 Test cache invalidation for AbstractMapping in test suite 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-11-23 10:23:14 +00:00
Côme Chilliet
23f42f3b50 Make sure mapping cache is cleared when deleting a user 
This avoids phantom remnants staying after user deletion

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-11-23 10:23:14 +00:00
MichaIng
fb701e344e
Merge pull request #29629 from nextcloud/backport/29611/stable21 
[stable21] Show most recently deleted files first in trash can
 2021-11-23 03:54:52 +01:00
Nextcloud bot
0102cb9e1a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-23 02:26:21 +00:00
MichaIng
cb84c089f0
Merge pull request #29840 from nextcloud/backport/29708/stable21 
[stable21] Do not print verbose info about app updates if there are none
 2021-11-22 23:31:37 +01:00
Christoph Wurst
d0689fb707 Do not print verbose info about app updates if there are none 
This is cosmetical but if you have a large number of apps installed then
you'll see a wall of text during the server and app upgrade when it
tries to update each app via the app store. In may cases nothing will be
updated. For those boring cases we can hide the verbose info, but show
when occ is run with -v. Any actual update will still print a few lines.
Those are the important ones for the admin.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-11-22 20:54:58 +01:00
Louis
1256331c77
Merge pull request #29810 from nextcloud/dependabot/composer/build/integration/stable21/sabre/dav-4.2.0 
Update sabre/dav requirement from 3.2.3 to 4.2.0 in /build/integration
 2021-11-22 15:32:58 +01:00
Louis Chemineau
c176dc2293 Manual compilation 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2021-11-22 11:32:37 +01:00
Louis
9e2381b10b
Merge pull request #29811 from nextcloud/dependabot/npm_and_yarn/stable21/camelcase-6.2.1 
Bump camelcase from 6.2.0 to 6.2.1
 2021-11-22 11:06:04 +01:00
Nextcloud bot
6b15557839
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-22 02:45:55 +00:00