Skip to content

Commit c19ed4f

Browse files
marcelklehrmarcelklehr
committed
Merge branch 'master' into stable
2 parents 2caed24 + 025fd1c commit c19ed4f

37 files changed

Lines changed: 774 additions & 458 deletions

‎.github/workflows/floccus.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
matrix:
8888
node-version: [20.x]
8989
npm-version: [10.x]
90-
server-version: ['30']
90+
server-version: ['32']
9191
floccus-branch: ['master', 'develop']
9292
floccus-adapter:
9393
- nextcloud-bookmarks
@@ -156,7 +156,7 @@ jobs:
156156
path: ./
157157

158158
- name: Checkout bookmarks app
159-
uses: actions/checkout@v2
159+
uses: actions/checkout@v4
160160
with:
161161
path: ${{ env.APP_NAME }}
162162

‎.github/workflows/repair.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,31 @@ permissions:
1717
contents: read
1818

1919
jobs:
20+
matrix:
21+
runs-on: ubuntu-latest-low
22+
outputs:
23+
php-version: ${{ steps.versions.outputs.php-available-list }}
24+
server-max: ${{ steps.versions.outputs.branches-max-list }}
25+
steps:
26+
- name: Checkout app
27+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28+
29+
- name: Get version matrix
30+
id: versions
31+
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
32+
2033
php:
2134
runs-on: ubuntu-latest
2235

36+
needs: [matrix]
37+
2338
strategy:
2439
# do not stop on another job's failure
2540
fail-fast: false
2641
matrix:
27-
php-versions: ['8.1']
2842
databases: ['sqlite', 'mysql', 'pgsql']
29-
server-versions: ['master', 'stable31', 'stable30']
43+
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
44+
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
3045

3146
name: Repair step on ${{ matrix.databases }}-${{ matrix.server-versions }}
3247

‎.github/workflows/upgrade.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
# do not stop on another job's failure
2525
fail-fast: false
2626
matrix:
27-
php-versions: ['8.1']
27+
php-versions: ['8.1', '8.2', '8.3', '8.4']
2828
databases: ['sqlite', 'mysql', 'pgsql']
29-
server-versions: ['stable30', 'stable31', 'master']
30-
prev-version: ['stable14', 'stable']
29+
server-versions: ['stable32', 'master']
30+
prev-version: ['stable']
3131

3232
name: Update from ${{ matrix.prev-version }} on ${{ matrix.databases }}-${{ matrix.server-versions }}
3333

‎CHANGELOG.md‎

Lines changed: 12 additions & 1 deletion
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+
## [16.0.0] - 2025-10-03
8+
9+
### Breaking changes
10+
11+
- Dropped support for Nextcloud < 32
12+
13+
### New
14+
15+
- Support Nextcloud 32
16+
- Changes to adhere Nextcloud 32 visual appearance
17+
718
## [15.2.0] - 2025-09-03
819

920
### New
@@ -25,7 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2536
### Fixed
2637

2738
* fix(FolderService): Always make sure description is set
28-
* chore: Update nextcloud/vue Marcel Klehr 2 minutes ago
39+
* chore: Update nextcloud/vue
2940
* fix(UNDELETE_FOLDER): Make sure to reload childrenOrder of -1
3041
* fix(BookmarkMapper): Fix duplicated filter
3142
* fix(CopyDialog): Fix onSubmit action

‎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.2.0
10+
version+=16.0.0
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,7 +23,7 @@ Requirements:
2323
- mbstring: *
2424
- when using MySQL, use at least v8.0
2525
]]></description>
26-
<version>15.2.0</version>
26+
<version>16.0.0</version>
2727
<licence>agpl</licence>
2828
<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>
@@ -42,7 +42,7 @@ Requirements:
4242
<database>pgsql</database>
4343
<lib>intl</lib>
4444
<lib>mbstring</lib>
45-
<nextcloud min-version="30" max-version="31" />
45+
<nextcloud min-version="32" max-version="32" />
4646
</dependencies>
4747
<background-jobs>
4848
<job>OCA\Bookmarks\BackgroundJobs\CrawlJob</job>

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"require-dev": {
1515
"phpunit/phpunit": "^9.5.26",
16-
"nextcloud/coding-standard": "^1.0.0",
16+
"nextcloud/coding-standard": "1.x",
1717
"vimeo/psalm": "6.x",
1818
"nextcloud/ocp": "dev-master"
1919
},

