Skip to content

Commit 531073f

Browse files
cbcoutinhocbcoutinho
authored
Merge branch 'master' into fix/cors-bearer-token-support
2 parents af0c0f2 + 7baca42 commit 531073f

File tree

988 files changed

+14233
-11810
lines changed

Some content is hidden

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

988 files changed

+14233
-11810
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
strategy:
4949
matrix:
50-
php-versions: [ '8.2', '8.3', '8.4' ]
50+
php-versions: [ '8.2', '8.3', '8.4', '8.5' ]
5151

5252
name: php-lint
5353

‎.github/workflows/phpunit-mariadb.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,15 @@ jobs:
6060
fail-fast: false
6161
matrix:
6262
php-versions: ['8.2']
63-
mariadb-versions: ['10.3', '10.6', '10.11', '11.4', '11.8']
63+
mariadb-versions: ['10.6', '10.11', '11.4', '11.8']
6464
include:
6565
- php-versions: '8.3'
6666
mariadb-versions: '10.11'
6767
coverage: ${{ github.event_name != 'pull_request' }}
6868
- php-versions: '8.4'
6969
mariadb-versions: '11.8'
70+
- php-versions: '8.5'
71+
mariadb-versions: '11.8'
7072

7173
name: MariaDB ${{ matrix.mariadb-versions }} (PHP ${{ matrix.php-versions }}) - database tests
7274

‎.github/workflows/phpunit-memcached.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
php-versions: ['8.3', '8.4']
59+
php-versions: ['8.3', '8.4', '8.5']
6060
include:
6161
- php-versions: '8.2'
6262
coverage: ${{ github.event_name != 'pull_request' }}

‎.github/workflows/phpunit-mysql.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ jobs:
6767
coverage: ${{ github.event_name != 'pull_request' }}
6868
- mysql-versions: '8.4'
6969
php-versions: '8.4'
70+
- mysql-versions: '8.4'
71+
php-versions: '8.5'
7072

7173
name: MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
7274

‎.github/workflows/phpunit-nodb.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
strategy:
6060
fail-fast: false
6161
matrix:
62-
php-versions: ['8.3', '8.4']
62+
php-versions: ['8.3', '8.4', '8.5']
6363
include:
6464
- php-versions: '8.2'
6565
coverage: ${{ github.event_name != 'pull_request' }}

‎.github/workflows/phpunit-oci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ jobs:
6969
php-versions: '8.3'
7070
- oracle-versions: '23'
7171
php-versions: '8.4'
72+
- oracle-versions: '23'
73+
php-versions: '8.5'
7274

7375
name: Oracle ${{ matrix.oracle-versions }} (PHP ${{ matrix.php-versions }}) - database tests
7476

‎.github/workflows/phpunit-pgsql.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ jobs:
6868
coverage: ${{ github.event_name != 'pull_request' }}
6969
- php-versions: '8.4'
7070
postgres-versions: '18'
71+
- php-versions: '8.5'
72+
postgres-versions: '18'
7173

7274
name: PostgreSQL ${{ matrix.postgres-versions }} (PHP ${{ matrix.php-versions }}) - database tests
7375

‎.github/workflows/phpunit-sqlite.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
strategy:
6060
fail-fast: false
6161
matrix:
62-
php-versions: ['8.3', '8.4']
62+
php-versions: ['8.3', '8.4', '8.5']
6363
include:
6464
- php-versions: '8.2'
6565
coverage: ${{ github.event_name != 'pull_request' }}

‎apps/admin_audit/lib/Listener/SharingEventListener.php‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,6 @@ private function shareCreated(ShareCreatedEvent $event): void {
148148
'id',
149149
]
150150
),
151-
IShare::TYPE_SCIENCEMESH => $this->log(
152-
'The %s "%s" with ID "%s" has been shared to the sciencemesh user "%s" with permissions "%s" (Share ID: %s)',
153-
$params,
154-
[
155-
'itemType',
156-
'path',
157-
'itemSource',
158-
'shareWith',
159-
'permissions',
160-
'id',
161-
]
162-
),
163151
default => null
164152
};
165153
}
@@ -274,17 +262,6 @@ private function shareDeleted(ShareDeletedEvent $event): void {
274262
'id',
275263
]
276264
),
277-
IShare::TYPE_SCIENCEMESH => $this->log(
278-
'The %s "%s" with ID "%s" has been unshared from the sciencemesh user "%s" (Share ID: %s)',
279-
$params,
280-
[
281-
'itemType',
282-
'fileTarget',
283-
'itemSource',
284-
'shareWith',
285-
'id',
286-
]
287-
),
288265
default => null
289266
};
290267
}

‎apps/dashboard/l10n/uk.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ OC.L10N.register(
2020
"Edit widgets" : "Редагувати віджети",
2121
"Get more widgets from the App Store" : "Більше віджетів у каталозі застосунків",
2222
"Weather service" : "Погода",
23+
"For your privacy, the weather data is requested by your {productName} server on your behalf so the weather service receives no personal information." : "Для вашої конфіденційності дані погоди буде запитано вашим сервером {productName} від вашого імени, таким чином сервіс надання погоди не отримуватиме ваших приватних даних. ",
2324
"Weather data from Met.no" : "Дані про погоду з Met.no",
2425
"geocoding with Nominatim" : "геокодування за допомогою Nominatim",
2526
"elevation data from OpenTopoData" : "дані про висоту з OpenTopoData",

0 commit comments

Comments
 (0)