Skip to content

Commit 849ff57

Browse files
authored
Merge pull request #579 from n4ze3m/next
v1.5.12
2 parents 6984c10 + f571b86 commit 849ff57

36 files changed

+631
-69
lines changed

bun.lockb

424 Bytes
Binary file not shown.

docs/extensions-causing-issue-other-websites.md

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,47 @@ You can set OLLAMA_ORIGIN=* to allow connections from any origin. Here's how to
4242
1. Open Terminal
4343
2. Run the following command:
4444

45-
45+
```bash
4646
launchctl setenv OLLAMA_ORIGIN "*"
47+
```
4748

4849
3. Restart Ollama service
4950

5051
### Linux
5152
1. Open Terminal
5253
2. Run the following command:
5354

54-
55+
```bash
5556
export OLLAMA_ORIGIN="*"
57+
```
5658

5759
3. Restart Ollama service
5860

59-
_This will allow connections from any origin. Hopefully, this will resolve the connection issue._
61+
For Linux systems using systemd, you can also add the environment variable to your service file. Here's an example of a systemd unit file (credit: Axel Schwarzer):
62+
63+
```bash
64+
[Unit]
65+
Description=Ollama Service
66+
After=network-online.target
67+
68+
[Service]
69+
# - see docker.serice for an example
70+
#
71+
# EnvironmentFile=/etc/sysconfig/ollama
72+
Environment="OLLAMA_HOST=192.168.4.67:11434"
73+
Environment="OLLAMA_MAX_LOADED_MODELS=4"
74+
# Environment="OLLAMA_ORIGINS=*"
75+
ExecStart=/usr/local/bin/ollama serve
76+
User=ollama
77+
Group=ollama
78+
Restart=always
79+
RestartSec=3
80+
Environment="PATH=/usr/local/sbin:/sbin:/usr/sbin:/root/bin:/usr/local/bin:/bin:/usr/bin:"
81+
82+
[Install]
83+
WantedBy=default.target
84+
```
85+
86+
To use this configuration, uncomment the `Environment="OLLAMA_ORIGINS=*"` line.
87+
88+
_This will allow connections from any origin. Hopefully, this will resolve the connection issue._

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"@vitejs/plugin-react": "^4.2.1",
3838
"antd": "^5.13.3",
3939
"axios": "^1.6.7",
40+
"caniuse-lite": "^1.0.30001716",
4041
"cheerio": "^1.0.0-rc.12",
4142
"d3-dsv": "2",
4243
"dayjs": "^1.11.10",

src/assets/locale/ar/common.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,22 @@
123123
"last7Days": "آخر 7 أيام",
124124
"older": "أقدم"
125125
},
126+
"range": {
127+
"deleteConfirm": {
128+
"pinned": "هل أنت متأكد أنك تريد حذف جميع الرسائل المثبتة؟",
129+
"today": "هل أنت متأكد أنك تريد حذف جميع رسائل اليوم؟",
130+
"yesterday": "هل أنت متأكد أنك تريد حذف جميع رسائل الأمس؟",
131+
"last7Days": "هل أنت متأكد أنك تريد حذف جميع رسائل آخر 7 أيام؟",
132+
"older": "هل أنت متأكد أنك تريد حذف جميع الرسائل القديمة؟"
133+
},
134+
"tooltip": {
135+
"pinned": "حذف جميع الرسائل المثبتة",
136+
"today": "حذف جميع رسائل اليوم",
137+
"yesterday": "حذف جميع رسائل الأمس",
138+
"last7Days": "حذف جميع رسائل آخر 7 أيام",
139+
"older": "حذف جميع الرسائل القديمة"
140+
}
141+
},
126142
"pin": "تثبيت",
127143
"unpin": "إلغاء التثبيت",
128144
"generationInfo": "معلومات التوليد",

