Skip to content

Commit 2caed24

Browse files
committed
Merge branch 'master' into stable
2 parents d69f604 + 88ab449 commit 2caed24

Some content is hidden

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

78 files changed

+1532
-210
lines changed

.github/workflows/repair.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- stable*
99
paths:
1010
- 'lib/**'
11+
- '.github/workflows/repair.yml'
1112

1213
env:
1314
APP_NAME: bookmarks
@@ -119,3 +120,8 @@ jobs:
119120
- name: Compare exports
120121
run: |
121122
diff export.html export2.html
123+
124+
- name: Check logs
125+
if: always()
126+
run: |
127+
cat data/nextcloud.log

.github/workflows/upgrade.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- stable*
99
paths:
1010
- 'lib/**'
11+
- '.github/workflows/upgrade.yml'
1112

1213
env:
1314
APP_NAME: bookmarks
@@ -136,3 +137,7 @@ jobs:
136137
run: |
137138
diff export.html export2.html
138139
140+
- name: Check logs
141+
if: always()
142+
run: |
143+
cat data/nextcloud.log

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ 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.2.0] - 2025-09-03
8+
9+
### New
10+
* feat: Add a ContextChat provider (opt-in)
11+
* feat(Capabilities): Expose capabilities
12+
* feat(auth): Implement stateless auth ticket system to speed up API requests
13+
* feat: Add faster hash functions
14+
15+
### Fixed
16+
* fix(ExportResponse): Don't use deprecated APIs
17+
* fix(TreeMapper): Replace removed array_flatten function
18+
* fix(Bookmark): Remove mb_convert_encoding warning
19+
* fix: Update marcelklehr/linkpreview
20+
* fix: use new puppeteer browser env variable (Thanks to Michael Gast)
21+
* fix(l10n): Update translations from Transifex
22+
723
## [15.1.3] - 2025-07-27
824

925
### 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.3
10+
version+=15.2.0
1111

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

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Requirements:
2323
- mbstring: *
2424
- when using MySQL, use at least v8.0
2525
]]></description>
26-
<version>15.1.3</version>
26+
<version>15.2.0</version>
2727
<licence>agpl</licence>
2828
<author mail="[email protected]" homepage="https://marcelklehr.de">Marcel Klehr</author>
2929
<author mail="[email protected]" homepage="https://www.arthur-schiwon.de">Arthur Schiwon</author>

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"ext-json": "*",
66
"ext-libxml": "*",
77
"ext-pdo": "*",
8-
"marcelklehr/link-preview": "^3.0.5",
8+
"marcelklehr/link-preview": "3.x",
99
"rowbot/url": "^4.0",
1010
"xantios/mimey": "^2.1",
1111
"fivefilters/readability.php": "^3.1",

