upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-07-16 23:12:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 48
61028 commits 1029 branches 1232 tags 8.1 GiB
Commit graph

61028 commits

This branch
This branch
All branches
Author SHA1 Message Date
blizzz
bc52905ad0
Merge pull request #31878 from nextcloud/backport/31754/stable23 
[stable23] Fix incorrect if conditions in View
 2022-04-14 13:42:41 +02:00
blizzz
ee9ac5bcfb
Merge pull request #31836 from nextcloud/backport/31734/stable23 
[stable23] dont re-query fileinfo when getting dav quota
 2022-04-14 13:39:47 +02:00
blizzz
eee279de78
Merge pull request #31835 from nextcloud/backport/31816/stable23 
[stable23] Deduplicate storage ids in list before reusing
 2022-04-14 13:39:04 +02:00
blizzz
04c8cf4cad
Merge pull request #31804 from nextcloud/backport/31782/stable23 
[stable23] Fix ldap wizard styling
 2022-04-14 13:33:56 +02:00
blizzz
6df2e22871
Merge pull request #31540 from nextcloud/backport/31454/stable23 
[stable23] Fix the logger that is imported for critical actions
 2022-04-14 13:19:45 +02:00
blizzz
e4b68e4b37
Merge pull request #31521 from nextcloud/backport/31491/stable23 
[stable23] Fix duplicated UUID detection when there are empty uuids
 2022-04-14 13:18:38 +02:00
blizzz
ea3a9ba86e
Merge pull request #31453 from nextcloud/s3-primary-ci-23 
[stable23] Run tests with primary object storage in CI + large upload fixes
 2022-04-14 13:17:16 +02:00
Richard Steinmetz
fcd2e8f2ea Fix ldap wizard styling 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
 2022-04-14 11:07:58 +02:00
Côme Chilliet
aef9ba237f Fix incorrect if conditions in View 
($something->getPermissions() && Constants::PERMISSION_READ) does not
  make sense as PERMISSION_READ contant is 1 this will always evaluate to
  true.
getPersmissions is returning an int which is a bitwise combination as
  documented in the interface, so it should be used with bit operators.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-04-14 11:03:34 +02:00
Nextcloud bot
69262f83a7
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-14 02:28:56 +00:00
Robin Appelman
3da45428b6
dont re-query fileinfo when getting dav quota 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-04-13 16:22:21 +02:00
John Molakvoæ
df576c66fa
Merge pull request #31862 from nextcloud/update-autoloaders-and-node 2022-04-13 16:08:48 +02:00
Vincent Petry
c8e1143328
Merge pull request #31946 from nextcloud/s3-versioning-not-implemented-23 
[23] AmazonS3: allow not implemented versioning
 2022-04-13 13:21:42 +02:00
Vincent Petry
0444c15f68
Merge pull request #31940 from nextcloud/backport/31907/stable23 
[stable23] confirm user is internal to globalscale
 2022-04-13 13:20:58 +02:00
Vincent Petry
ce44d1526b
Merge pull request #31846 from nextcloud/backport/31684/stable23 
[stable23] take permissions from multiple paths into account for share permissions
 2022-04-13 13:18:57 +02:00
blizzz
268010183a
Merge pull request #31955 from nextcloud/backport/31933/stable23 
[stable23] update CRL after revocation of socialsharing_telegram.csr
 2022-04-13 09:37:49 +02:00
Vitor Mattos
fc1cacfec9 Update root.crt 
Reference: https://github.com/nextcloud/app-certificate-requests/pull/515

Signed-off-by: Vitor Mattos <vitor@php.rio>
 2022-04-13 07:36:32 +00:00
Nextcloud bot
221185f820
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-13 02:28:37 +00:00
MichaIng
81af11f8c3 Update autoloaders and Node package-lock.json 
Signed-off-by: MichaIng <micha@dietpi.com>
 2022-04-13 00:04:24 +02:00
