Skip to content

Commit

Permalink
Merge branch 'nextcloud:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
tsdicloud authored Jun 12, 2023
2 parents 2472218 + a85831a commit d0748cd
Show file tree
Hide file tree
Showing 223 changed files with 2,377 additions and 1,674 deletions.
15 changes: 5 additions & 10 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ body:
options:
- label: This is a **bug**, not a question or a configuration/webserver/proxy issue.
required: true
- label: This issue is **not** already reported on Github _(I've searched it)_.
- label: This issue is **not** already reported on [Github](https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3Abug) OR [Nextcloud Community Forum](https://help.nextcloud.com/) _(I've searched it)_.
required: true
- label: Nextcloud Server **is** up to date. See [Maintenance and Release Schedule](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule) for supported versions.
required: true
- label: Nextcloud Server **is** running on 64bit capable CPU, PHP and OS.
required: true
- label: I agree to follow Nextcloud's [Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/).
required: true
- type: textarea
Expand Down Expand Up @@ -78,9 +76,9 @@ body:
Select Nextcloud Server version.
_Versions not listed here are not maintained and not supported anymore_
options:
- "24"
- "25"
- "26"
- "27"
- "master"
validations:
required: true
Expand All @@ -103,10 +101,10 @@ body:
Select PHP engine version serving Nextcloud Server.
_Describe in the "Additional info" section if you chose "Other"._
options:
- "PHP 7.3"
- "PHP 7.4"
- "PHP 8.0"
- "PHP 8.1"
- "PHP 8.2"
- "Other"
- type: dropdown
id: webserver
Expand All @@ -118,7 +116,6 @@ body:
options:
- "Apache (supported)"
- "Nginx"
- "Lighttpd"
- "Other"
- type: dropdown
id: database
Expand All @@ -141,8 +138,8 @@ body:
description: |
Select if bug is present after an update or on a fresh install.
options:
- "Updated from a minor version (ex. 22.2.3 to 22.2.4)"
- "Updated to a major version (ex. 22.2.3 to 23.0.1)"
- "Updated from a MINOR version (ex. 22.1 to 22.2)"
- "Upgraded to a MAJOR version (ex. 22 to 23)"
- "Fresh Nextcloud Server install"
- type: dropdown
id: encryption
Expand Down Expand Up @@ -192,8 +189,6 @@ body:
```
> NOTE: This will be automatically formatted into code for better readability.
render: shell
validations:
required: true
- type: textarea
id: nextcloud-signingstatus
attributes:
Expand Down
49 changes: 30 additions & 19 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,32 @@ on:
- stable*

env:
APP_NAME: viewer
BRANCH: ${{ github.ref }}
APP_NAME: server
BRANCH: ${{ github.base_ref }}
TESTING: true

jobs:
init:
runs-on: ubuntu-latest

if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
outputs:
nodeVersion: ${{ steps.versions.outputs.nodeVersion }}
npmVersion: ${{ steps.versions.outputs.npmVersion }}

steps:
- name: Checkout server
uses: actions/checkout@v3
- name: Checkout app
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

- name: Read package.json node and npm engines version
uses: skjnldsv/read-package-engines-version-actions@v1.2
uses: skjnldsv/read-package-engines-version-actions@0ce2ed60f6df073a62a77c0a4958dd0fc68e32e7 # v2.1
id: versions
with:
fallbackNode: "^12"
fallbackNpm: "^6"
fallbackNode: "^14"
fallbackNpm: "^7"

- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
uses: actions/setup-node@v3
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
with:
cache: "npm"
cache: 'npm'
node-version: ${{ steps.versions.outputs.nodeVersion }}

- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
Expand All @@ -44,10 +45,10 @@ jobs:
TESTING=true npm run build --if-present
- name: Save context
uses: actions/cache@v3
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
with:
key: cypress-context-${{ github.run_id }}
path: /home/runner/work/server
path: ./

cypress:
runs-on: ubuntu-latest
Expand All @@ -63,14 +64,24 @@ jobs:

steps:
- name: Restore context
uses: actions/cache@v3
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
with:
fail-on-cache-miss: true
key: cypress-context-${{ github.run_id }}
path: /home/runner/work/server
path: ./

- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
- name: Set up node ${{ needs.init.outputs.nodeVersion }}
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
with:
cache: 'npm'
node-version: ${{ needs.init.outputs.nodeVersion }}

uses: cypress-io/github-action@v5
- name: Set up npm ${{ needs.init.outputs.npmVersion }}
run: npm i -g npm@"${{ needs.init.outputs.npmVersion }}"


- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
uses: cypress-io/github-action@db1693016f23ccf9043f4b2428f9b04e5d502a73 # v5.8.1
with:
record: true
parallel: true
Expand All @@ -96,7 +107,7 @@ jobs:
run: docker logs nextcloud-cypress-tests-server > nextcloud.log

- name: Upload NC logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
if: failure() && matrix.containers != 'component'
with:
name: nc_logs_${{ matrix.containers }}
Expand All @@ -107,7 +118,7 @@ jobs:
run: docker exec nextcloud-cypress-tests-server tar -cvjf - data > data.tar

- name: Upload data dir archive
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
if: failure() && matrix.containers != 'component'
with:
name: nc_data_${{ matrix.containers }}
Expand Down
2 changes: 1 addition & 1 deletion .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</IfModule>

# Add cache control for static resources
<FilesMatch "\.(css|js|svg|gif|png|jpg|ico|wasm|tflite)$">
<FilesMatch "\.(css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite)$">
<If "%{QUERY_STRING} =~ /(^|&)v=/">
Header set Cache-Control "max-age=15778463, immutable"
</If>
Expand Down
1 change: 1 addition & 0 deletions apps/comments/l10n/fi.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ OC.L10N.register(
"No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
"No more messages" : "Ei enempää viestejä",
"Retry" : "Yritä uudelleen",
"Failed to mark comments as read" : "Kommenttien merkitseminen luetuksi epäonnistui",
"Unable to load the comments list" : "Kommenttilistaa ei voitu ladata",
"_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
"_1 new comment_::_{unread} new comments_" : ["1 uusi kommentti","{unread} uutta kommenttia"],
Expand Down
1 change: 1 addition & 0 deletions apps/comments/l10n/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
"No more messages" : "Ei enempää viestejä",
"Retry" : "Yritä uudelleen",
"Failed to mark comments as read" : "Kommenttien merkitseminen luetuksi epäonnistui",
"Unable to load the comments list" : "Kommenttilistaa ei voitu ladata",
"_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
"_1 new comment_::_{unread} new comments_" : ["1 uusi kommentti","{unread} uutta kommenttia"],
Expand Down
1 change: 1 addition & 0 deletions apps/comments/l10n/hu.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ OC.L10N.register(
"No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdje el a beszélgetést!",
"No more messages" : "Nincs több üzenet",
"Retry" : "Újra",
"Failed to mark comments as read" : "A hozzászólások olvasottnak jelölése sikertelen",
"Unable to load the comments list" : "A hozzászólások betöltése sikertelen",
"_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
"_1 new comment_::_{unread} new comments_" : ["1 új hozzászólás","{unread} új hozzászólás"],
Expand Down
1 change: 1 addition & 0 deletions apps/comments/l10n/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdje el a beszélgetést!",
"No more messages" : "Nincs több üzenet",
"Retry" : "Újra",
"Failed to mark comments as read" : "A hozzászólások olvasottnak jelölése sikertelen",
"Unable to load the comments list" : "A hozzászólások betöltése sikertelen",
"_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
"_1 new comment_::_{unread} new comments_" : ["1 új hozzászólás","{unread} új hozzászólás"],
Expand Down
4 changes: 2 additions & 2 deletions apps/dashboard/l10n/ar.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
OC.L10N.register(
"dashboard",
{
"Dashboard" : "لوحة التحكم",
"Dashboard app" : "تطبيق لوحة التحكم",
"Dashboard" : "الرئيسية",
"Dashboard app" : "تطبيق الصفحة الرئيسية",
"Customize" : "تعديل",
"Edit widgets" : "تعديل الودجات",
"Weather service" : "خدمة احوال الطقس",
Expand Down
4 changes: 2 additions & 2 deletions apps/dashboard/l10n/ar.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ "translations": {
"Dashboard" : "لوحة التحكم",
"Dashboard app" : "تطبيق لوحة التحكم",
"Dashboard" : "الرئيسية",
"Dashboard app" : "تطبيق الصفحة الرئيسية",
"Customize" : "تعديل",
"Edit widgets" : "تعديل الودجات",
"Weather service" : "خدمة احوال الطقس",
Expand Down
5 changes: 5 additions & 0 deletions apps/dav/l10n/fi.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ OC.L10N.register(
"%1$s via %2$s" : "%1$s palvelun %2$s kautta",
"Cancelled: %1$s" : "Peruutettu: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" on peruttu",
"%1$s has accepted your invitation" : "%1$s on hyväksynyt kutsusi",
"%1$s has declined your invitation" : "%1$s on kieltäytynyt kutsustasi",
"%1$s has responded to your invitation" : "%1$s on vastannut kutsuusi",
"Invitation updated: %1$s" : "Kutsu päivitetty: %1$s",
"%1$s updated the event \"%2$s\"" : "%1$s päivitti tapahtuman \"%2$s\"",
"Invitation: %1$s" : "Kutsu: %1$s",
"Organizer:" : "Järjestäjä:",
"Attendees:" : "Osallistujat:",
Expand Down Expand Up @@ -92,6 +96,7 @@ OC.L10N.register(
"{actor} updated contact {card} in address book {addressbook}" : "{actor} päivitti yhteystietoa {card} osoitekirjassa {addressbook}",
"You updated contact {card} in address book {addressbook}" : "Päivitit yhteystiedon {card} osoitekirjassa {addressbook}",
"A <strong>contact</strong> or <strong>address book</strong> was modified" : "<strong>Yhteystietoa</strong> tai <strong>osoitekirjaa</strong> muokattiin",
"Accounts" : "Tilit",
"File is not updatable: %1$s" : "Tiedosto ei ole päivitettävissä: %1$s",
"_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"],
"Failed to check file size: %1$s" : "Tiedoston koon tarkistaminen epäonnistui: %1$s",
Expand Down
5 changes: 5 additions & 0 deletions apps/dav/l10n/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@
"%1$s via %2$s" : "%1$s palvelun %2$s kautta",
"Cancelled: %1$s" : "Peruutettu: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" on peruttu",
"%1$s has accepted your invitation" : "%1$s on hyväksynyt kutsusi",
"%1$s has declined your invitation" : "%1$s on kieltäytynyt kutsustasi",
"%1$s has responded to your invitation" : "%1$s on vastannut kutsuusi",
"Invitation updated: %1$s" : "Kutsu päivitetty: %1$s",
"%1$s updated the event \"%2$s\"" : "%1$s päivitti tapahtuman \"%2$s\"",
"Invitation: %1$s" : "Kutsu: %1$s",
"Organizer:" : "Järjestäjä:",
"Attendees:" : "Osallistujat:",
Expand Down Expand Up @@ -90,6 +94,7 @@
"{actor} updated contact {card} in address book {addressbook}" : "{actor} päivitti yhteystietoa {card} osoitekirjassa {addressbook}",
"You updated contact {card} in address book {addressbook}" : "Päivitit yhteystiedon {card} osoitekirjassa {addressbook}",
"A <strong>contact</strong> or <strong>address book</strong> was modified" : "<strong>Yhteystietoa</strong> tai <strong>osoitekirjaa</strong> muokattiin",
"Accounts" : "Tilit",
"File is not updatable: %1$s" : "Tiedosto ei ole päivitettävissä: %1$s",
"_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"],
"Failed to check file size: %1$s" : "Tiedoston koon tarkistaminen epäonnistui: %1$s",
Expand Down
8 changes: 4 additions & 4 deletions apps/dav/l10n/gl.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ OC.L10N.register(
"Could not open file" : "Non se puido abrir o ficheiro",
"Encryption not ready: %1$s" : "O cifrado non está listo: %1$s",
"Failed to open file: %1$s" : "Produciuse un erro ao abrir o ficheiro: %1$s",
"Failed to unlink: %1$s" : "Produciuse un erro ao desvincular: %1$s",
"Failed to unlink: %1$s" : "Produciuse un erro ao desligar: %1$s",
"Invalid chunk name" : "O nome do fragmento non é válido",
"Could not rename part file assembled from chunks" : "Non se puido cambiar o nome do ficheiro de pezas ensamblados a partir de fragmentos",
"Failed to write file contents: %1$s" : "Produciuse un erro ao escribir o contido do ficheiro: %1$s",
Expand All @@ -155,9 +155,9 @@ OC.L10N.register(
"If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Se configuras o teu horario de traballo, outros usuarios verán cando estás fóra da oficina cando reserven unha reunión.",
"Time zone:" : "Franxa horaria:",
"to" : "para",
"Delete slot" : "Eliminar slot",
"Delete slot" : "Eliminar franxa horaria",
"No working hours set" : "Sen horario de traballo establecido",
"Add slot" : "Engadir slot",
"Add slot" : "Engadir franxa horaria",
"Monday" : "luns",
"Tuesday" : "martes",
"Wednesday" : "mércores",
Expand Down Expand Up @@ -185,7 +185,7 @@ OC.L10N.register(
"There was an error updating your attendance status." : "Produciuse un erro ao actualizar o seu estado de asistencia.",
"Please contact the organizer directly." : "Contacte directamente co organizador.",
"Are you accepting the invitation?" : "Acepta vostede o convite?",
"Tentative" : "Tentativa",
"Tentative" : "Provisional",
"Your attendance was updated successfully." : "A súa asistencia foi actualizada satisfactoriamente.",
"Invitation canceled" : "Convite cancelado",
"Invitation updated" : "Convite actualizado",
Expand Down
8 changes: 4 additions & 4 deletions apps/dav/l10n/gl.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"Could not open file" : "Non se puido abrir o ficheiro",
"Encryption not ready: %1$s" : "O cifrado non está listo: %1$s",
"Failed to open file: %1$s" : "Produciuse un erro ao abrir o ficheiro: %1$s",
"Failed to unlink: %1$s" : "Produciuse un erro ao desvincular: %1$s",
"Failed to unlink: %1$s" : "Produciuse un erro ao desligar: %1$s",
"Invalid chunk name" : "O nome do fragmento non é válido",
"Could not rename part file assembled from chunks" : "Non se puido cambiar o nome do ficheiro de pezas ensamblados a partir de fragmentos",
"Failed to write file contents: %1$s" : "Produciuse un erro ao escribir o contido do ficheiro: %1$s",
Expand All @@ -153,9 +153,9 @@
"If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Se configuras o teu horario de traballo, outros usuarios verán cando estás fóra da oficina cando reserven unha reunión.",
"Time zone:" : "Franxa horaria:",
"to" : "para",
"Delete slot" : "Eliminar slot",
"Delete slot" : "Eliminar franxa horaria",
"No working hours set" : "Sen horario de traballo establecido",
"Add slot" : "Engadir slot",
"Add slot" : "Engadir franxa horaria",
"Monday" : "luns",
"Tuesday" : "martes",
"Wednesday" : "mércores",
Expand Down Expand Up @@ -183,7 +183,7 @@
"There was an error updating your attendance status." : "Produciuse un erro ao actualizar o seu estado de asistencia.",
"Please contact the organizer directly." : "Contacte directamente co organizador.",
"Are you accepting the invitation?" : "Acepta vostede o convite?",
"Tentative" : "Tentativa",
"Tentative" : "Provisional",
"Your attendance was updated successfully." : "A súa asistencia foi actualizada satisfactoriamente.",
"Invitation canceled" : "Convite cancelado",
"Invitation updated" : "Convite actualizado",
Expand Down
Loading

0 comments on commit d0748cd

Please sign in to comment.