Timothy Jaeryang Baek
ee1559378d
Merge branch 'main' into rag
2024-01-01 14:23:44 -05:00
Timothy Jaeryang Baek
6594661d24
Merge pull request #275 from dnviti/dev
...
Docker compose modularity improvements + kubernetes support
2024-01-01 14:20:39 -05:00
Timothy Jaeryang Baek
127886db14
Merge branch 'main' into dev
2024-01-01 14:09:45 -05:00
Timothy Jaeryang Baek
c5386d05ab
Merge pull request #311 from anuraagdjain/refac/auth-middleware
...
feat(auth): add auth middleware
2024-01-01 14:06:26 -05:00
Timothy Jaeryang Baek
39c4e0fc18
Merge branch 'main' into refac/auth-middleware
2024-01-01 13:59:51 -05:00
Timothy Jaeryang Baek
6c68e473cd
Merge pull request #335 from ollama-webui/edit-message-shortcut
...
feat: arrowup edit message shortcut
2024-01-01 13:58:53 -05:00
Timothy J. Baek
7d859141b4
feat: arrowup edit message shortcut
2024-01-01 10:57:27 -08:00
Timothy Jaeryang Baek
b42050fec8
Merge pull request #334 from ollama-webui/code-render-fix
...
fix: code render issue
2024-01-01 13:37:18 -05:00
Timothy J. Baek
affa6568d6
fix: code render issue
2024-01-01 10:35:46 -08:00
Daniele Viti
3b673eaaab
added kubernetes folder
2024-01-01 14:51:42 +01:00
Anuraag Jain
77323d9b25
refac: remove the verify_token and use get-current user for auth+user
2024-01-01 10:55:50 +02:00
Timothy Jaeryang Baek
b16f0ea2c5
Merge branch 'main' into rag
2024-01-01 02:36:05 -05:00
Timothy J. Baek
d5aa9e8710
feat: requirements for RAG
2023-12-31 23:35:17 -08:00
Timothy Jaeryang Baek
2d323b31e1
Merge branch 'main' into refac/auth-middleware
2024-01-01 02:25:39 -05:00
Timothy Jaeryang Baek
fed6a5b173
Merge pull request #332 from ollama-webui/chat-download
...
feat: download chat as txt file
2024-01-01 02:14:33 -05:00
Timothy J. Baek
254c36bea3
feat: download chat as txt file
2023-12-31 23:13:17 -08:00
Timothy J. Baek
7313e4246a
fix: readme.md formatting
2023-12-31 15:10:33 -08:00
Daniele Viti
87177e5bcf
manual merge
2023-12-31 11:27:47 +01:00
Daniele Viti
9edc181e49
Merge branch 'dev'
2023-12-31 11:24:40 +01:00
Daniele Viti
7354e8ebae
Merge branch 'dev'
2023-12-31 11:20:20 +01:00
Timothy Jaeryang Baek
8cfc787c13
Merge branch 'main' into refac/auth-middleware
2023-12-31 03:02:48 -05:00
Timothy Jaeryang Baek
d70abafab2
Merge pull request #330 from anuraagdjain/docs/readme
...
docs: add api workflow
2023-12-31 02:40:15 -05:00
Anuraag Jain
8daf4500e9
Merge branch 'docs/readme' of https://github.com/anuraagdjain/ollama-webui into docs/readme
2023-12-31 09:28:42 +02:00
Anuraag Jain
8cd6eaf1bc
docs: minor changes
2023-12-31 09:28:39 +02:00
Timothy Jaeryang Baek
9d251f1a1e
Merge branch 'main' into refac/auth-middleware
2023-12-30 23:27:02 -05:00
Timothy Jaeryang Baek
9abee7e263
Merge branch 'main' into docs/readme
2023-12-30 23:20:58 -05:00
Timothy Jaeryang Baek
3b3faa3f52
Merge pull request #322 from davidsyoung/fix-openai-settings
...
Add num_predict slider, fix settings not being sent to OpenAI endpoint & added more settings being sent
2023-12-30 23:20:25 -05:00
Timothy J. Baek
14440014e5
fix: new params do not require legacy fallback
2023-12-30 20:18:06 -08:00
Timothy J. Baek
0d6440f5c0
fix: num_predict default value should match ollama default
...
https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values
2023-12-30 20:16:05 -08:00
Anuraag Jain
8f21de9c7c
docs: add api workflow
...
- helps in development to understand what's happening under the hood
2023-12-30 14:20:34 +02:00
Anuraag Jain
60c801ee22
remove unused import in main
2023-12-30 13:08:03 +02:00
Anuraag Jain
2532cb1e70
Merge branch 'main' of github.com:ollama-webui/ollama-webui into refac/auth-middleware
2023-12-30 13:03:18 +02:00
Anuraag Jain
08c0d7a9ec
fix: merge conflicts
2023-12-30 13:00:21 +02:00
Anuraag Jain
613053e46c
Merge branch 'refac/auth-middleware' of https://github.com/anuraagdjain/ollama-webui into refac/auth-middleware
2023-12-30 12:53:35 +02:00
Anuraag Jain
bdd153d8f5
refac: use dependencies to verify token
...
- feat: added new util to get the current user when needed. Middleware was adding authentication logic to all the routes. let's revisit if we can move the non-auth endpoints to a separate route.
- refac: update the routes to use new helpers for verification and retrieving user
- chore: added black for local formatting of py code
2023-12-30 12:53:33 +02:00
Timothy Jaeryang Baek
880f58e81a
Merge pull request #329 from ollama-webui/main
...
dev
2023-12-30 04:55:33 -05:00
Timothy Jaeryang Baek
7753851e51
Merge branch 'main' into fix-openai-settings
2023-12-30 03:27:13 -05:00
Timothy Jaeryang Baek
13881beedd
Merge pull request #328 from ollama-webui/shortcut-fix
...
fix: toggle settings shortcut fix
2023-12-30 03:26:35 -05:00
Timothy J. Baek
bf40695eb8
fix: toggle settings shortcut fix
2023-12-30 00:24:57 -08:00
Timothy Jaeryang Baek
0890b53e13
Merge pull request #327 from ollama-webui/delete-all-chat
...
feat: delete all user chats
2023-12-30 03:21:09 -05:00
Timothy J. Baek
d5dc36b2a9
feat: delete all user chats
2023-12-30 00:15:37 -08:00
Timothy Jaeryang Baek
ee8e7c300a
Merge pull request #326 from ollama-webui/messages-refac
...
feat: message components refac
2023-12-30 02:41:40 -05:00
Timothy J. Baek
7ffc1902a9
feat: toggle settings shortcut added
2023-12-29 23:35:08 -08:00
Timothy J. Baek
b916f1b07d
feat: messages refac
2023-12-29 23:25:40 -08:00
Timothy J. Baek
f91a6b63d1
feat: message components refac
2023-12-29 23:03:48 -08:00
Timothy Jaeryang Baek
b919ac76af
Merge branch 'main' into fix-openai-settings
2023-12-29 21:05:49 -05:00
Timothy Jaeryang Baek
39b8e4430e
Merge branch 'main' into refac/auth-middleware
2023-12-29 12:45:46 -05:00
Timothy Jaeryang Baek
3ae1a5b14d
Merge pull request #325 from ollama-webui/doc-update
...
doc: important note update
2023-12-29 12:42:54 -05:00
Timothy J. Baek
78d095ad9d
doc: important note update
2023-12-29 09:41:46 -08:00
Timothy Jaeryang Baek
c540b75c09
Merge pull request #324 from ollama-webui/doc-update
...
doc: troubleshooting
2023-12-29 12:31:45 -05:00
