Skip to content

Commit 1ed92df

Browse files
committed
Merge branch 'master' into stable
2 parents ced5ddc + 0e9a711 commit 1ed92df

31 files changed

Lines changed: 1745 additions & 1886 deletions

.github/workflows/lint.yml

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

1414
strategy:
1515
matrix:
16-
php-versions: ['8.0', '8.1', '8.2']
16+
php-versions: ['8.1', '8.2', '8.3', '8.4']
1717

1818
name: php${{ matrix.php-versions }}
1919
steps:

.github/workflows/repair.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
matrix:
2626
php-versions: ['8.1']
2727
databases: ['sqlite', 'mysql', 'pgsql']
28-
server-versions: ['master']
28+
server-versions: ['master', 'stable31', 'stable30']
2929

3030
name: Repair step on ${{ matrix.databases }}-${{ matrix.server-versions }}
3131

.github/workflows/upgrade.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
matrix:
2626
php-versions: ['8.1']
2727
databases: ['sqlite', 'mysql', 'pgsql']
28-
server-versions: ['stable30']
29-
prev-version: ['stable14']
28+
server-versions: ['stable30', 'stable31', 'master']
29+
prev-version: ['stable14', 'stable']
3030

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

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.0] - 2025-02-23
8+
9+
### New
10+
11+
* feat: Add support for Nextcloud 31
12+
13+
### Fixed
14+
15+
* Fix(l10n): Update translations from Transifex
16+
* fix: Fix archive setting
17+
718
## [15.0.5] - 2025-01-18
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.0.5
10+
version+=15.1.0
1111

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This app provides you with a web interface for collecting and organizing bookmar
1616
- 📲 Synchronize with all your browsers and devices
1717
- 📔 Store archived versions of your links in case they are depublished
1818
- 🔍 Full-text search on site contents
19-
- 👪 Share bookmarks with other users and via public links
19+
- 👪 Share bookmarks with other users, groups and teams or via public links
2020
- ⚛ Generate RSS feeds of your collections
2121
- 📈 Stats on how often you access which links
2222
- 🔒 Automatic backups of your bookmarks collection

appinfo/info.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
- 📲 Synchronize with all your browsers and devices
1212
- 📔 Store archived versions of your links in case they are depublished
1313
- 🔍 Full-text search on site contents
14-
- 👪 Share bookmarks with other users and via public links
14+
- 👪 Share bookmarks with other users, groups and teams or via public links
1515
- ⚛ Generate RSS feeds of your collections
1616
- 📈 Stats on how often you access which links
1717
- 🔒 Automatic backups of your bookmarks collection
@@ -23,7 +23,7 @@ Requirements:
2323
- mbstring: *
2424
- when using MySQL, use at least v8.0
2525
]]></description>
26-
<version>15.0.5</version>
26+
<version>15.1.0</version>
2727
<licence>agpl</licence>
2828
<author mail="mklehr@gmx.net">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="30" />
45+
<nextcloud min-version="30" max-version="31" />
4646
</dependencies>
4747
<background-jobs>
4848
<job>OCA\Bookmarks\BackgroundJobs\CrawlJob</job>

l10n/ca.js

Lines changed: 49 additions & 0 deletions
Large diffs are not rendered by default.

l10n/ca.json

Lines changed: 49 additions & 0 deletions
Large diffs are not rendered by default.

l10n/cs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ OC.L10N.register(
180180
"Select tags and create new ones" : "Vybírejte štítky a vytvářejte nové",
181181
"Notes" : "Poznámky",
182182
"Notes for this bookmark …" : "Poznámky k této záložce…",
183-
"Archived file" : "Zaarchivovaný soubor",
183+
"Archived file" : "Archivovaný soubor",
184184
"Download file" : "Stáhnout si soubor",
185185
"Open file location" : "Otevřít umístění souboru",
186186
"Created {time} ago" : "Vytvořeno před {time}",

0 commit comments

Comments
 (0)