Skip to content

Commit 4528cae

Browse files
authored
Merge branch 'main' into feat/assignments-frontend
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
2 parents 9495987 + 64ab92b commit 4528cae

129 files changed

Lines changed: 655 additions & 75 deletions

Some content is hidden

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

.github/workflows/appstore-build-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
7070

7171
- name: Set up php ${{ env.PHP_VERSION }}
72-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
72+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
7373
with:
7474
php-version: ${{ env.PHP_VERSION }}
7575
coverage: none

.github/workflows/lint-php-cs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4848

4949
- name: Set up php
50-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
50+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
5151
with:
5252
php-version: 8.2
5353
coverage: none

.github/workflows/openapi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2.3.1.3.2
3434

3535
- name: Set up php
36-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
36+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
3737
with:
3838
php-version: ${{ steps.php_versions.outputs.php-available }}
3939
extensions: xml

.github/workflows/phpunit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
path: apps/${{ env.APP_NAME }}
5656

5757
- name: Set up php ${{ matrix.php-versions }}
58-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
58+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
5959
with:
6060
php-version: ${{ matrix.php-versions }}
6161
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, gd, zip

.github/workflows/psalm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
persist-credentials: false
7272

7373
- name: Set up php${{ matrix.php-min }}
74-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
74+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
7575
with:
7676
php-version: ${{ matrix.php-min }}
7777
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Known providers:
6262
6363
More details on how to set this up in the [admin docs](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html)
6464
]]> </description>
65-
<version>3.5.0-dev.1</version>
65+
<version>3.5.0-dev.2</version>
6666
<licence>agpl</licence>
6767
<author>Julien Veyssier</author>
6868
<namespace>Assistant</namespace>
@@ -81,7 +81,7 @@ More details on how to set this up in the [admin docs](https://docs.nextcloud.co
8181
<screenshot>https://github.com/nextcloud/assistant/raw/main/img/screenshots/screenshot6.png</screenshot>
8282
<screenshot>https://github.com/nextcloud/assistant/raw/main/img/screenshots/screenshot7.png</screenshot>
8383
<dependencies>
84-
<nextcloud min-version="33" max-version="34"/>
84+
<nextcloud min-version="33" max-version="35"/>
8585
</dependencies>
8686
<settings>
8787
<admin>OCA\Assistant\Settings\Admin</admin>

composer.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

l10n/ar.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ OC.L10N.register(
145145
"Submit" : "إرسال ",
146146
"Type a message…" : "أُكتُب رسالةً ...",
147147
"Processing…" : "قيدَ المعالجة ...",
148+
"Waiting…" : "قيد الانتظار…",
148149
"Could not upload the recorded file" : "تعذّر رفع الملف المسجل",
149150
"You" : "أنت",
150151
"Message copied to clipboard" : "تمّ نسخ الرسالة إلى الحافظة",

l10n/ar.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
"Submit" : "إرسال ",
144144
"Type a message…" : "أُكتُب رسالةً ...",
145145
"Processing…" : "قيدَ المعالجة ...",
146+
"Waiting…" : "قيد الانتظار…",
146147
"Could not upload the recorded file" : "تعذّر رفع الملف المسجل",
147148
"You" : "أنت",
148149
"Message copied to clipboard" : "تمّ نسخ الرسالة إلى الحافظة",

l10n/ast.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ OC.L10N.register(
3939
"Delete" : "Desaniciar",
4040
"Edit title" : "Editar el títulu",
4141
"Submit" : "Unviar",
42+
"Waiting…" : "Esperando…",
4243
"You" : "Tu",
4344
"Delete message" : "Desaniciar el mensaxe",
4445
"Choose" : "Escoyer",

0 commit comments

Comments
 (0)