Skip to content

Commit 421fc46

Browse files
committed
Merge branch 'master' into stable
2 parents e110868 + 4eec139 commit 421fc46

125 files changed

Lines changed: 1047 additions & 233 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/psalm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
7676
7777
- name: Install dependencies # zizmor: ignore[template-injection]
78-
run: composer require --dev 'nextcloud/ocp:${{ matrix.ocp-version }}' --ignore-platform-reqs --with-dependencies
78+
run: composer require --dev 'nextcloud/ocp:${{ matrix.ocp-version }}' --ignore-platform-reqs --with-all-dependencies
7979

8080
- name: Run coding standards check
8181
run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [15.1.2] - 2025-07-13
8+
9+
### Fixed
10+
11+
* fix(CrawlService): archive.enabled check would always be true Marcel Klehr 8 minutes ago
12+
* feat(ClearPreviews command): Clear last_preview column in addition to cache
13+
* fix(BookmarkPreviewer): Do not store guaranteed null responses in cache
14+
* fix(GenericUrlBookmarkPreviewer): Check URL not API key & Add generic previewer to previewers list
15+
* Build(deps): Update rowbot/url requirement from ^3.0 to ^4.0
16+
* fix(l10n): Update translations from Transifex
17+
718
## [15.1.1] - 2025-06-21
819

920
### Fixed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source_dir=$(build_dir)/source
77
sign_dir=$(build_dir)/sign
88
package_name=$(app_name)
99
cert_dir=$(HOME)/.nextcloud/certificates
10-
version+=15.1.1
10+
version+=15.1.2
1111

1212
all: dev-setup build-js-production composer-no-dev
1313

appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ Requirements:
2323
- mbstring: *
2424
- when using MySQL, use at least v8.0
2525
]]></description>
26-
<version>15.1.1</version>
26+
<version>15.1.2</version>
2727
<licence>agpl</licence>
28-
<author mail="mklehr@gmx.net">Marcel Klehr</author>
28+
<author mail="mklehr@gmx.net" homepage="https://marcelklehr.de">Marcel Klehr</author>
2929
<author mail="blizzz@arthur-schiwon.de" homepage="https://www.arthur-schiwon.de">Arthur Schiwon</author>
3030
<author>Marvin Thomas Rabe</author>
3131
<author>Stefan Klemm</author>

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"ext-libxml": "*",
77
"ext-pdo": "*",
88
"marcelklehr/link-preview": "^3.0.5",
9-
"rowbot/url": "^3.0",
9+
"rowbot/url": "^4.0",
1010
"xantios/mimey": "^2.1",
1111
"fivefilters/readability.php": "^3.1"
1212
},

