Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
- google-drive
- google-drive-encrypted
- linkwarden
- karakeep
test-name:
- test
browsers:
Expand Down Expand Up @@ -176,6 +177,16 @@ jobs:
image: mariadb:10.5 # see https://github.com/nextcloud/docker/issues/1536
env:
MYSQL_ROOT_PASSWORD: ${{env.MYSQL_PASSWORD}}
karakeep:
image: ghcr.io/karakeep-app/karakeep:release
ports:
- 3000:3000
volumes:
- data:/data
env:
NEXTAUTH_SECRET: super_random_string
NEXTAUTH_URL: http://localhost:3000
DATA_DIR: /data

steps:

Expand Down Expand Up @@ -263,6 +274,7 @@ jobs:
GOOGLE_API_REFRESH_TOKEN: ${{ secrets.GOOGLE_API_REFRESH_TOKEN }}
LINKWARDEN_TOKEN: ${{ secrets.LINKWARDEN_TOKEN }}
APP_VERSION: ${{ matrix.app-version }}
KARAKEEP_TEST_HOST: 172.17.0.1:3000
run: |
npm run test
if: matrix.floccus-adapter != 'git-xbel' && matrix.floccus-adapter != 'git-html'
Expand Down
18 changes: 18 additions & 0 deletions _locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@
"DescriptionServerfolderlinkwarden": {
"message": "When syncing, your bookmarks in this browser will be stored as links under this collection and only links under this collection will be synced with this browser."
},
"DescriptionServerfolderkarakeep": {
"message": "When syncing, your bookmarks in this browser will be stored as links under this collection and only links under this collection will be synced with this browser."
},
"LabelLocaltarget": {
"message": "Local target"
},
Expand Down Expand Up @@ -801,6 +804,21 @@
"DescriptionReportproblem": {
"message": "If you would like to directly contact the developers with a concrete issue, you can do so here:"
},
"LabelAdapterKarakeep": {
"message": "Karakeep"
},
"DescriptionAdapterKarakeep": {
"message": "Sync your bookmarks with the open-source self-hosted Karakeep app. This option cannot make use of end-to-end encryption."
},
"LabelApiKey": {
"message": "API key"
},
"LabelKarakeepurl": {
"message": "The URL of your Karakeep server"
},
"LabelKarakeepconnectionerror": {
"message": "Failed to connect to your Karakeep server"
},
"LabelAdapterlinkwarden": {
"message": "Linkwarden"
},
Expand Down
1 change: 1 addition & 0 deletions src/lib/Account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ declare const DEBUG: boolean

// register Adapters
AdapterFactory.register('linkwarden', async() => (await import('./adapters/Linkwarden')).default)
AdapterFactory.register('karakeep', async() => (await import('./adapters/Karakeep')).default)
AdapterFactory.register('nextcloud-folders', async() => (await import('./adapters/NextcloudBookmarks')).default)
AdapterFactory.register('nextcloud-bookmarks', async() => (await import('./adapters/NextcloudBookmarks')).default)
AdapterFactory.register('webdav', async() => (await import('./adapters/WebDav')).default)
Expand Down
Loading
Loading