Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelklehr committed Jan 18, 2025
2 parents 7e90d6d + a7cf506 commit ced5ddc
Show file tree
Hide file tree
Showing 31 changed files with 137 additions and 85 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [15.0.5] - 2025-01-18

### Fixed

* fix(FileCacheGCJob): Turn error into a warning and make it clearer what's needed to fix it
* fix(archival): Properly interpret setting value
* fix(IMPORT_BOOKMARKS): Properly reload folders after import
* fix(TreeMapper#findChildren): Don't mix up type of children vs type of folder
* fix: Make export work in non-root pages
* Build(deps): Bump sanitize-html from 2.13.1 to 2.14.0
* Build(deps): Bump @nextcloud/vue from 8.21.0 to 8.22.0
* fix(FoldersController): Refactor addToFolder
* Fix(l10n): Update translations from Transifex

## [15.0.4] - 2024-12-12

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source_dir=$(build_dir)/source
sign_dir=$(build_dir)/sign
package_name=$(app_name)
cert_dir=$(HOME)/.nextcloud/certificates
version+=15.0.4
version+=15.0.5

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

Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Requirements:
- mbstring: *
- when using MySQL, use at least v8.0
]]></description>
<version>15.0.4</version>
<version>15.0.5</version>
<licence>agpl</licence>
<author mail="[email protected]">Marcel Klehr</author>
<author mail="[email protected]" homepage="https://www.arthur-schiwon.de">Arthur Schiwon</author>
Expand Down
1 change: 1 addition & 0 deletions l10n/da.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ OC.L10N.register(
"No bookmarks here" : "Ingen bogmærker her",
"Add bookmarks manually or import bookmarks from a HTML file." : "Tilføj bogmærker manuelt eller importer bogmærker fra en HTML-fil.",
"Enter the path of a folder in your Files where bookmarked files should be stored." : "Indtast stien til en mappe i dine filer, hvor bogmærkede filer skal gemmes.",
"The bookmarks app can automatically backup your bookmarks on a daily basis to prevent data loss when syncing bookmarks across devices." : "Bogmærkeapp'en kan automatisk tage backup af dine bogmærker på en daglig basis, for at forhindre datatab når der synkroniseres bogmærker på tværs af apparater.",
"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.",
"Client apps" : "Klient apps",
"Also check out the collection of client apps that integrate with this app: " : "Tjek også samlingen af klientapps, der integreres med denne app:",
Expand Down
1 change: 1 addition & 0 deletions l10n/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
"No bookmarks here" : "Ingen bogmærker her",
"Add bookmarks manually or import bookmarks from a HTML file." : "Tilføj bogmærker manuelt eller importer bogmærker fra en HTML-fil.",
"Enter the path of a folder in your Files where bookmarked files should be stored." : "Indtast stien til en mappe i dine filer, hvor bogmærkede filer skal gemmes.",
"The bookmarks app can automatically backup your bookmarks on a daily basis to prevent data loss when syncing bookmarks across devices." : "Bogmærkeapp'en kan automatisk tage backup af dine bogmærker på en daglig basis, for at forhindre datatab når der synkroniseres bogmærker på tværs af apparater.",
"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.",
"Client apps" : "Klient apps",
"Also check out the collection of client apps that integrate with this app: " : "Tjek også samlingen af klientapps, der integreres med denne app:",
Expand Down
2 changes: 1 addition & 1 deletion l10n/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ OC.L10N.register(
"Takes a link and adds it to your collection of bookmarks." : "Nimmt einen Link und fügt ihn deiner Lesezeichen-Sammlung hinzu.",
"Bookmarks Backups" : "Lesezeichen-Sicherungekopien",
"Collect and manage bookmarks, synced with all your devices" : "Lesezeichen sammeln, verwalten, die mit mit all deinen Geräten synchronisiert sind",
"- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0" : "- 📂 Lesezeichen in Ordner sortieren\n- 🏷 Schlagworte und persönliche Notizen hinzufügen\n- ☠ Defekte Links und Duplikate finden\n- 📲 Mit allen deinen Browsern und Geräten synchronisieren\n- 📔 Archivierte Versionen deiner Ihrer Links speichern, sofern die Seite offline geht\n- 🔍 Volltextsuche in Seiteninhalten\n- 👪 Lesezeichen mit anderen Benutzern und über öffentliche Links teilen\n- ⚛ RSS-Feeds deiner Sammlungen generieren\n- 📈 Statistiken, wie oft du auf welche Links zugreifst\n- 🔒 Automatische Backups der Lesezeichensammlung\n- 💼 Integrierte Dashboard-Widgets für häufige und aktuelle Links\n\nAnforderungen:\n- PHP-Erweiterungen:\n- intl: *\n- mbstring: *\n- bei Verwendung von MySQL mindestens v8.0 erforderlich",
"- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0" : "- 📂 Lesezeichen in Ordner sortieren\n- 🏷 Schlagworte und persönliche Notizen hinzufügen\n- ☠ Defekte Links und Duplikate finden\n- 📲 Mit allen deinen Browsern und Geräten synchronisieren\n- 📔 Archivierte Versionen deiner Links speichern, sofern die Seite offline geht\n- 🔍 Volltextsuche in Seiteninhalten\n- 👪 Lesezeichen mit anderen Benutzern und über öffentliche Links teilen\n- ⚛ RSS-Feeds deiner Sammlungen generieren\n- 📈 Statistiken, wie oft du auf welche Links zugreifst\n- 🔒 Automatische Backups der Lesezeichensammlung\n- 💼 Integrierte Dashboard-Widgets für häufige und aktuelle Links\n\nAnforderungen:\n- PHP-Erweiterungen:\n- intl: *\n- mbstring: *\n- bei Verwendung von MySQL mindestens v8.0 erforderlich",
"Enter new title" : "Neuen Titel eingeben",
"Select bookmark" : "Lesezeichen wählen",
"You have never clicked this link" : "Du hast diesen Link noch nie angeklickt.",
Expand Down
2 changes: 1 addition & 1 deletion l10n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"Takes a link and adds it to your collection of bookmarks." : "Nimmt einen Link und fügt ihn deiner Lesezeichen-Sammlung hinzu.",
"Bookmarks Backups" : "Lesezeichen-Sicherungekopien",
"Collect and manage bookmarks, synced with all your devices" : "Lesezeichen sammeln, verwalten, die mit mit all deinen Geräten synchronisiert sind",
"- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0" : "- 📂 Lesezeichen in Ordner sortieren\n- 🏷 Schlagworte und persönliche Notizen hinzufügen\n- ☠ Defekte Links und Duplikate finden\n- 📲 Mit allen deinen Browsern und Geräten synchronisieren\n- 📔 Archivierte Versionen deiner Ihrer Links speichern, sofern die Seite offline geht\n- 🔍 Volltextsuche in Seiteninhalten\n- 👪 Lesezeichen mit anderen Benutzern und über öffentliche Links teilen\n- ⚛ RSS-Feeds deiner Sammlungen generieren\n- 📈 Statistiken, wie oft du auf welche Links zugreifst\n- 🔒 Automatische Backups der Lesezeichensammlung\n- 💼 Integrierte Dashboard-Widgets für häufige und aktuelle Links\n\nAnforderungen:\n- PHP-Erweiterungen:\n- intl: *\n- mbstring: *\n- bei Verwendung von MySQL mindestens v8.0 erforderlich",
"- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0" : "- 📂 Lesezeichen in Ordner sortieren\n- 🏷 Schlagworte und persönliche Notizen hinzufügen\n- ☠ Defekte Links und Duplikate finden\n- 📲 Mit allen deinen Browsern und Geräten synchronisieren\n- 📔 Archivierte Versionen deiner Links speichern, sofern die Seite offline geht\n- 🔍 Volltextsuche in Seiteninhalten\n- 👪 Lesezeichen mit anderen Benutzern und über öffentliche Links teilen\n- ⚛ RSS-Feeds deiner Sammlungen generieren\n- 📈 Statistiken, wie oft du auf welche Links zugreifst\n- 🔒 Automatische Backups der Lesezeichensammlung\n- 💼 Integrierte Dashboard-Widgets für häufige und aktuelle Links\n\nAnforderungen:\n- PHP-Erweiterungen:\n- intl: *\n- mbstring: *\n- bei Verwendung von MySQL mindestens v8.0 erforderlich",
"Enter new title" : "Neuen Titel eingeben",
"Select bookmark" : "Lesezeichen wählen",
"You have never clicked this link" : "Du hast diesen Link noch nie angeklickt.",
Expand Down
2 changes: 1 addition & 1 deletion l10n/lt_LT.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ OC.L10N.register(
"Owner" : "Savininkas",
"Sharing" : "Bendrinimas",
"Select a user or group" : "Pasirinkti naudotoją ar grupę",
"Share link" : "Bendrinimo nuoroda",
"Share link" : "Viešinio nuoroda",
"Copy RSS feed" : "Kopijuoti RSS kanalą",
"Delete link" : "Ištrinti nuorodą",
"Create public link" : "Sukurti viešąją nuorodą",
Expand Down
2 changes: 1 addition & 1 deletion l10n/lt_LT.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"Owner" : "Savininkas",
"Sharing" : "Bendrinimas",
"Select a user or group" : "Pasirinkti naudotoją ar grupę",
"Share link" : "Bendrinimo nuoroda",
"Share link" : "Viešinio nuoroda",
"Copy RSS feed" : "Kopijuoti RSS kanalą",
"Delete link" : "Ištrinti nuorodą",
"Create public link" : "Sukurti viešąją nuorodą",
Expand Down
1 change: 1 addition & 0 deletions l10n/pt_PT.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ OC.L10N.register(
"Copy link" : "Copiar hiperligação",
"Move" : "Mover",
"Link copied to clipboard" : "Ligação copiada para a área de transferência",
"This content is being downloaded for offline use. Please check back later." : "Este conteúdo está a ser transferido para utilização ''off-line''. Por favor, volte mais tarde.",
"Select all" : "Seleccionar todos",
"Go back" : "Voltar",
"Share folder" : "Partilhar pasta",
Expand Down
1 change: 1 addition & 0 deletions l10n/pt_PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Copy link" : "Copiar hiperligação",
"Move" : "Mover",
"Link copied to clipboard" : "Ligação copiada para a área de transferência",
"This content is being downloaded for offline use. Please check back later." : "Este conteúdo está a ser transferido para utilização ''off-line''. Por favor, volte mais tarde.",
"Select all" : "Seleccionar todos",
"Go back" : "Voltar",
"Share folder" : "Partilhar pasta",
Expand Down
Loading

0 comments on commit ced5ddc

Please sign in to comment.