l10n/ar.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ OC.L10N.register(
180180
"If you have problems with this Bookmarks app or have an idea about what could be improved, don't hesitate to get in touch by clicking here." : "إذا واجهتك أي مشاكل مع تطبيق \"الإشارات المرجعية\" هذا أو كان لديك أي مقترح لتطويره, نرجوك ألّا تتتردد في التواصل معنا بالنقر هنا.",
181181
"Support this project" : "إدعَم هذا المشروع",
182182
"My work on this Bookmarks app is fuelled by a voluntary subscription model. If you think what I do is worthwhile, I would be happy if you could support my work. Also, please consider giving the app a review on the Nextcloud app store. Thank you 💙 " : "عملي في هذا التطبيق \"الإشارات المرجعية\" Bookmarks يتم دعمه من خلال نموذج الاشتراك الطوعي. إذا كنت تعتقد أن ما أقوم به يستحق العناء، سأكون سعيداً إذا ساهمت في دعم عملي. كذلك، يُرجى تقييم التطبيق على متجر تطبيقات نكست كلاود. و شكراً 💙",
183+
"Created {time} ago" : "أُنشِيءَ منذ {time} مضت",
184+
"Created on {date}" : "أُنشِيءَ في {date}",
183185
"(Empty title)" : "(عنوان فارغ)",
184186
"Title" : "العنوان",
185187
"Link" : "الرابط",
@@ -250,6 +252,7 @@ OC.L10N.register(
250252
"Failed to move bookmark" : "تعذّر نقل الإشارة المرجعية",
251253
"Failed to copy bookmark" : "تعذّر نسخ الإشارة المرجعية",
252254
"Failed to delete bookmark" : "تعذّر حذف الإشارة المرجعية",
255+
"Import successful" : "تمّ الاستيراد بنجاحٍ",
253256
"Failed to rename tag" : "فشل في تغيير تسمية الوسم",
254257
"Failed to load tags" : "فشل في تحميل الوسوم",
255258
"Failed to load folders" : "تعذّر تحميل المجلد",

l10n/ar.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@
178178
"If you have problems with this Bookmarks app or have an idea about what could be improved, don't hesitate to get in touch by clicking here." : "إذا واجهتك أي مشاكل مع تطبيق \"الإشارات المرجعية\" هذا أو كان لديك أي مقترح لتطويره, نرجوك ألّا تتتردد في التواصل معنا بالنقر هنا.",
179179
"Support this project" : "إدعَم هذا المشروع",
180180
"My work on this Bookmarks app is fuelled by a voluntary subscription model. If you think what I do is worthwhile, I would be happy if you could support my work. Also, please consider giving the app a review on the Nextcloud app store. Thank you 💙 " : "عملي في هذا التطبيق \"الإشارات المرجعية\" Bookmarks يتم دعمه من خلال نموذج الاشتراك الطوعي. إذا كنت تعتقد أن ما أقوم به يستحق العناء، سأكون سعيداً إذا ساهمت في دعم عملي. كذلك، يُرجى تقييم التطبيق على متجر تطبيقات نكست كلاود. و شكراً 💙",
181+
"Created {time} ago" : "أُنشِيءَ منذ {time} مضت",
182+
"Created on {date}" : "أُنشِيءَ في {date}",
181183
"(Empty title)" : "(عنوان فارغ)",
182184
"Title" : "العنوان",
183185
"Link" : "الرابط",
@@ -248,6 +250,7 @@
248250
"Failed to move bookmark" : "تعذّر نقل الإشارة المرجعية",
249251
"Failed to copy bookmark" : "تعذّر نسخ الإشارة المرجعية",
250252
"Failed to delete bookmark" : "تعذّر حذف الإشارة المرجعية",
253+
"Import successful" : "تمّ الاستيراد بنجاحٍ",
251254
"Failed to rename tag" : "فشل في تغيير تسمية الوسم",
252255
"Failed to load tags" : "فشل في تحميل الوسوم",
253256
"Failed to load folders" : "تعذّر تحميل المجلد",

l10n/ast.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ OC.L10N.register(
5050
"Failed to move bookmark" : "Nun se pue mover el marcador",
5151
"Failed to copy bookmark" : "Nun se pue copiar el maracador",
5252
"Failed to delete bookmark" : "Nun se pue desaniciar el marcador",
53+
"Import successful" : "La importación foi correuta",
5354
"Failed to rename tag" : "Nun se pue renomar la etiqueta",
5455
"Failed to load tags" : "Nun se puen cargar les etiquetes",
5556
"Failed to load folders" : "Nun se puen cargar les carpetes",

l10n/ast.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"Failed to move bookmark" : "Nun se pue mover el marcador",
4949
"Failed to copy bookmark" : "Nun se pue copiar el maracador",
5050
"Failed to delete bookmark" : "Nun se pue desaniciar el marcador",
51+
"Import successful" : "La importación foi correuta",
5152
"Failed to rename tag" : "Nun se pue renomar la etiqueta",
5253
"Failed to load tags" : "Nun se puen cargar les etiquetes",
5354
"Failed to load folders" : "Nun se puen cargar les carpetes",

l10n/bg.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ OC.L10N.register(
142142
"Drag this to your browser bookmarks and click it to quickly bookmark a webpage." : "Завлечете това в отметките на браузъра си и щракнете върху него, за да поставте бързо отметка на уеб страница.",
143143
"Add to {instanceName}" : "Добавяне към {instanceName}",
144144
"Need help?" : "Нуждаете се от помощ?",
145+
"Created {time} ago" : "Създаден {time} преди",
146+
"Created on {date}" : "Създаден на {date}",
145147
"Title" : "Име",
146148
"Link" : "Връзка",
147149
"Untitled folder" : "Папка без заглавие",

0 commit comments

Comments
 (0)