src/assets/locale/da/common.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,22 @@
116116
"last7Days": "Sidste 7 dage",
117117
"older": "Ældre"
118118
},
119+
"range": {
120+
"deleteConfirm": {
121+
"pinned": "Er du sikker på, at du vil slette alle fastgjorte beskeder?",
122+
"today": "Er du sikker på, at du vil slette alle beskeder fra i dag?",
123+
"yesterday": "Er du sikker på, at du vil slette alle beskeder fra i går?",
124+
"last7Days": "Er du sikker på, at du vil slette alle beskeder fra de sidste 7 dage?",
125+
"older": "Er du sikker på, at du vil slette alle ældre beskeder?"
126+
},
127+
"tooltip": {
128+
"pinned": "Slet alle fastgjorte beskeder",
129+
"today": "Slet alle beskeder fra i dag",
130+
"yesterday": "Slet alle beskeder fra i går",
131+
"last7Days": "Slet alle beskeder fra de sidste 7 dage",
132+
"older": "Slet alle ældre beskeder"
133+
}
134+
},
119135
"pin": "Fastgør",
120136
"unpin": "Frigør",
121137
"generationInfo": "Genererings Info",

src/assets/locale/de/common.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,22 @@
116116
"last7Days": "Letzte 7 Tage",
117117
"older": "Älter"
118118
},
119+
"range": {
120+
"deleteConfirm": {
121+
"pinned": "Sind Sie sicher, dass Sie alle angepinnten Nachrichten löschen möchten?",
122+
"today": "Sind Sie sicher, dass Sie alle Nachrichten von heute löschen möchten?",
123+
"yesterday": "Sind Sie sicher, dass Sie alle Nachrichten von gestern löschen möchten?",
124+
"last7Days": "Sind Sie sicher, dass Sie alle Nachrichten der letzten 7 Tage löschen möchten?",
125+
"older": "Sind Sie sicher, dass Sie alle älteren Nachrichten löschen möchten?"
126+
},
127+
"tooltip": {
128+
"pinned": "Alle angepinnten Nachrichten löschen",
129+
"today": "Alle Nachrichten von heute löschen",
130+
"yesterday": "Alle Nachrichten von gestern löschen",
131+
"last7Days": "Alle Nachrichten der letzten 7 Tage löschen",
132+
"older": "Alle älteren Nachrichten löschen"
133+
}
134+
},
119135
"pin": "Anheften",
120136
"unpin": "Losheften",
121137
"generationInfo": "Generierungsinformationen",

src/assets/locale/en/common.json

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@
109109
"reasoningEffort": {
110110
"label": "Reasoning Effort",
111111
"placeholder": "low, medium, high"
112-
113112
},
114113
"minP": {
115114
"label": "Min P",
@@ -155,6 +154,24 @@
155154
"last7Days": "Last 7 Days",
156155
"older": "Older"
157156
},
157+
"range": {
158+
"deleteConfirm": {
159+
"pinned": "Are you sure you want to delete all pinned messages?",
160+
"today": "Are you sure you want to delete all messages from today?",
161+
"yesterday": "Are you sure you want to delete all messages from yesterday?",
162+
"last7Days": "Are you sure you want to delete all messages from the last 7 days?",
163+
"older": "Are you sure you want to delete all older messages?"
164+
},
165+
"tooltip": {
166+
"pinned": "Delete all pinned messages",
167+
"today": "Delete all messages from today",
168+
"yesterday": "Delete all messages from yesterday",
169+
"last7Days": "Delete all messages from the last 7 days",
170+
"older": "Delete all older messages"
171+
}
172+
},
173+
"historiesDeleted": "{{count}} Histories Deleted",
174+
"deleteHistoriesError": "Error deleting histories",
158175
"pin": "Pin",
159176
"unpin": "Unpin",
160177
"generationInfo": "Generation Info",

