Skip to content

Commit

Permalink
Merge branch 'master' into fix-double-dots-with-pipe-sendmail
Browse files Browse the repository at this point in the history
  • Loading branch information
FedericoHeichou authored Aug 24, 2023
2 parents 1f7e1fc + 313a06a commit bd74dbd
Show file tree
Hide file tree
Showing 1,594 changed files with 32,244 additions and 40,142 deletions.
120 changes: 0 additions & 120 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1591,126 +1591,6 @@ trigger:
- pull_request
- push

---
kind: pipeline
name: acceptance-app-files

steps:
- name: submodules
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
commands:
- git submodule update --init
- name: acceptance-app-files
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature

services:
- name: selenium
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
environment:
# Reduce default log level for Selenium server (INFO) as it is too
# verbose.
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: acceptance-app-files-sharing

steps:
- name: submodules
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
commands:
- git submodule update --init
- name: acceptance-app-files-sharing
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing.feature

services:
- name: selenium
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
environment:
# Reduce default log level for Selenium server (INFO) as it is too
# verbose.
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: acceptance-app-files-sharing-link

steps:
- name: submodules
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
commands:
- git submodule update --init
- name: acceptance-app-files-sharing-link
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing-link --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing-link.feature

services:
- name: selenium
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
environment:
# Reduce default log level for Selenium server (INFO) as it is too
# verbose.
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: acceptance-app-files-tags

steps:
- name: submodules
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
commands:
- git submodule update --init
- name: acceptance-app-files-tags
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-tags --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-tags.feature

services:
- name: selenium
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
environment:
# Reduce default log level for Selenium server (INFO) as it is too
# verbose.
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: acceptance-header
Expand Down
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
/apps/federation/appinfo/info.xml @datenangebot
/apps/files/appinfo/info.xml @skjnldsv @Pytal @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @Fenn-CS
/apps/files_external/appinfo/info.xml @icewind1991 @artonge
/apps/files_reminders/appinfo/info.xml @Pytal
/apps/files_sharing/appinfo/info.xml @skjnldsv @come-nc
/apps/files_trashbin/appinfo/info.xml @Pytal @icewind1991
/apps/files_versions/appinfo/info.xml @artonge @icewind1991
Expand All @@ -35,6 +36,10 @@
/apps/twofactor_backupcodes @ChristophWurst @miaulalala @nickvergessen @st3iny
/core/templates/twofactor* @ChristophWurst @miaulalala @nickvergessen @st3iny

# OpenAPI
openapi.json @provokateurin
ResponseDefinitions.php @provokateurin

