likelovewant
2dd3f3c67c
Merge branch 'ollama:main' into main
2025-12-05 12:25:10 +08:00
Bruce MacDonald
84a2cedf18
app: relay thinking false to server ( #13319 )
...
This fixes a bug where disabling thinking on deepseek-v3.1 did not stop the model from thinking.
When thinking is not defined it should not be sent to the server since this will cause error responses in some cases where the model does not support thinking. However if it is defined as false it should still be sent.
2025-12-03 15:06:55 -08:00
likelovewant
58a46a6e73
Merge branch 'ollama:main' into main
2025-11-22 17:42:25 +08:00
Eva H
47e272c35a
app/cmd: update ollama help to navigate to ollama doc instead of github page ( #13174 )
2025-11-20 16:30:35 -05:00
Jeffrey Morgan
417a81fda3
app: open app instead of always navigating to / on connect ( #13164 )
2025-11-20 12:59:17 -08:00
Eva H
1fd4cb87b2
app/cmd: restrict ollama:// URL scheme to supported paths ( #13120 )
2025-11-17 20:10:45 -05:00
Eva H
231cc878cb
app/ui: fix to point ollama client to ui backend in dev mode ( #13079 )
2025-11-17 12:58:35 -05:00
likelovewant
1ce7433505
Merge branch 'ollama:main' into main
2025-11-14 16:46:05 +08:00
Eva Ho
2a9b61f099
address comment
2025-11-11 08:58:55 -05:00
Eva Ho
9d615cdaa0
fix test
2025-11-10 20:13:50 -05:00
Eva Ho
6a818b8a09
clean up
2025-11-10 19:08:42 -05:00
Eva Ho
2aaf29acb5
app/ui: do not send to prevent errors with cloud provider
2025-11-10 19:05:00 -05:00
Eva H
a42f826acb
app/ui: using streamdown AI elements for markdown rendering
2025-11-10 12:05:59 -05:00
Bruce MacDonald
e10a3533a5
app/docs: remove out of date storybook instructions ( #13006 )
2025-11-08 13:28:18 -08:00
likelovewant
bbadbed1e8
fix merge conflict
2025-11-08 17:36:08 +08:00
Eva Ho
3501a4bdf9
address comment
2025-11-06 16:49:22 -05:00
Eva H
73a0cafc1e
Merge pull request #12973 from macarronesc/main
...
feat: add support for WebP images in Ollama's app
2025-11-06 16:31:46 -05:00
Eva Ho
e309c80474
address comments
2025-11-06 13:49:59 -05:00
Daniel Alejandro Coll Tejeda
a4a53692f8
refactor: remove GIF support from image validation tests and logging
2025-11-06 09:09:51 +00:00
Vincent Koc
4111db013f
app: fix macOS file picker to support Uniform Type Identifiers ( #12965 )
2025-11-05 21:37:17 -08:00
Eva Ho
536c987c39
address comment
2025-11-05 20:19:34 -05:00
Eva Ho
a534d4e9e1
fixing thinking not scrolling issue
2025-11-05 16:06:55 -05:00
Eva Ho
74586aa9df
address comments
2025-11-05 16:06:55 -05:00
Eva Ho
8c74f5ddfd
ui: using streamdown AI elements for markdown rendering
2025-11-05 16:06:55 -05:00
Daniel Alejandro Coll Tejeda
bddfa2100f
feat: add support for WebP images in Ollama's app
2025-11-05 21:23:20 +01:00
Daniel Hiltgen
d3b4b9970a
app: add code for macOS and Windows apps under 'app' ( #12933 )
...
* app: add code for macOS and Windows apps under 'app'
* app: add readme
* app: windows and linux only for now
* ci: fix ui CI validation
---------
Co-authored-by: jmorganca <jmorganca@gmail.com >
2025-11-04 11:40:17 -08:00
likelovewant
cb104a2082
Merge branch 'ollama:main' into main
2025-05-16 08:52:17 +08:00
Michael Yang
f95a1f2bef
feat: add trace log level ( #10650 )
...
reduce prompt log to trace level
2025-05-12 11:43:00 -07:00
likelovewant
23a2e85bf8
merge upstream and fix conflicts
2025-02-10 15:06:45 +08:00
Azis Alvriyanto
b901a712c6
docs: improve syntax highlighting in code blocks ( #8854 )
2025-02-07 09:55:07 -08:00
likelovewant
a64347c6d4
merge upstream and fix conflicts
2024-12-12 13:17:55 +08:00
Daniel Hiltgen
cf4d7c52c4
win: builtin arm runner ( #8039 )
...
The new build embeds the arm runner in the
main binary, so there is no longer a lib/ollama
2024-12-11 08:32:13 -08:00
Stefan Weil
abfdc4710f
all: fix typos in documentation, code, and comments ( #7021 )
2024-12-10 12:58:06 -08:00
likelovewant
24668cddf6
Merge branch 'ollama:main' into main
2024-11-22 21:15:15 +08:00
Mikel Olasagasti Uranga
597072ef1b
readme: update google/uuid module ( #7310 )
...
update uuid.New().String() to uuid.NewString()
2024-11-21 19:37:04 -08:00
Nikita Ganzikov
fce30f407a
app: typo in wintray messages const ( #7705 )
2024-11-20 22:01:58 -08:00
likelovewant
8b2fc1078b
Merge branch 'ollama:main' into main
2024-11-19 12:22:49 +08:00
Daniel Hiltgen
35096a7eff
win: add right click menu support ( #7727 )
...
Enable both left and right click on the pop-up menu
2024-11-18 14:39:52 -08:00
likelovewant
e0d2c332fe
Merge branch 'ollama:main' into main
2024-11-09 12:09:06 +08:00
Daniel Hiltgen
3d25e7bf8c
win: remove preview title from installer ( #7529 )
...
This should have been in #7347 but was overlooked.
2024-11-07 14:26:47 -08:00
likelovewant
6b5ed2f68f
merge upstream for 4.0 update
2024-11-07 12:07:28 +08:00
Daniel Hiltgen
91dfbb1bba
windows: Support alt install paths, fit and finish ( #6967 )
...
* windows: Support alt install paths
Advanced users are leveraging innosetup's /DIR switch to target
an alternate location, but we get confused by things not existing in the LocalAppData dir.
This also hardens the server path lookup code for a future attempt to unify with a ./bin prefix
* Fit and finish improvements for windows app
Document alternate install location instructions for binaries and model.
Pop up progress UI for upgrades (automatic, with cancel button).
Expose non-default port in menu to disambiguate mutiple instances.
Set minimum Windows version to 10 22H2
2024-10-30 09:24:31 -07:00
likelovewant
eec4cd6b52
remove arm64 to enable build installer
2024-10-13 16:40:38 +08:00
likelovewant
f6cc192947
Merge branch 'ollama:main' into main
2024-09-27 11:44:48 +08:00
Jeffrey Morgan
55ea963c9e
update default model to llama3.2 ( #6959 )
2024-09-25 11:11:22 -07:00
Daniel Hiltgen
d632e23fba
Add Windows arm64 support to official builds ( #5712 )
...
* Unified arm/x86 windows installer
This adjusts the installer payloads to be architecture aware so we can cary
both amd64 and arm64 binaries in the installer, and install only the applicable
architecture at install time.
* Include arm64 in official windows build
* Harden schedule test for slow windows timers
This test seems to be a bit flaky on windows, so give it more time to converge
2024-09-20 13:09:38 -07:00
likelovewant
76feb6c569
Merge branch 'ollama:main' into main
2024-08-28 12:02:21 +08:00
Daniel Hiltgen
93ea9240ae
Move ollama executable out of bin dir ( #6535 )
2024-08-27 16:19:00 -07:00
likelovewant
f9e1f572c2
Merge branch 'ollama:main' into main
2024-08-21 10:45:57 +08:00
Daniel Hiltgen
88bb9e3328
Adjust layout to bin+lib/ollama
2024-08-19 09:38:53 -07:00