l10n/be.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,42 @@
11
OC.L10N.register(
22
"bookmarks",
33
{
4+
"Link copied to clipboard" : "Спасылка скапіявана ў буфер абмену",
5+
"Details" : "Падрабязнасці",
46
"Rename" : "Перайменаваць",
7+
"Copy link" : "Скапіяваць спасылку",
58
"Move" : "Перамясціць",
9+
"Delete selection" : "Выдаліць выбранае",
10+
"Select all" : "Выбраць усе",
611
"Go back" : "Назад",
712
"New" : "Новы",
813
"New folder" : "Новая папка",
914
"Search" : "Пошук",
1015
"_%n folder_::_%n folders_" : ["%n папка","%n папкі","%n папак","%n папак"],
16+
"Rename folder" : "Перайменаваць папку",
17+
"Move folder" : "Перамясціць папку",
18+
"Submit" : "Адправіць",
1119
"Cancel" : "Скасаваць",
1220
"Recent" : "Нядаўнія",
1321
"Shared with you" : "Абагулена з вамі",
1422
"Files" : "Файлы",
1523
"Delete" : "Выдаліць",
24+
"Add to {instanceName}" : "Дадаць у {instanceName}",
25+
"Need help?" : "Патрэбна дапамога?",
1626
"Title" : "Загаловак",
1727
"Link" : "Спасылка",
1828
"Tags" : "Тэгі",
1929
"Notes" : "Нататкі",
30+
"Link copied" : "Спасылка скапіявана",
2031
"Owner" : "Уладальнік",
32+
"Sharing" : "Абагульванне",
33+
"Select a user or group" : "Выберыце карыстальніка або групу",
2134
"Share link" : "Абагуліць спасылку",
35+
"Create public link" : "Стварыць публічную спасылку",
2236
"Allow editing" : "Дазволіць рэдагаванне",
37+
"Failed to save settings" : "Не ўдалося захаваць налады",
38+
"Privacy" : "Прыватнасць",
39+
"Performance" : "Прадукцыйнасць",
2340
"Folder" : "Папка",
2441
"Save" : "Захаваць"
2542
},

l10n/be.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,40 @@
11
{ "translations": {
2+
"Link copied to clipboard" : "Спасылка скапіявана ў буфер абмену",
3+
"Details" : "Падрабязнасці",
24
"Rename" : "Перайменаваць",
5+
"Copy link" : "Скапіяваць спасылку",
36
"Move" : "Перамясціць",
7+
"Delete selection" : "Выдаліць выбранае",
8+
"Select all" : "Выбраць усе",
49
"Go back" : "Назад",
510
"New" : "Новы",
611
"New folder" : "Новая папка",
712
"Search" : "Пошук",
813
"_%n folder_::_%n folders_" : ["%n папка","%n папкі","%n папак","%n папак"],
14+
"Rename folder" : "Перайменаваць папку",
15+
"Move folder" : "Перамясціць папку",
16+
"Submit" : "Адправіць",
917
"Cancel" : "Скасаваць",
1018
"Recent" : "Нядаўнія",
1119
"Shared with you" : "Абагулена з вамі",
1220
"Files" : "Файлы",
1321
"Delete" : "Выдаліць",
22+
"Add to {instanceName}" : "Дадаць у {instanceName}",
23+
"Need help?" : "Патрэбна дапамога?",
1424
"Title" : "Загаловак",
1525
"Link" : "Спасылка",
1626
"Tags" : "Тэгі",
1727
"Notes" : "Нататкі",
28+
"Link copied" : "Спасылка скапіявана",
1829
"Owner" : "Уладальнік",
30+
"Sharing" : "Абагульванне",
31+
"Select a user or group" : "Выберыце карыстальніка або групу",
1932
"Share link" : "Абагуліць спасылку",
33+
"Create public link" : "Стварыць публічную спасылку",
2034
"Allow editing" : "Дазволіць рэдагаванне",
35+
"Failed to save settings" : "Не ўдалося захаваць налады",
36+
"Privacy" : "Прыватнасць",
37+
"Performance" : "Прадукцыйнасць",
2138
"Folder" : "Папка",
2239
"Save" : "Захаваць"
2340
},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"

l10n/cs.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ OC.L10N.register(
167167
"The bookmarks app can automatically backup your bookmarks on a daily basis to prevent data loss when syncing bookmarks across devices." : "Aplikace Záložky může provádět každodenní automatickou zálohu vašich záložek a bránit tak ztrátě dat při jejich synchronizaci napříč zařízeními.",
168168
"Enable backups" : "Zapnout zálohování",
169169
"Enter the path of a folder in your Files where backups will be stored." : "Zadejte popis umístění složky ve svých Souborech, do kterého ukládat zálohy.",
170+
"Context Chat integration" : "Napojení na kontextový chat",
171+
"The bookmarks app can automatically make available the textual contents of the websites you bookmark to Context Chat, which allows asking questions about and getting answers based on those contents. This is only available if auto-archiving is enabled." : "Aplikace Záložky může automaticky zpřístupňovat obsah webových stránek, kterých jste si do ní uložili adresy kontextovému chatu, což umožňuje pokládat dotazy a dostávat odpovědi založené na tomto obsahu. Toto je k dispozici pouze pokud je zapnutá automatická archivace.",
172+
"Context chat is currently not installed, but is required for this feature." : "Kontextový chat v tuto chvíli není nainstalován, ale pro tuto funkci je potřebný.",
173+
"Enable Context Chat integration" : "Zapnout napojení na kontextový chat",
170174
"Client apps" : "Klientské aplikace",
171175
"Also check out the collection of client apps that integrate with this app: " : "Také se podívejte na sadu klientských aplikací, které napojují na tuto aplikaci:",
172176
"Install web app" : "Nainstalovat webovou aplikaci",

l10n/cs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@
165165
"The bookmarks app can automatically backup your bookmarks on a daily basis to prevent data loss when syncing bookmarks across devices." : "Aplikace Záložky může provádět každodenní automatickou zálohu vašich záložek a bránit tak ztrátě dat při jejich synchronizaci napříč zařízeními.",
166166
"Enable backups" : "Zapnout zálohování",
167167
"Enter the path of a folder in your Files where backups will be stored." : "Zadejte popis umístění složky ve svých Souborech, do kterého ukládat zálohy.",
168+
"Context Chat integration" : "Napojení na kontextový chat",
169+
"The bookmarks app can automatically make available the textual contents of the websites you bookmark to Context Chat, which allows asking questions about and getting answers based on those contents. This is only available if auto-archiving is enabled." : "Aplikace Záložky může automaticky zpřístupňovat obsah webových stránek, kterých jste si do ní uložili adresy kontextovému chatu, což umožňuje pokládat dotazy a dostávat odpovědi založené na tomto obsahu. Toto je k dispozici pouze pokud je zapnutá automatická archivace.",
170+
"Context chat is currently not installed, but is required for this feature." : "Kontextový chat v tuto chvíli není nainstalován, ale pro tuto funkci je potřebný.",
171+
"Enable Context Chat integration" : "Zapnout napojení na kontextový chat",
168172
"Client apps" : "Klientské aplikace",
169173
"Also check out the collection of client apps that integrate with this app: " : "Také se podívejte na sadu klientských aplikací, které napojují na tuto aplikaci:",
170174
"Install web app" : "Nainstalovat webovou aplikaci",

0 commit comments

Comments
 (0)