# Personal interest
*/Activity/* @nickvergessen
*/Notifications/* @nickvergessen
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/command-pull-3rdparty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,23 @@ jobs:

steps:
- name: Add reaction on start
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.1
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
repository: ${{ github.event.repository.full_name }}
comment-id: ${{ github.event.comment.id }}
reaction-type: "+1"
reactions: "+1"

- name: Checkout the latest code
- name: Init branch
uses: xt0rted/pull-request-comment-branch@d97294d304604fa98a2600a6e2f916a84b596dc7 # v1
id: comment-branch

- name: Checkout ${{ steps.comment-branch.outputs.head_ref }}
uses: actions/checkout@v3
with:
fetch-depth: 0
token: ${{ secrets.COMMAND_BOT_PAT }}
ref: ${{ steps.comment-branch.outputs.head_ref }}

- name: Setup git
run: |
Expand All @@ -46,10 +51,10 @@ jobs:
git push
- name: Add reaction on failure
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.1
if: failure()
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
repository: ${{ github.event.repository.full_name }}
comment-id: ${{ github.event.comment.id }}
reaction-type: "-1"
reactions: "-1"
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: composer install --no-dev

- name: Read package.json node and npm engines version
uses: skjnldsv/read-package-engines-version-actions@0ce2ed60f6df073a62a77c0a4958dd0fc68e32e7 # v2.1
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
id: versions
with:
fallbackNode: "^14"
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/openapi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: OpenAPI

on:
pull_request:
push:
branches:
- master
- stable*

jobs:
openapi:
runs-on: ubuntu-latest

if: ${{ github.repository_owner != 'nextcloud-gmbh' }}

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set up php
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
extensions: xml
coverage: none
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Composer install
run: composer i

- name: OpenAPI checker
run: build/openapi-checker.sh
2 changes: 1 addition & 1 deletion .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
before.json
after.json
- uses: actions/github-script@v5
- uses: actions/github-script@v6
if: failure() && steps.compare.outcome == 'failure'
with:
github-token: ${{secrets.GITHUB_TOKEN}}
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/pr-feedback.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: 'Ask for feedback on PRs'
on:
schedule:
- cron: '30 1 * * *'

jobs:
pr-feedback:
runs-on: ubuntu-22.04
steps:
- name: The get-github-handles-from-website action
uses: marcelklehr/get-github-handles-from-website-action@a739600f6b91da4957f51db0792697afbb2f143c # v1.0.0
id: scrape
with:
website: 'https://nextcloud.com/team/'
- uses: marcelklehr/pr-feedback-action@601109aa729eb4c8d6d0ece7567b9d4901db4aef
with:
feedback-message: |
Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.
We hope that the reviewing process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR reviewing process.
Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6
Thank you for contributing to Nextcloud and we hope to hear from you soon!
days-before-feedback: 14
start-date: "2023-07-10"
exempt-authors: "${{ steps.scrape.outputs.users }}"
exempt-bots: true
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
issues: write

steps:
- uses: actions/stale@v5
- uses: actions/stale@v8
with:
repo-token: ${{ secrets.COMMAND_BOT_PAT }}
stale-issue-message: >
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
!/apps/sharebymail
!/apps/encryption
!/apps/files_external
!/apps/files_reminders
!/apps/files_sharing
!/apps/files_trashbin
!/apps/files_versions
Expand Down
13 changes: 13 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,17 @@
->notPath('node_modules')
->notPath('vendor')
->in(__DIR__);

// Ignore additional app directories
$rootDir = new \DirectoryIterator(__DIR__);
foreach ($rootDir as $node) {
if (str_starts_with($node->getFilename(), 'apps')) {
$return = shell_exec('git check-ignore ' . escapeshellarg($node->getFilename() . '/'));

if ($return !== null) {
$config->getFinder()->exclude($node->getFilename());
}
}
}

return $config;
7 changes: 6 additions & 1 deletion .tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ source_file = translationfiles/templates/files_external.pot
source_lang = en
type = PO

[o:nextcloud:p:nextcloud:r:files_reminders]
file_filter = translationfiles/<lang>/files_reminders.po
source_file = translationfiles/templates/files_reminders.pot
source_lang = en
type = PO

[o:nextcloud:p:nextcloud:r:files_sharing]
file_filter = translationfiles/<lang>/files_sharing.po
source_file = translationfiles/templates/files_sharing.pot
Expand Down Expand Up @@ -175,4 +181,3 @@ file_filter = translationfiles/<lang>/workflowengine.po
source_file = translationfiles/templates/workflowengine.pot
source_lang = en
type = PO

2 changes: 1 addition & 1 deletion 3rdparty
Submodule 3rdparty updated 36 files
+6 −0 .gitignore
+3 −4 composer.json
+67 −56 composer.lock
+1 −3 composer/autoload_classmap.php
+1 −1 composer/autoload_files.php
+2 −4 composer/autoload_static.php
+72 −61 composer/installed.json
+21 −21 composer/installed.php
+25 −27 deepdiver1975/tarstreamer/src/TarHeader.php
+37 −39 deepdiver1975/tarstreamer/src/TarStreamer.php
+1 −1 symfony/deprecation-contracts/function.php
+29 −71 symfony/event-dispatcher-contracts/Event.php
+13 −40 symfony/event-dispatcher-contracts/EventDispatcherInterface.php
+1 −1 symfony/event-dispatcher-contracts/LICENSE
+29 −0 symfony/event-dispatcher/Attribute/AsEventListener.php
+31 −72 symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
+0 −42 symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php
+16 −23 symfony/event-dispatcher/Debug/WrappedListener.php
+4 −0 symfony/event-dispatcher/DependencyInjection/AddEventAliasesPass.php
+75 −11 symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php
+0 −38 symfony/event-dispatcher/Event.php
+12 −46 symfony/event-dispatcher/EventDispatcher.php
+10 −22 symfony/event-dispatcher/EventDispatcherInterface.php
+1 −1 symfony/event-dispatcher/EventSubscriberInterface.php
+12 −14 symfony/event-dispatcher/GenericEvent.php
+7 −18 symfony/event-dispatcher/ImmutableEventDispatcher.php
+1 −1 symfony/event-dispatcher/LICENSE
+8 −124 symfony/event-dispatcher/LegacyEventDispatcherProxy.php
+0 −62 symfony/event-dispatcher/LegacyEventProxy.php
+1 −1 symfony/mailer/LICENSE
+1 −1 symfony/mailer/Transport/Smtp/Stream/ProcessStream.php
+9 −0 symfony/polyfill-php80/Resources/stubs/Attribute.php
+10 −1 symfony/polyfill-php80/Resources/stubs/PhpToken.php
+9 −0 symfony/polyfill-php80/Resources/stubs/Stringable.php
+9 −0 symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php
+9 −0 symfony/polyfill-php80/Resources/stubs/ValueError.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
/**
* @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
* @copyright Copyright (c) 2023 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
* @author John Molakvoæ <skjnldsv@protonmail.com>
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license AGPL-3.0-or-later
*
Expand All @@ -21,3 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

export const loadState = function(app: string, key: string, fallback?: any) {
return fallback
}
3 changes: 3 additions & 0 deletions __tests__/jest-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ import '@testing-library/jest-dom'

// Mock `window.location` with Jest spies and extend expect
import 'jest-location-mock'

// Mock `window.fetch` with Jest
import 'jest-fetch-mock'
2 changes: 1 addition & 1 deletion apps/admin_audit/l10n/he.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ OC.L10N.register(
"admin_audit",
{
"Auditing / Logging" : "פיקוח / תיעוד",
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "מספר יכולות תיעוד ל־Nextcloud כגון תיעוד גישה ליומן התיעוד או פעולות רגישות אחרות."
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "מספק יכולות תיעוד ל־Nextcloud כגון תיעוד גישה ליומן התיעוד או פעולות רגישות אחרות."
},
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
2 changes: 1 addition & 1 deletion apps/admin_audit/l10n/he.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ "translations": {
"Auditing / Logging" : "פיקוח / תיעוד",
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "מספר יכולות תיעוד ל־Nextcloud כגון תיעוד גישה ליומן התיעוד או פעולות רגישות אחרות."
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "מספק יכולות תיעוד ל־Nextcloud כגון תיעוד גישה ליומן התיעוד או פעולות רגישות אחרות."
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
}
8 changes: 8 additions & 0 deletions apps/cloud_federation_api/l10n/fa.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
OC.L10N.register(
"cloud_federation_api",
{
"Cloud Federation API" : "API فدراسیون ابری",
"Enable clouds to communicate with each other and exchange data" : "ابرها را فعال کنید تا با یکدیگر ارتباط برقرار کنند و داده ها را مبادله کنند",
"The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API نمونه های مختلف Nextcloud را قادر می سازد تا با یکدیگر ارتباط برقرار کرده و داده ها را مبادله کنند."
},
"nplurals=2; plural=(n > 1);");
6 changes: 6 additions & 0 deletions apps/cloud_federation_api/l10n/fa.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{ "translations": {
"Cloud Federation API" : "API فدراسیون ابری",
"Enable clouds to communicate with each other and exchange data" : "ابرها را فعال کنید تا با یکدیگر ارتباط برقرار کنند و داده ها را مبادله کنند",
"The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API نمونه های مختلف Nextcloud را قادر می سازد تا با یکدیگر ارتباط برقرار کرده و داده ها را مبادله کنند."
},"pluralForm" :"nplurals=2; plural=(n > 1);"
}
8 changes: 8 additions & 0 deletions apps/cloud_federation_api/l10n/vi.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
OC.L10N.register(
"cloud_federation_api",
{
"Cloud Federation API" : "Cloud Federation API",
"Enable clouds to communicate with each other and exchange data" : "Cho phép các đám mây giao tiếp với nhau và trao đổi dữ liệu",
"The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API Cloud Federation cho phép các phiên bản Nextcloud khác nhau giao tiếp với nhau và trao đổi dữ liệu."
},
"nplurals=1; plural=0;");
6 changes: 6 additions & 0 deletions apps/cloud_federation_api/l10n/vi.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{ "translations": {
"Cloud Federation API" : "Cloud Federation API",
"Enable clouds to communicate with each other and exchange data" : "Cho phép các đám mây giao tiếp với nhau và trao đổi dữ liệu",
"The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API Cloud Federation cho phép các phiên bản Nextcloud khác nhau giao tiếp với nhau và trao đổi dữ liệu."
},"pluralForm" :"nplurals=1; plural=0;"
}
Loading

0 comments on commit bd74dbd

Please sign in to comment.