Commit Graph

7137 Commits

Author SHA1 Message Date
Kiril Videlov
7e070ac0f5 remove unneccessary CSPs 2024-05-18 18:13:24 +02:00
Kiril Videlov
07b863731f
Merge pull request #3785 from gitbutlerapp/fix-ollama-request-security
Fix ollama request security
2024-05-18 18:08:39 +02:00
Kiril Videlov
c5450c47df
Merge pull request #3784 from gitbutlerapp/Virtual-branch
fix: forgot the port
2024-05-18 18:02:20 +02:00
Caleb Owens
6ae9b7ff6e Fix ollama request security 2024-05-18 16:51:20 +01:00
Kiril Videlov
a9316492c9 fix: forgot the port 2024-05-18 17:49:05 +02:00
Kiril Videlov
a9e991c627
Merge pull request #3783 from gitbutlerapp/update-snapshot-threshold-logic-branch
feat: Set default snapshot lines threshold to 20 when undefined
2024-05-18 16:50:55 +02:00
Kiril Videlov
92951b504e feat: Set default snapshot lines threshold to 20 when undefined 2024-05-18 16:49:20 +02:00
Kiril Videlov
ead482d4e5
Merge pull request #3782 from gitbutlerapp/Virtual-branch
fix: Updated connect-src to allow local connections for ollama
2024-05-18 16:41:02 +02:00
Kiril Videlov
8c291cdadf
Merge pull request #3780 from gitbutlerapp/minor-commit-card-tweaks
Minor tweaks to CSS and use real branch name
2024-05-18 16:40:47 +02:00
Kiril Videlov
8fa8cbfe6d fix: Updated connect-src to allow local connections for ollama 2024-05-18 16:28:19 +02:00
Caleb Owens
c1840b5b75 Minor tweaks to CSS and use real branch name 2024-05-18 00:16:58 +01:00
Mattias Granlund
425289e10a Unmount history component when hidden
- history service resets as history component is unmounted
- restores functionality I changed in my previous commit
2024-05-17 20:04:22 +02:00
Mattias Granlund
ec24ffe979 Fix bug leaving PR button visible 2024-05-17 20:03:41 +02:00
Mattias Granlund
c699ad4dfa Small refactor of history component 2024-05-17 18:51:47 +02:00
Scott Chacon
076ff9beed
Merge pull request #3768 from gitbutlerapp/oplog-tree-creation-and-insertions
first pass at new oplog tree builder
2024-05-17 15:41:23 +02:00
Scott Chacon
733780f302 reformat 2024-05-17 15:16:04 +02:00
Scott Chacon
dcc1b37331 rewrite our oplog tests 2024-05-17 15:11:19 +02:00
Scott Chacon
1cbcbb3478 change the oplog file name
this is both to be a little more clear, but mainly to reset users from the previous logic
2024-05-17 15:11:19 +02:00
Scott Chacon
62e9a80512 add logic for the first parentless snapshot 2024-05-17 15:11:19 +02:00
Scott Chacon
0f3005e467 first pass at new oplog tree builder
creates a work tree and properly restores
note
2024-05-17 15:11:19 +02:00
Kiril Videlov
eed84f51b6
Merge pull request #3776 from gitbutlerapp/hunk-context-menu-read-only
feat: Add readonly prop for HunkContextMenu and HunkViewer
2024-05-17 13:01:08 +02:00
Kiril Videlov
214706a608
Merge pull request #3775 from gitbutlerapp/add-snapshot-lines-threshold-option
feat: Add support for setting snapshot_lines_threshold in UpdateRequest
2024-05-17 12:57:39 +02:00
Kiril Videlov
f7e11b696c feat: Add readonly prop for HunkContextMenu and HunkViewer
Add readonly prop to HunkContextMenu and HunkViewer components for handling
readonly functionality.
2024-05-17 12:56:42 +02:00
Kiril Videlov
74fe02f109 feat: Add support for setting snapshot_lines_threshold in UpdateRequest 2024-05-17 12:44:20 +02:00
Pavel Laptev
072cbd65e7
Removed old history component (#3774) 2024-05-17 09:28:45 +02:00
Pavel Laptev
1be1218a71
History View UI (#3773)
* Separated History logic layout into components

* Layout update, components split and cover new data

* Added file preview

* handle event trigger

* empty states added

* Temp store for snapshot files + threshold section

* formatting

* added a gap between elements in footer

* CSS: padding fix
2024-05-17 01:21:19 +02:00
Caleb Owens
800e608208
Merge pull request #3772 from vidluther/master
Add support for GPT-4o (Omni) and switch to GPT 4 Turbo GA
2024-05-16 18:17:43 +01:00
Vid Luther
a0fcef2b53
Merge pull request #3 from vidluther/remove-unused-ai-settings-component
Remove AISettings.svelte
2024-05-16 10:11:57 -05:00
Vid Luther
db0daf56f5 Remove AISettings.svelte
Remove AISettings.svelte as it has been replaced with src/routes/ai/+page.svelte
2024-05-16 10:11:32 -05:00
Vid Luther
3842f352bd
Merge pull request #2 from vidluther/add-gpt4o-model-support
add-gpt4o-model-support
2024-05-16 09:33:29 -05:00
Vid Luther
25015edfb9 feat: update GPT4Turbo model name
Change GPT4Turbo enum from 'gpt-4-turbo-preview' to 'gpt-4-turbo'
to reflect the transition of the model from preview to general
availability. This update ensures our application references the
correct model version in line with OpenAI's latest offerings.
2024-05-16 09:02:37 -05:00
Vid Luther
a1b885b218
Merge branch 'gitbutlerapp:master' into add-gpt4o-model-support 2024-05-16 08:59:07 -05:00
Vid Luther
f0ff3433d9 feat: add GPT 4 Omni model to AI settings
Add GPT 4 Omni model to the AISettings component, the
OpenAIModelName enumeration, and the +page.svelte file. This enables
users to select the new model in settings.
2024-05-16 08:54:26 -05:00
Mattias Granlund
1e4da9a00e Fix commit card widths 2024-05-16 15:32:30 +02:00
Mattias Granlund
5cdf0b830e Fix rendering of upstream commits when remote commits exist 2024-05-16 15:32:30 +02:00
Mattias Granlund
364cacd775 Consider a branch "not pushed" if there are upstream commits 2024-05-16 15:32:30 +02:00
Mattias Granlund
61a0f817c0 Use custom tooltip in avatar component 2024-05-16 15:32:30 +02:00
Kiril Videlov
2035bcf1ce
Merge pull request #3767 from anaisbetts/dont-use-home-env
Don't use $HOME
2024-05-16 11:38:06 +02:00
Caleb Owens
27535ca409
Merge pull request #3741 from estib-vega/master
feat: Add support for Ollama
2024-05-16 07:00:21 +01:00
Mattias Granlund
31f1cb8607 Refactor commits section of branch lanes
Fix remote lane line issue
Drop unused file
Fix criteria for showing push button
Fix alignment of avatar for local commit
Fix criteria for showing pus/rebase button
Show tooltip on shadow commit marker hover
Add missing type param to CommitCard
Fix lint
Remove extraneous parameter
Drop a couple of console.log() calls
2024-05-16 01:19:38 +02:00
Mattias Granlund
deb1db188b Add parent/children props to commits 2024-05-16 01:19:38 +02:00
Ani Betts
2ff2b1f7ec
Format 2024-05-15 20:27:26 +02:00
Ani Betts
ddc2cfeb67
Flush on window focus 2024-05-15 20:27:26 +02:00
Ani Betts
e9cd5d3dca
Rewrite the timeouts
Change the strategy of how timeouts work, from a simple timer, to
something a bit more nuanced
2024-05-15 20:27:26 +02:00
Ani Betts
326e9fee02
Wire flushing into the Watcher
Give the main window a mechanism to flush pending changes via a Channel
2024-05-15 20:27:26 +02:00
Ani Betts
28de8135d2
Add a new mechanism to flush on "idle"
Optionally, if we detect that no change notifications have appeared for
a certain number of ticks, we will automatically flush pending
notifications
2024-05-15 20:27:26 +02:00
Ani Betts
1c3d8d3997
Allow events to be explicitly flushed
This adds a new method to allow us to explicitly flush pending change
notifications
2024-05-15 20:27:25 +02:00
Ani Betts
fe35b1f65f
Import notify_debounce_full
We need to make some changes to notify_debounce_full and it seems like
the project is unmaintained, let's copy-paste some code
2024-05-15 20:27:25 +02:00
Ani Betts
69cf9c8058
Don't use HOME env var
This environment variable doesn't exist on Windows
2024-05-15 17:39:23 +02:00
Ani Betts
1695ad5c53
Add dirs crate 2024-05-15 17:39:00 +02:00