‎l10n/be.js‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
OC.L10N.register(
22
"bookmarks",
33
{
4+
"You unshared folder \"%1$s\" with %2$s" : "Вы скасавалі абагульванне папкі \"%1$s\" з %2$s",
5+
"You unshared folder \"%s\" with someone" : "Вы скасавалі абагульванне папкі \"%s\" з кімсьці",
6+
"%1$s unshared folder \"%2$s\" with you" : "%1$s скасаваў(-ла) абагульванне папкі \"%2$s\" з вамі",
7+
"Someone unshared folder \"%s\" with you" : "Хтосьці скасаваў абагульванне папкі \"%s\" з вамі",
48
"Link copied to clipboard" : "Спасылка скапіявана ў буфер абмену",
59
"Details" : "Падрабязнасці",
610
"Rename" : "Перайменаваць",
@@ -13,6 +17,8 @@ OC.L10N.register(
1317
"New folder" : "Новая папка",
1418
"Search" : "Пошук",
1519
"_%n folder_::_%n folders_" : ["%n папка","%n папкі","%n папак","%n папак"],
20+
"Select folder" : "Выберыце папку",
21+
"Shared by {user}" : "Абагуліў(-ла) {user}",
1622
"Rename folder" : "Перайменаваць папку",
1723
"Move folder" : "Перамясціць папку",
1824
"Submit" : "Адправіць",
@@ -25,19 +31,35 @@ OC.L10N.register(
2531
"Need help?" : "Патрэбна дапамога?",
2632
"Title" : "Загаловак",
2733
"Link" : "Спасылка",
34+
"Root folder" : "Каранёвая папка",
2835
"Tags" : "Тэгі",
2936
"Notes" : "Нататкі",
37+
"Archived file" : "Архіваваны файл",
38+
"Download file" : "Спампаваць файл",
39+
"Open file location" : "Адкрыць размяшчэнне файла",
3040
"Link copied" : "Спасылка скапіявана",
3141
"Owner" : "Уладальнік",
3242
"Sharing" : "Абагульванне",
3343
"Select a user or group" : "Выберыце карыстальніка або групу",
3444
"Share link" : "Абагуліць спасылку",
45+
"Copy RSS feed" : "Скапіяваць стужку RSS",
46+
"Delete link" : "Выдаліць спасылку",
3547
"Create public link" : "Стварыць публічную спасылку",
3648
"Allow editing" : "Дазволіць рэдагаванне",
3749
"Failed to save settings" : "Не ўдалося захаваць налады",
3850
"Privacy" : "Прыватнасць",
3951
"Performance" : "Прадукцыйнасць",
52+
"Screeenly" : "Screeenly",
53+
"You can either sign up for free at screeenly.com or setup your own server." : "Вы можаце зарэгістравацца бясплатна на сайце screeenly.com або наладзіць свой уласны сервер.",
54+
"Screeenly API URL" : "URL-адрас API Screeenly",
55+
"Screeenly API key" : "Ключ API Screeenly",
56+
"ScreenshotMachine" : "ScreenshotMachine",
57+
"ScreenshotMachine API key" : "Ключ API ScreenshotMachine",
58+
"Webshot" : "Webshot",
59+
"Webshot API URL" : "URL-адрас API Webshot",
4060
"Folder" : "Папка",
41-
"Save" : "Захаваць"
61+
"Root Folder" : "Каранёвая папка",
62+
"Save" : "Захаваць",
63+
"Failed to load tags" : "Не ўдалося загрузіць тэгі"
4264
},
4365
"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/be.json‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
{ "translations": {
2+
"You unshared folder \"%1$s\" with %2$s" : "Вы скасавалі абагульванне папкі \"%1$s\" з %2$s",
3+
"You unshared folder \"%s\" with someone" : "Вы скасавалі абагульванне папкі \"%s\" з кімсьці",
4+
"%1$s unshared folder \"%2$s\" with you" : "%1$s скасаваў(-ла) абагульванне папкі \"%2$s\" з вамі",
5+
"Someone unshared folder \"%s\" with you" : "Хтосьці скасаваў абагульванне папкі \"%s\" з вамі",
26
"Link copied to clipboard" : "Спасылка скапіявана ў буфер абмену",
37
"Details" : "Падрабязнасці",
48
"Rename" : "Перайменаваць",
@@ -11,6 +15,8 @@
1115
"New folder" : "Новая папка",
1216
"Search" : "Пошук",
1317
"_%n folder_::_%n folders_" : ["%n папка","%n папкі","%n папак","%n папак"],
18+
"Select folder" : "Выберыце папку",
19+
"Shared by {user}" : "Абагуліў(-ла) {user}",
1420
"Rename folder" : "Перайменаваць папку",
1521
"Move folder" : "Перамясціць папку",
1622
"Submit" : "Адправіць",
@@ -23,19 +29,35 @@
2329
"Need help?" : "Патрэбна дапамога?",
2430
"Title" : "Загаловак",
2531
"Link" : "Спасылка",
32+
"Root folder" : "Каранёвая папка",
2633
"Tags" : "Тэгі",
2734
"Notes" : "Нататкі",
35+
"Archived file" : "Архіваваны файл",
36+
"Download file" : "Спампаваць файл",
37+
"Open file location" : "Адкрыць размяшчэнне файла",
2838
"Link copied" : "Спасылка скапіявана",
2939
"Owner" : "Уладальнік",
3040
"Sharing" : "Абагульванне",
3141
"Select a user or group" : "Выберыце карыстальніка або групу",
3242
"Share link" : "Абагуліць спасылку",
43+
"Copy RSS feed" : "Скапіяваць стужку RSS",
44+
"Delete link" : "Выдаліць спасылку",
3345
"Create public link" : "Стварыць публічную спасылку",
3446
"Allow editing" : "Дазволіць рэдагаванне",
3547
"Failed to save settings" : "Не ўдалося захаваць налады",
3648
"Privacy" : "Прыватнасць",
3749
"Performance" : "Прадукцыйнасць",
50+
"Screeenly" : "Screeenly",
51+
"You can either sign up for free at screeenly.com or setup your own server." : "Вы можаце зарэгістравацца бясплатна на сайце screeenly.com або наладзіць свой уласны сервер.",
52+
"Screeenly API URL" : "URL-адрас API Screeenly",
53+
"Screeenly API key" : "Ключ API Screeenly",
54+
"ScreenshotMachine" : "ScreenshotMachine",
55+
"ScreenshotMachine API key" : "Ключ API ScreenshotMachine",
56+
"Webshot" : "Webshot",
57+
"Webshot API URL" : "URL-адрас API Webshot",
3858
"Folder" : "Папка",
39-
"Save" : "Захаваць"
59+
"Root Folder" : "Каранёвая папка",
60+
"Save" : "Захаваць",
61+
"Failed to load tags" : "Не ўдалося загрузіць тэгі"
4062
},"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);"
4163
}

‎l10n/da.js‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@ OC.L10N.register(
168168
"The bookmarks app can automatically backup your bookmarks on a daily basis to prevent data loss when syncing bookmarks across devices." : "Bogmærke app'en kan automatisk tage backup af dine bogmærker på daglig basis, for at forhindre datatab når der synkroniseres bogmærker på tværs af apparater.",
169169
"Enable backups" : "Aktiver backups",
170170
"Enter the path of a folder in your Files where backups will be stored." : "Indtast stien til en mappe i dine filer, hvor sikkerhedskopier vil blive gemt.",
171+
"Context Chat integration" : "Kontekst chatintegration",
172+
"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." : "Bogmærke app'en kan automatisk gøre den tekstuelle kontekst tilgængelig til kontekstchat for de websteder som du bogmærker, hvilket giver mulighed for at stille spørgsmål om og får svar baseret på indholdet. Dette er kun tilgængeligt hvis auto-arkivering er aktiveret.",
173+
"Context chat is currently not installed, but is required for this feature." : "Kontekstchat er aktuelt ikke installeret, men er krævet til denne funktion.",
174+
"Enable Context Chat integration" : "Aktiver kontekstchat integration",
171175
"Client apps" : "Klient apps",
172176
"Also check out the collection of client apps that integrate with this app: " : "Kontroller også samlingen af klientapps, der integreres med denne app:",
173177
"Install web app" : "Installer web app",
@@ -245,29 +249,40 @@ OC.L10N.register(
245249
"Failed to count unavailable bookmarks" : "Kunne ikke tælle utilgængelige bogmærker",
246250
"Failed to count archived bookmarks" : "Kunne ikke tælle arkiverede bogmærker",
247251
"Failed to count duplicated bookmarks" : "Kunne ikke tælle duplikerede bogmærker",
252+
"Failed to count bookmarks" : "Kunne ikke tælle bogmærker",
248253
"Failed to load bookmark" : "Bogmærke kunne ikke indlæses",
249254
"Failed to find existing bookmark" : "Kunne ikke finde eksisterende bogmærke",
250255
"Failed to create bookmark" : "Kunne ikke oprette bogmærke",
251256
"Failed to save bookmark" : "Kunne ikke gemme bogmærke",
252257
"Failed to move bookmark" : "Kunne ikke flytte bogmærke",
253258
"Failed to copy bookmark" : "Kunne ikke kopiere bogmærke",
254259
"Failed to delete bookmark" : "Kunne ikke slette bogmærke",
260+
"Failed to restore bookmark" : "Kunne ikke genskabe bogmærker",
261+
"Import successful" : "Import gennemført",
255262
"Failed to rename tag" : "Kunne ikke omdøbe tag",
256263
"Failed to load tags" : "Kunne ikke indlæse tags",
257264
"Failed to load folders" : "Fejl ved indlæsning af mapper",
258265
"Failed to load deleted folders" : "Kunne ikke indlæse slettede mapper",
259266
"Failed to load deleted bookmarks" : "Kunne ikke indlæse slettede bogmærker",
260267
"Failed to delete folder" : "Fejl ved sletning af mappe",
261268
"Failed to move folder" : "Kunne ikke flytte mappe",
269+
"Failed to restore folder" : "Kunne ikke genskabe mappe",
262270
"Failed to create folder" : "Kunne ikke oprette mappe",
263-
"Failed to move parts of selection" : "Fejl ved flytning af dele af det udvalgte",
264-
"Failed to delete parts of selection" : "Kan ikke slette dele af det valgte",
271+
"Failed to load children order" : "Kunne ikke indlæse rækkefølge for underpunkter",
272+
"Failed to move parts of selection" : "Fejl ved flytning af dele af det valgte",
273+
"Failed to copy parts of selection" : "Kunne ikke kopiere dele af det valgte",
274+
"Failed to delete parts of selection" : "Kunne ikke slette dele af det valgte",
275+
"Failed to tag parts of selection" : "Kunne ikke tagge dele af det valgte",
265276
"Failed to fetch bookmarks." : "Kunne ikke indlæse bogmærker.",
266277
"Failed to store setting" : "Kunne ikke lagre indstilling",
267278
"Failed to load setting {key}" : "Indstillingen {key} kunne ikke indlæses",
279+
"Failed to create share for folder {folderId}" : "Kunne ikke oprette deling for mappen {folderId}",
268280
"Failed to update share {shareId}" : "Kunne ikke opdatere deling {shareId}",
269281
"Failed to delete share {shareId}" : "Kunne ikke slette deling {shareId}",
270-
"Create bookmarks for mentioned links" : "Opret bogmærker til nævnte links",
282+
"Failed to create public link for folder {folderId}" : "Kunne ikke oprette offentligt link for mappen {folderId}",
283+
"Failed to delete public link for folder {folderId}" : "Kunne ikke slette offentligt link til mappen {folderId}",
284+
"Failed to permanently delete parts of trash bin" : "Kunne ikke permanent slette dele af skraldespanden",
285+
"Create bookmarks for mentioned links" : "Opret bogmærker til omtalte links",
271286
"No links found in this message" : "Ingen links fundet i denne besked",
272287
"Bookmarks feed" : "Bogmærkefeed"
273288
},

0 commit comments

Comments
 (0)