Skip to content

Commit

Permalink
Merge branch 'main' into shuuji3/feat/emoji-reactions
Browse files Browse the repository at this point in the history
  • Loading branch information
shuuji3 authored Dec 22, 2024
2 parents f15e33f + 3b6a176 commit 0cdb1dc
Show file tree
Hide file tree
Showing 6 changed files with 2,223 additions and 806 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/it-IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@
"dismiss": "Ignora",
"read": "Leggi descrizione {0}"
},
"pinned": "Post fissato",
"poll": {
"count": "{0} voti|{0} voto|{0} voti",
"ends": "termina {0}",
Expand Down
1 change: 1 addition & 0 deletions locales/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@
"dismiss": "Dispensar",
"read": "Ler descrição de {0}"
},
"pinned": "Publicação afixada",
"poll": {
"count": "{0} votos|{0} voto|{0} votos",
"ends": "termina {0}",
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
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
"devDependencies": {
"@antfu/eslint-config": "^3.12.0",
"@antfu/ni": "^0.23.1",
"@nuxt/schema": "^3.14.1592",
"@types/chroma-js": "^2.4.4",
"@types/file-saver": "^2.0.7",
"@types/fnando__sparkline": "^0.3.7",
Expand All @@ -134,7 +133,7 @@
"flat": "^6.0.1",
"fs-extra": "^11.2.0",
"lint-staged": "^15.2.11",
"nuxt": "^3.14.1592",
"nuxt": "^3.13.2",
"prettier": "^3.4.2",
"sharp": "^0.33.5",
"sharp-ico": "^0.1.5",
Expand Down
Loading

0 comments on commit 0cdb1dc

Please sign in to comment.