Skip to content

Commit

Permalink
Merge branch 'nextcloud:master' into pdo-attr-persistent
Browse files Browse the repository at this point in the history
  • Loading branch information
Retidurc authored Aug 10, 2022
2 parents 17377e8 + 22d35db commit 2cf052c
Show file tree
Hide file tree
Showing 680 changed files with 5,002 additions and 2,037 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/command-rebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ on:
issue_comment:
types: created

permissions:
contents: read

jobs:
rebase:
runs-on: ubuntu-latest
permissions:
contents: none

# On pull requests and if the comment starts with `/rebase`
if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
Expand All @@ -32,7 +37,7 @@ jobs:
token: ${{ secrets.COMMAND_BOT_PAT }}

- name: Automatic Rebase
uses: cirrus-actions/rebase@1.6
uses: cirrus-actions/rebase@1.7
env:
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}

Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ on:
- master
- stable*

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -50,10 +53,12 @@ jobs:

- name: Check webpack build changes
run: |
bash -c "[[ ! \"`git status --porcelain `\" ]] || exit 1"
bash -c "[[ ! \"`git status --porcelain `\" ]] || (echo 'Please recompile and commit the assets, see the section \"Show changes on failure\" for details' && exit 1)"
- name: Show changes on failure
if: failure()
run: |
git status
git --no-pager diff
exit 1 # make it red to grab attention
1 change: 1 addition & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
for your contributions.
stale-issue-label: 'stale'
only-labels: 'needs info'
labels-to-remove-when-unstale: 'needs info,stale'
exempt-issue-labels: '1. to develop,2. developing,3. to review,4. to release,security'
days-before-stale: 30
days-before-close: 14
Expand Down
4 changes: 2 additions & 2 deletions apps/comments/l10n/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ OC.L10N.register(
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Benutzer erwähnt",
"{user} mentioned you in a comment on \"{file}\"" : "{user} hat Dich in einem Kommentar zu \"{file}\" erwähnt",
"{user} mentioned you in a comment on \"{file}\"" : "{user} hat dich in einem Kommentar zu \"{file}\" erwähnt",
"Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
"Edit comment" : "Kommentar bearbeiten",
"Delete comment" : "Kommentar löschen",
Expand All @@ -29,6 +29,6 @@ OC.L10N.register(
"An error occurred while trying to delete the comment" : "Es ist ein Fehler beim Löschen des Kommentars aufgetreten",
"An error occurred while trying to create the comment" : "Es ist ein Fehler beim Erstellen des Kommentars aufgetreten",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Benutzer erwähnt",
"{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt"
"{user} mentioned you in a comment on “{file}”" : "{user} hat dich in einem Kommentar zu “{file}” erwähnt"
},
"nplurals=2; plural=(n != 1);");
4 changes: 2 additions & 2 deletions apps/comments/l10n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Benutzer erwähnt",
"{user} mentioned you in a comment on \"{file}\"" : "{user} hat Dich in einem Kommentar zu \"{file}\" erwähnt",
"{user} mentioned you in a comment on \"{file}\"" : "{user} hat dich in einem Kommentar zu \"{file}\" erwähnt",
"Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
"Edit comment" : "Kommentar bearbeiten",
"Delete comment" : "Kommentar löschen",
Expand All @@ -27,6 +27,6 @@
"An error occurred while trying to delete the comment" : "Es ist ein Fehler beim Löschen des Kommentars aufgetreten",
"An error occurred while trying to create the comment" : "Es ist ein Fehler beim Erstellen des Kommentars aufgetreten",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Benutzer erwähnt",
"{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt"
"{user} mentioned you in a comment on “{file}”" : "{user} hat dich in einem Kommentar zu “{file}” erwähnt"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
6 changes: 3 additions & 3 deletions apps/dashboard/l10n/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ OC.L10N.register(
{
"Dashboard" : "Dashboard",
"Dashboard app" : "Dashboard-App",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an\noverview of your upcoming appointments, urgent emails, chat messages,\nincoming tickets, latest tweets and much more! Users can add the widgets\nthey like and change the background to their liking." : "Starte informiert in den Tag\n\nDas Nextcloud-Dashboard ist Dein Ausgangspunkt für den Tag und gibt Dir\neinen Überblick über Deine anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neuste Tweets und vieles mehr! Benutzer können die Widgets hinzufügen, die sie mögen und den Hintergrund nach ihren Wünschen angepassen.",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an\noverview of your upcoming appointments, urgent emails, chat messages,\nincoming tickets, latest tweets and much more! Users can add the widgets\nthey like and change the background to their liking." : "Starte informiert in den Tag\n\nDas Nextcloud-Dashboard ist dein Ausgangspunkt für den Tag und gibt Dir\neinen Überblick über deine anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neuste Tweets und vieles mehr! Benutzer können die Widgets hinzufügen, die sie mögen und den Hintergrund nach ihren Wünschen angepassen.",
"Customize" : "Anpassen",
"Edit widgets" : "Widgets bearbeiten",
"Get more widgets from the App Store" : "Hole Dir weitere Widgets aus dem App-Store",
"Get more widgets from the App Store" : "Hole dir weitere Widgets aus dem App-Store",
"Change background image" : "Hintergrundbild ändern",
"Weather service" : "Wetterdienst",
"For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Zu Deinem Datenschutz werden die Wetterdaten von Deinen Nextcloud-Server für Dich angefordert, so dass der Wetterdienst keine persönlichen Informationen erhält.",
"For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Zu deinem Datenschutz werden die Wetterdaten von deinen Nextcloud-Server für dich angefordert, so dass der Wetterdienst keine persönlichen Informationen erhält.",
"Weather data from Met.no" : "Wetterdaten von Met.no",
"geocoding with Nominatim" : "Geokodierung mit Nominatim",
"elevation data from OpenTopoData" : "Höhendaten von OpenTopoData",
Expand Down
6 changes: 3 additions & 3 deletions apps/dashboard/l10n/de.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ "translations": {
"Dashboard" : "Dashboard",
"Dashboard app" : "Dashboard-App",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an\noverview of your upcoming appointments, urgent emails, chat messages,\nincoming tickets, latest tweets and much more! Users can add the widgets\nthey like and change the background to their liking." : "Starte informiert in den Tag\n\nDas Nextcloud-Dashboard ist Dein Ausgangspunkt für den Tag und gibt Dir\neinen Überblick über Deine anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neuste Tweets und vieles mehr! Benutzer können die Widgets hinzufügen, die sie mögen und den Hintergrund nach ihren Wünschen angepassen.",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an\noverview of your upcoming appointments, urgent emails, chat messages,\nincoming tickets, latest tweets and much more! Users can add the widgets\nthey like and change the background to their liking." : "Starte informiert in den Tag\n\nDas Nextcloud-Dashboard ist dein Ausgangspunkt für den Tag und gibt Dir\neinen Überblick über deine anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neuste Tweets und vieles mehr! Benutzer können die Widgets hinzufügen, die sie mögen und den Hintergrund nach ihren Wünschen angepassen.",
"Customize" : "Anpassen",
"Edit widgets" : "Widgets bearbeiten",
"Get more widgets from the App Store" : "Hole Dir weitere Widgets aus dem App-Store",
"Get more widgets from the App Store" : "Hole dir weitere Widgets aus dem App-Store",
"Change background image" : "Hintergrundbild ändern",
"Weather service" : "Wetterdienst",
"For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Zu Deinem Datenschutz werden die Wetterdaten von Deinen Nextcloud-Server für Dich angefordert, so dass der Wetterdienst keine persönlichen Informationen erhält.",
"For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Zu deinem Datenschutz werden die Wetterdaten von deinen Nextcloud-Server für dich angefordert, so dass der Wetterdienst keine persönlichen Informationen erhält.",
"Weather data from Met.no" : "Wetterdaten von Met.no",
"geocoding with Nominatim" : "Geokodierung mit Nominatim",
"elevation data from OpenTopoData" : "Höhendaten von OpenTopoData",
Expand Down
32 changes: 32 additions & 0 deletions apps/dashboard/l10n/nb.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
OC.L10N.register(
"dashboard",
{
"Dashboard" : "Instrumentpanel",
"Dashboard app" : "Instrumentpanel app",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an\noverview of your upcoming appointments, urgent emails, chat messages,\nincoming tickets, latest tweets and much more! Users can add the widgets\nthey like and change the background to their liking." : "Start dagen din informert \n\nNextcloud skrivebordet er starte punktet ditt for dagen, gir deg kommende møter, viktig email, chat-meldinger\ninnkommende biletter, seneste tweets og mye mer! Brukere kan legge til widgeter\nde liker og forandre bakgrunnen etter deres smak.",
"Customize" : "Tilpass",
"Edit widgets" : "Rediger widgets",
"Get more widgets from the App Store" : "Få flere widgets fra App Store",
"Change background image" : "Endre bakgrunnsbilde",
"Weather service" : "Værmelding",
"For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Av hensyn til personvernet ditt blir værdataene bedt om av Nextcloud-serveren din på dine vegne, slik at værtjenesten ikke mottar personlig informasjon.",
"Weather data from Met.no" : "Værmelding fra Met.no",
"geocoding with Nominatim" : "geokoding med Nominatim",
"elevation data from OpenTopoData" : "høydedata fra OpenTopoData",
"Weather" : "Vær",
"Status" : "Status",
"Good morning" : "God morgen",
"Good morning, {name}" : "God morgen, {name}",
"Good afternoon" : "God ettermiddag",
"Good afternoon, {name}" : "Good ettermiddag, {name}",
"Good evening" : "God kveld",
"Good evening, {name}" : "God kveld, {name}",
"Hello" : "Hallo",
"Hello, {name}" : "Hallo, {name}",
"Pick from Files" : "Velg fra Filer",
"Default images" : "Standardbilde",
"Plain background" : "Ensfarget bakgrunn",
"Insert from {productName}" : "Sett inn fra {productName}",
"Show something" : "Vis noe"
},
"nplurals=2; plural=(n != 1);");
30 changes: 30 additions & 0 deletions apps/dashboard/l10n/nb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ "translations": {
"Dashboard" : "Instrumentpanel",
"Dashboard app" : "Instrumentpanel app",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an\noverview of your upcoming appointments, urgent emails, chat messages,\nincoming tickets, latest tweets and much more! Users can add the widgets\nthey like and change the background to their liking." : "Start dagen din informert \n\nNextcloud skrivebordet er starte punktet ditt for dagen, gir deg kommende møter, viktig email, chat-meldinger\ninnkommende biletter, seneste tweets og mye mer! Brukere kan legge til widgeter\nde liker og forandre bakgrunnen etter deres smak.",
"Customize" : "Tilpass",
"Edit widgets" : "Rediger widgets",
"Get more widgets from the App Store" : "Få flere widgets fra App Store",
"Change background image" : "Endre bakgrunnsbilde",
"Weather service" : "Værmelding",
"For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Av hensyn til personvernet ditt blir værdataene bedt om av Nextcloud-serveren din på dine vegne, slik at værtjenesten ikke mottar personlig informasjon.",
"Weather data from Met.no" : "Værmelding fra Met.no",
"geocoding with Nominatim" : "geokoding med Nominatim",
"elevation data from OpenTopoData" : "høydedata fra OpenTopoData",
"Weather" : "Vær",
"Status" : "Status",
"Good morning" : "God morgen",
"Good morning, {name}" : "God morgen, {name}",
"Good afternoon" : "God ettermiddag",
"Good afternoon, {name}" : "Good ettermiddag, {name}",
"Good evening" : "God kveld",
"Good evening, {name}" : "God kveld, {name}",
"Hello" : "Hallo",
"Hello, {name}" : "Hallo, {name}",
"Pick from Files" : "Velg fra Filer",
"Default images" : "Standardbilde",
"Plain background" : "Ensfarget bakgrunn",
"Insert from {productName}" : "Sett inn fra {productName}",
"Show something" : "Vis noe"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
1 change: 1 addition & 0 deletions apps/dav/composer/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@
'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite' => $baseDir . '/../lib/DAV/Sharing/Xml/Invite.php',
'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest' => $baseDir . '/../lib/DAV/Sharing/Xml/ShareRequest.php',
'OCA\\DAV\\DAV\\SystemPrincipalBackend' => $baseDir . '/../lib/DAV/SystemPrincipalBackend.php',
'OCA\\DAV\\DAV\\ViewOnlyPlugin' => $baseDir . '/../lib/DAV/ViewOnlyPlugin.php',
'OCA\\DAV\\Db\\Direct' => $baseDir . '/../lib/Db/Direct.php',
'OCA\\DAV\\Db\\DirectMapper' => $baseDir . '/../lib/Db/DirectMapper.php',
'OCA\\DAV\\Direct\\DirectFile' => $baseDir . '/../lib/Direct/DirectFile.php',
Expand Down
1 change: 1 addition & 0 deletions apps/dav/composer/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ class ComposerStaticInitDAV
'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Xml/Invite.php',
'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Xml/ShareRequest.php',
'OCA\\DAV\\DAV\\SystemPrincipalBackend' => __DIR__ . '/..' . '/../lib/DAV/SystemPrincipalBackend.php',
'OCA\\DAV\\DAV\\ViewOnlyPlugin' => __DIR__ . '/..' . '/../lib/DAV/ViewOnlyPlugin.php',
'OCA\\DAV\\Db\\Direct' => __DIR__ . '/..' . '/../lib/Db/Direct.php',
'OCA\\DAV\\Db\\DirectMapper' => __DIR__ . '/..' . '/../lib/Db/DirectMapper.php',
'OCA\\DAV\\Direct\\DirectFile' => __DIR__ . '/..' . '/../lib/Direct/DirectFile.php',
Expand Down
Loading

0 comments on commit 2cf052c

Please sign in to comment.