Commit graph

1159 commits

Author SHA1 Message Date
Timothy Jaeryang Baek
87a1927447
Merge pull request #647 from ollama-webui/gitignore
Update .gitignore
2024-02-04 21:29:24 -08:00
Timothy J. Baek
8468c18059 Update .gitignore 2024-02-04 21:29:04 -08:00
Timothy Jaeryang Baek
619e5d5bf9
Merge pull request #646 from ollama-webui/fix
fix: documents tags
2024-02-04 11:27:51 -08:00
Timothy J. Baek
713877772e fix: documents tags 2024-02-04 11:26:54 -08:00
Timothy Jaeryang Baek
bd0a75a885
Merge pull request #644 from ollama-webui/chore-styling
chore: styling fix
2024-02-04 01:18:17 -08:00
Timothy J. Baek
5e87717d8b chore: styling fix 2024-02-04 01:17:09 -08:00
Timothy Jaeryang Baek
e2f92f11d7
Merge pull request #643 from ollama-webui/export-all-user-chats
feat: export all chats from db
2024-02-04 01:08:39 -08:00
Timothy J. Baek
7c2f297c84 feat: export all chats from db
admin only
2024-02-04 01:07:18 -08:00
Timothy Jaeryang Baek
c4ca46637e
Merge pull request #642 from ollama-webui/multimodal-fix
feat: include only last images
2024-02-04 00:30:27 -08:00
Timothy J. Baek
6c7c35ad12 feat: include only last images 2024-02-04 00:29:40 -08:00
Timothy Jaeryang Baek
f70e6caf0e
Merge pull request #640 from ollama-webui/version
chore: version update
2024-02-03 17:42:21 -08:00
Timothy J. Baek
f73a1fc4ea chore: version update 2024-02-03 17:42:08 -08:00
Timothy Jaeryang Baek
323ec3787e
Merge pull request #624 from explorigin/session-security
Improve Session Security
2024-02-03 17:41:31 -08:00
Timothy Jaeryang Baek
1f02940bbd
Merge pull request #617 from ollama-webui/doc-collection
feat: document collection
2024-02-03 17:28:11 -08:00
Timothy J. Baek
f814b08bcc fix: disable all documents by default 2024-02-03 17:26:57 -08:00
Timothy J. Baek
eb2b1ab77b feat: query all documents 2024-02-03 17:21:51 -08:00
Timothy J. Baek
3858485675 fix: styling 2024-02-03 17:06:59 -08:00
Timothy J. Baek
683650ec00 feat: collection rag integration 2024-02-03 15:57:06 -08:00
Timothy J. Baek
7d2f788a3b feat: import collection from chat input 2024-02-03 15:48:44 -08:00
Timothy J. Baek
f448a4b385 feat: doc filter by tag 2024-02-03 15:17:00 -08:00
Timothy J. Baek
f538c9a1be feat: display doc tags 2024-02-03 15:00:16 -08:00
Timothy J. Baek
00803c92f2 feat: doc tagging 2024-02-03 14:44:49 -08:00
Timothy Jaeryang Baek
3382fd10a6
Merge pull request #636 from ollama-webui/ts-fix
fix: timestamp display
2024-02-03 12:24:50 -08:00
Timothy J. Baek
98f22ec957 fix: timestamp display 2024-02-03 12:24:24 -08:00
Timothy J. Baek
8fd1b62e04 fix: api function name 2024-02-02 22:59:36 -08:00
Timothy J. Baek
1d0eaec37e refac: queryVectorDB renamed to queryCollection 2024-02-02 22:57:18 -08:00
Timothy Jaeryang Baek
d07947885a
Merge pull request #618 from lainedfles/main
Disable Chroma telemetry
2024-02-02 17:00:44 -08:00
Timothy Farrell
b8cc21a9f6
Merge branch 'ollama-webui:main' into session-security 2024-02-02 09:04:21 -06:00
Tim Farrell
8298cefd62 Fix bash condition formatting 2024-02-02 09:02:48 -06:00
Tim Farrell
1031638d82 Maintain backward compatibility with WEBUI_JWT_SECRET_KEY for the time being 2024-02-02 09:02:35 -06:00
Tim Farrell
e2d481d99a Move the random secret generation to start.sh.
This way the random secret is created on first run instead of docker build. We don't really want all standard imaages to share a password anymore than we want a static password.
2024-02-02 09:02:23 -06:00
Tim Farrell
44799e2018 Remove some extraneous imports 2024-02-02 09:02:07 -06:00
Tim Farrell
4fceb404bd Call jwt.decode with the expected algorithms 2024-02-02 09:01:57 -06:00
Tim Farrell
e15dbdc46a Pass the instance we're using. 2024-02-02 09:01:34 -06:00
Tim Farrell
8c37edd027 Even though "User.email" is enforced as unique at signup, it is not a unique field in the database. Let's use "User.id" instead. This also makes it more difficult to do a session stealing attack. 2024-02-02 09:01:06 -06:00
Tim Farrell
2c1dacb9b6 We should verify signatures to make the whole session secret meaningful. 2024-02-02 09:00:31 -06:00
Tim Farrell
03a7e35967 Default docker installations should generate a random key instead of using a static secret that everyone can see. 2024-02-02 08:59:46 -06:00
Tim Farrell
d67f3d982b Start by renaming variables to something more generic. This will give us a bit more flexibility as we look to other session management mechanisms. 2024-02-02 08:58:13 -06:00
Self Denial
6c1e69cac2 Disable Chroma telemetry 2024-02-01 17:29:09 -07:00
Timothy J. Baek
50f7b20ac2 refac 2024-02-01 13:35:41 -08:00
Timothy J. Baek
485236624f feat: drag and drop document anywhere 2024-02-01 13:17:47 -08:00
Timothy Jaeryang Baek
92991a1f15
Merge pull request #616 from ollama-webui/web-doc-link
feat: web doc url link
2024-02-01 12:46:56 -08:00
Timothy J. Baek
7467b7fd67 feat: web doc url link 2024-02-01 12:45:38 -08:00
Timothy Jaeryang Baek
07919a878f
Merge pull request #615 from ollama-webui/unlimit-model-selection
feat: remove model selection limit
2024-02-01 12:37:29 -08:00
Timothy J. Baek
268497f963 feat: remove model selection limit 2024-02-01 12:36:21 -08:00
Timothy Jaeryang Baek
a04046b277
Merge pull request #614 from ollama-webui/incognito-sidebar-fix
fix: sidebar menu issue in incognito
2024-02-01 12:28:34 -08:00
Timothy J. Baek
8ffe262161 fix: sidebar menu issue in incognito 2024-02-01 12:26:27 -08:00
Timothy Jaeryang Baek
b2fae0643e
Merge pull request #558 from peperunas/patch-1
fix: use bash when starting the Dockerfile's entrypoint script (as th…
2024-01-29 16:33:59 -08:00
Timothy Jaeryang Baek
09534dad6e
Merge branch 'main' into patch-1 2024-01-29 16:24:16 -08:00
Timothy Jaeryang Baek
b5c10ff1e5
Merge pull request #598 from ollama-webui/run-ollama-sh-fix
fix: run-ollama-docker.sh
2024-01-29 15:39:18 -08:00