Skip to content

Commit c38fd34

Browse files
authored
Merge branch 'master' into master
2 parents 48b1520 + 345167f commit c38fd34

File tree

657 files changed

+4863
-3738
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

657 files changed

+4863
-3738
lines changed

.github/CODEOWNERS

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ package-lock.json @nextcloud/server-dependabot
2424

2525
# App maintainers
2626
/apps/admin_audit/appinfo/info.xml @luka-nextcloud @blizzz
27-
/apps/cloud_federation_api/appinfo/info.xml @mejo-
28-
/apps/comments/appinfo/info.xml @edward-ly @Pytal
27+
/apps/cloud_federation_api/appinfo/info.xml @nfebe @mejo-
28+
/apps/comments/appinfo/info.xml @edward-ly @sorbaugh
2929
/apps/contactsinteraction/appinfo/info.xml @kesselb @SebastianKrupinski
3030
/apps/contactsinteraction/lib @kesselb @SebastianKrupinski
3131
/apps/contactsinteraction/tests @kesselb @SebastianKrupinski
@@ -36,21 +36,21 @@ package-lock.json @nextcloud/server-dependabot
3636
/apps/dav/tests/unit/CardDAV @hamza221 @SebastianKrupinski
3737
/apps/encryption/appinfo/info.xml @come-nc @icewind1991
3838
/apps/federatedfilesharing/appinfo/info.xml @icewind1991 @danxuliu
39-
/apps/federation/appinfo/info.xml @nfebe
40-
/apps/files/appinfo/info.xml @skjnldsv @Pytal @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @nfebe
39+
/apps/federation/appinfo/info.xml @nfebe @sorbaugh
40+
/apps/files/appinfo/info.xml @skjnldsv @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @nfebe
4141
/apps/files_external/appinfo/info.xml @icewind1991 @artonge
42-
/apps/files_reminders/appinfo/info.xml @Pytal
42+
/apps/files_reminders/appinfo/info.xml @skjnldsv @sorbaugh
4343
/apps/files_sharing/appinfo/info.xml @skjnldsv @come-nc
44-
/apps/files_trashbin/appinfo/info.xml @Pytal @icewind1991
44+
/apps/files_trashbin/appinfo/info.xml @icewind1991 @sorbaugh
4545
/apps/files_versions/appinfo/info.xml @artonge @icewind1991
4646
/apps/oauth2/appinfo/info.xml @julien-nc @ChristophWurst
4747
/apps/provisioning_api/appinfo/info.xml @provokateurin @nickvergessen
48-
/apps/settings/appinfo/info.xml @Pytal @JuliaKirschenheuter
49-
/apps/sharebymail/appinfo/info.xml @Altahrim
48+
/apps/settings/appinfo/info.xml @JuliaKirschenheuter @sorbaugh
49+
/apps/sharebymail/appinfo/info.xml @Altahrim @skjnldsv
5050
/apps/systemtags/appinfo/info.xml @Antreesy @marcelklehr
5151
/apps/theming/appinfo/info.xml @skjnldsv @juliusknorr
5252
/apps/twofactor_backupcodes/appinfo/info.xml @st3iny @miaulalala @ChristophWurst
53-
/apps/updatenotification/appinfo/info.xml @Pytal @JuliaKirschenheuter
53+
/apps/updatenotification/appinfo/info.xml @JuliaKirschenheuter @sorbaugh
5454
/apps/user_ldap/appinfo/info.xml @come-nc @blizzz
5555
/apps/user_status/appinfo/info.xml @Antreesy @nickvergessen
5656
/apps/weather_status/appinfo/info.xml @julien-nc @juliusknorr
@@ -80,8 +80,8 @@ package-lock.json @nextcloud/server-dependabot
8080
/core/routes.php @Altahrim @nextcloud/server-backend
8181

8282
# OpenAPI
83-
openapi*.json @provokateurin
84-
ResponseDefinitions.php @provokateurin
83+
openapi*.json @provokateurin @nextcloud/server-backend
84+
ResponseDefinitions.php @provokateurin @nextcloud/server-backend
8585

8686
# Talk team
8787
/lib/private/Comments @nickvergessen @nextcloud/talk-backend