Erik van Velzen
4d33494173
AmazonS3: allow not implemented versioning 
In case the S3 implementation does not implement versioning, set it to
false. Versioning was introduced in Nexcloud in commit
09ffac5e6d

This is needed for compatibility with the Storj gateway.

Signed-off-by: Erik van Velzen <erik@evanv.nl>
 2022-04-12 16:07:07 +02:00
Maxence Lange
7e31403dfa confirm user is internal to globalscale 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2022-04-12 12:17:20 +00:00
Nextcloud bot
8ec5401e34
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-12 02:27:59 +00:00
Joas Schilling
1f5f2fc1b0
Merge pull request #31882 from nextcloud/backport/31876/stable23 
[stable23] Fix \OC_App::getCurrentApp() when being called from CLI or phpunit
 2022-04-11 12:52:26 +02:00
Nextcloud bot
4a3f07bed8
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-11 02:28:11 +00:00
Nextcloud bot
f892955e7a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-10 02:33:57 +00:00
Nextcloud bot
0fa1cca179
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-09 02:27:53 +00:00
Nextcloud bot
f0f60cbacd
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-08 02:28:35 +00:00
Joas Schilling
8f77199366 Log exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-04-07 16:17:40 +00:00
Joas Schilling
2c238e4bf6 Fix \OC_App::getCurrentApp() when being called from CLI or phpunit 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-04-07 16:17:39 +00:00
Nextcloud bot
c17e72eff5
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-07 02:27:49 +00:00
Nextcloud bot
51f361f81a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-06 02:28:04 +00:00
Robin Appelman
aecbd1c841 take permissions from multiple paths into account for share permissions 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-04-05 15:41:58 +00:00
Nextcloud bot
b29f6f2f75
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-05 02:28:16 +00:00
Joas Schilling
961bf74ae4 Deduplicate storage ids in list before reusing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-04-04 17:18:04 +00:00
Nextcloud bot
d2a16ce034
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-04 02:27:27 +00:00
Nextcloud bot
add69e0a03
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-03 02:27:09 +00:00
Nextcloud bot
ccca757ad0
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-02 02:28:02 +00:00
Nextcloud bot
b404e3fda6
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-04-01 02:28:25 +00:00
Louis
45137b5ad2
Merge pull request #31774 from nextcloud/backport/31737/stable23 
[stable23] Wrap oauth2 migrations inside conditions
 2022-03-31 17:42:56 +02:00
Côme Chilliet
afc93afcaf
Merge pull request #31514 from nextcloud/backport/31421/stable23 
[stable23] user_ldap fix ldap connection resets #31421
 2022-03-31 14:18:01 +02:00
Louis Chemineau
0ce1d895d2 Wrap oauth2 migrations inside conditions 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-03-31 11:46:22 +00:00
Nextcloud bot
c1ecb0c3b4
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-03-31 02:29:48 +00:00
Simon L
784748fb9a
Merge pull request #31740 from nextcloud/backport/stable23/31537 
[stable23] show that the web updater is not recommended on big instances
 2022-03-31 00:35:55 +02:00
Nextcloud bot
3a52f06b04
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-03-30 02:27:41 +00:00
Côme Chilliet
ab6439a04b
Fix $baseDN parameter type in ILDAPWrapper::read 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-29 16:20:28 +02:00
Côme Chilliet
0b88d725b0
Inherit doc from interface in LDAP class 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-29 14:50:54 +02:00
Côme Chilliet
92415eaef7
Fix unit tests 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-29 13:47:52 +02:00
Louis
4a1f78ff3f
Merge pull request #31730 from nextcloud/backport/30276/stable23 
[stable23] Add oauth2_clients migration for Owncloud
 2022-03-29 10:39:06 +02:00
Louis
dd4b3003fb
Merge pull request #31733 from nextcloud/backport/31221/stable23 
[stable23] Don't create cards_abiduri it if already exists
 2022-03-29 10:36:11 +02:00
Côme Chilliet
414d4bf200 Fix executeRead when connection is reset because of a timeout 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-29 08:34:03 +00:00