Skip to content

Commit

Permalink
Merge branch 'elk-zone:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mastoduy authored Dec 31, 2024
2 parents c94097f + 6cfadd7 commit 6af285a
Show file tree
Hide file tree
Showing 6 changed files with 2,650 additions and 1,176 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ One could put Elk behind popular reverse proxies with SSL Handling like Traefik,

1. checkout source ```git clone https://github.com/elk-zone/elk.git```
1. got into new source dir: ```cd elk```
1. build Docker image: ```docker build .```
1. create local storage directory for settings: ```mkdir elk-storage```
1. adjust permissions of storage dir: ```sudo chown 911:911 ./elk-storage```
1. start container: ```docker-compose up -d```
1. start container: ```docker-compose up --build -d```

> [!NOTE]
> The provided Dockerfile creates a container which will eventually run Elk as non-root user and create a persistent named Docker volume upon first start (if that volume does not yet exist). This volume is always created with root permission. Failing to change the permissions of ```/elk/data``` inside this volume to UID:GID 911 (as specified for Elk in the Dockerfile) will prevent Elk from storing it's config for user accounts. You either have to fix the permission in the created named volume, or mount a directory with the correct permission to ```/elk/data``` into the container.
Expand Down
1 change: 1 addition & 0 deletions locales/eu-ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@
"dismiss": "Baztertu",
"read": "Irakurri {0} deskribapena"
},
"pinned": "Finkatutako bidalketa",
"poll": {
"count": "{0} boto|boto {0}|{0} boto",
"ends": "epemuga: {0}",
Expand Down
2 changes: 1 addition & 1 deletion locales/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@
"repo_link": "ElkのGitHubリポジトリ",
"request_error": "登録のリクエスト中にエラーが発生しました。再試行してもエラーが解消しない場合、Elkリポジトリにissueを報告してください。",
"title": "プッシュ通知を登録できませんでした",
"too_many_registrations": "ブラウザーの制限により、Elkは異なるサーバー上の複数アカウントに対してプッシュ通知サービスを使用できません。他のアカウントのプッシュ通知の登録を解除して、再登録する必要があります。",
"too_many_registrations": "ブラウザの制限により、Elkは異なるサーバー上の複数アカウントに対してプッシュ通知サービスを使用できません。他のアカウントのプッシュ通知の登録を解除して、再登録する必要があります。",
"vapid_not_supported": "このブラウザはWeb Push通知をサポートしていませんが、VAPIDプロトコルをサポートしているようです。"
},
"title": "プッシュ通知の設定",
Expand Down
1 change: 1 addition & 0 deletions locales/vi-VN.json
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@
"dismiss": "Bỏ qua",
"read": "Đọc {0} mô tả"
},
"pinned": "Tút đã ghim",
"poll": {
"count": "{0} bình chọn|{0} bình chọn|{0} bình chọn",
"ends": "đóng {0}",
Expand Down
21 changes: 10 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@elk-zone/elk",
"type": "module",
"version": "0.15.1",
"packageManager": "[email protected].0",
"packageManager": "[email protected].2",
"license": "MIT",
"homepage": "https://elk.zone/",
"main": "./nuxt.config.ts",
Expand Down Expand Up @@ -114,27 +114,26 @@
"ws": "^8.15.1"
},
"devDependencies": {
"@antfu/eslint-config": "^3.12.0",
"@antfu/ni": "^0.23.1",
"@nuxt/schema": "^3.14.1592",
"@types/chroma-js": "^2.4.4",
"@antfu/eslint-config": "^3.12.1",
"@antfu/ni": "^0.23.2",
"@types/chroma-js": "^2.4.5",
"@types/file-saver": "^2.0.7",
"@types/fnando__sparkline": "^0.3.7",
"@types/fs-extra": "^11.0.4",
"@types/js-yaml": "^4.0.9",
"@types/wicg-file-system-access": "^2023.10.5",
"@types/ws": "^8.5.13",
"@unlazy/nuxt": "^0.12.1",
"@unocss/eslint-config": "^0.65.1",
"@unocss/eslint-config": "^0.65.3",
"@vue/test-utils": "2.4.6",
"bumpp": "^9.9.1",
"consola": "^3.2.3",
"bumpp": "^9.9.2",
"consola": "^3.3.3",
"eslint": "^9.17.0",
"eslint-plugin-format": "^0.1.3",
"flat": "^6.0.1",
"fs-extra": "^11.2.0",
"lint-staged": "^15.2.11",
"nuxt": "^3.14.1592",
"lint-staged": "^15.3.0",
"nuxt": "^3.13.2",
"prettier": "^3.4.2",
"sharp": "^0.33.5",
"sharp-ico": "^0.1.5",
Expand All @@ -151,7 +150,7 @@
},
"resolutions": {
"nuxt-component-meta": "0.9.0",
"unstorage": "^1.13.1",
"unstorage": "^1.14.4",
"vitest": "2.1.8",
"vue": "^3.5.4"
},
Expand Down
Loading

0 comments on commit 6af285a

Please sign in to comment.