.github/dependabot.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ updates:
8181
day: saturday
8282
time: "03:00"
8383
timezone: Europe/Paris
84-
open-pull-requests-limit: 10
84+
open-pull-requests-limit: 20
8585
labels:
8686
- "3. to review"
8787
- "feature: dependencies"
@@ -121,6 +121,7 @@ updates:
121121
day: saturday
122122
time: "03:00"
123123
timezone: Europe/Paris
124+
open-pull-requests-limit: 20
124125
target-branch: stable29
125126
labels:
126127
- "3. to review"
@@ -140,6 +141,7 @@ updates:
140141
day: saturday
141142
time: "03:00"
142143
timezone: Europe/Paris
144+
open-pull-requests-limit: 20
143145
target-branch: stable30
144146
labels:
145147
- "3. to review"
@@ -159,6 +161,7 @@ updates:
159161
day: saturday
160162
time: "03:00"
161163
timezone: Europe/Paris
164+
open-pull-requests-limit: 20
162165
target-branch: stable31
163166
labels:
164167
- "3. to review"

.github/workflows/autocheckers.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ jobs:
110110
- name: Check that all and only expected files are included
111111
run: php ./build/files-checker.php
112112

113+
- name: Check that all shipped apps are linted by psalm
114+
run: sh ./build/psalm-checker.sh
115+
113116
summary:
114117
permissions:
115118
contents: none

.scrutinizer.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
-->
66
# Nextcloud Server ☁
77
[![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server)
8-
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
98
[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
109
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
1110
[![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)

apps/admin_audit/l10n/lv.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ OC.L10N.register(
22
"admin_audit",
33
{
44
"Auditing / Logging" : "Auditēšana / Žurnalizēšana",
5-
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalizēšanas iespējas, piemēram, faila piekļuves žurnalizēšanu vai citas sensitīvas darbības."
5+
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalēšanas spējas, piemēram, datņu piekļuves žurnalēšanu vai citas jūtīgas darbības."
66
},
77
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");

apps/admin_audit/l10n/lv.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ "translations": {
22
"Auditing / Logging" : "Auditēšana / Žurnalizēšana",
3-
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalizēšanas iespējas, piemēram, faila piekļuves žurnalizēšanu vai citas sensitīvas darbības."
3+
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalēšanas spējas, piemēram, datņu piekļuves žurnalēšanu vai citas jūtīgas darbības."
44
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
55
}

apps/admin_audit/l10n/pt_BR.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ OC.L10N.register(
22
"admin_audit",
33
{
44
"Auditing / Logging" : "Auditoria / Registro",
5-
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece habilidades de registro para o NextCloud, como acessos de arquivo de log ou ações sensíveis."
5+
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para o Nextcloud, como acessos a arquivos de registro ou outras ações sensíveis."
66
},
77
"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");

apps/admin_audit/l10n/pt_BR.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ "translations": {
22
"Auditing / Logging" : "Auditoria / Registro",
3-
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece habilidades de registro para o NextCloud, como acessos de arquivo de log ou ações sensíveis."
3+
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para o Nextcloud, como acessos a arquivos de registro ou outras ações sensíveis."
44
},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
55
}

apps/cloud_federation_api/lib/Capabilities.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
use NCU\Security\Signature\Exceptions\SignatoryException;
1313
use OC\OCM\OCMSignatoryManager;
1414
use OCP\Capabilities\ICapability;
15+
use OCP\Capabilities\IInitialStateExcludedCapability;
1516
use OCP\IAppConfig;
1617
use OCP\IURLGenerator;
1718
use OCP\OCM\Exceptions\OCMArgumentException;
1819
use OCP\OCM\IOCMProvider;
1920
use Psr\Log\LoggerInterface;
2021

21-
class Capabilities implements ICapability {
22+
class Capabilities implements ICapability, IInitialStateExcludedCapability {
2223
public const API_VERSION = '1.1'; // informative, real version.
2324

2425
public function __construct(
@@ -54,15 +55,13 @@ public function __construct(
5455
*/
5556
public function getCapabilities() {
5657
$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
57-
58-
$this->provider->setEnabled(true);
59-
$this->provider->setApiVersion(self::API_VERSION);
60-
6158
$pos = strrpos($url, '/');
6259
if ($pos === false) {
63-
throw new OCMArgumentException('generated route should contains a slash character');
60+
throw new OCMArgumentException('generated route should contain a slash character');
6461
}
6562

63+
$this->provider->setEnabled(true);
64+
$this->provider->setApiVersion(self::API_VERSION);
6665
$this->provider->setEndPoint(substr($url, 0, $pos));
6766

6867
$resource = $this->provider->createNewResourceType();
@@ -87,6 +86,6 @@ public function getCapabilities() {
8786
$this->logger->warning('cannot generate local signatory', ['exception' => $e]);
8887
}
8988

90-
return ['ocm' => json_decode(json_encode($this->provider->jsonSerialize()), true)];
89+
return ['ocm' => $this->provider->jsonSerialize()];
9190
}
9291
}

0 commit comments

Comments
 (0)