src/assets/locale/es/common.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,22 @@
115115
"last7Days": "Últimos 7 días",
116116
"older": "Más antiguo"
117117
},
118+
"range": {
119+
"deleteConfirm": {
120+
"pinned": "¿Está seguro de que desea eliminar todos los mensajes fijados?",
121+
"today": "¿Está seguro de que desea eliminar todos los mensajes de hoy?",
122+
"yesterday": "¿Está seguro de que desea eliminar todos los mensajes de ayer?",
123+
"last7Days": "¿Está seguro de que desea eliminar todos los mensajes de los últimos 7 días?",
124+
"older": "¿Está seguro de que desea eliminar todos los mensajes más antiguos?"
125+
},
126+
"tooltip": {
127+
"pinned": "Eliminar todos los mensajes fijados",
128+
"today": "Eliminar todos los mensajes de hoy",
129+
"yesterday": "Eliminar todos los mensajes de ayer",
130+
"last7Days": "Eliminar todos los mensajes de los últimos 7 días",
131+
"older": "Eliminar todos los mensajes más antiguos"
132+
}
133+
},
118134
"pin": "Fijar",
119135
"unpin": "Desfijar",
120136
"generationInfo": "Información de Generación",

src/assets/locale/fa/common.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,22 @@
109109
"last7Days": "۷ روز گذشته",
110110
"older": "قدیمی‌تر"
111111
},
112+
"range": {
113+
"deleteConfirm": {
114+
"pinned": "آیا مطمئن هستید که می‌خواهید تمام پیام‌های پین شده را حذف کنید؟",
115+
"today": "آیا مطمئن هستید که می‌خواهید تمام پیام‌های امروز را حذف کنید؟",
116+
"yesterday": "آیا مطمئن هستید که می‌خواهید تمام پیام‌های دیروز را حذف کنید؟",
117+
"last7Days": "آیا مطمئن هستید که می‌خواهید تمام پیام‌های ۷ روز گذشته را حذف کنید؟",
118+
"older": "آیا مطمئن هستید که می‌خواهید تمام پیام‌های قدیمی‌تر را حذف کنید؟"
119+
},
120+
"tooltip": {
121+
"pinned": "حذف تمام پیام‌های پین شده",
122+
"today": "حذف تمام پیام‌های امروز",
123+
"yesterday": "حذف تمام پیام‌های دیروز",
124+
"last7Days": "حذف تمام پیام‌های ۷ روز گذشته",
125+
"older": "حذف تمام پیام‌های قدیمی‌تر"
126+
}
127+
},
112128
"pin": "پین کردن",
113129
"unpin": "حذف پین",
114130
"generationInfo": "اطلاعات تولید",

src/assets/locale/fr/common.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,22 @@
150150
"last7Days": "7 derniers jours",
151151
"older": "Plus ancien"
152152
},
153+
"range": {
154+
"deleteConfirm": {
155+
"pinned": "Êtes-vous sûr de vouloir supprimer tous les messages épinglés ?",
156+
"today": "Êtes-vous sûr de vouloir supprimer tous les messages d'aujourd'hui ?",
157+
"yesterday": "Êtes-vous sûr de vouloir supprimer tous les messages d'hier ?",
158+
"last7Days": "Êtes-vous sûr de vouloir supprimer tous les messages des 7 derniers jours ?",
159+
"older": "Êtes-vous sûr de vouloir supprimer tous les messages plus anciens ?"
160+
},
161+
"tooltip": {
162+
"pinned": "Supprimer tous les messages épinglés",
163+
"today": "Supprimer tous les messages d'aujourd'hui",
164+
"yesterday": "Supprimer tous les messages d'hier",
165+
"last7Days": "Supprimer tous les messages des 7 derniers jours",
166+
"older": "Supprimer tous les messages plus anciens"
167+
}
168+
},
153169
"pin": "Épingler",
154170
"unpin": "Désépingler",
155171
"generationInfo": "Informations de génération",

0 commit comments

Comments
 (0)