Commit Graph

6822 Commits

Author SHA1 Message Date
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
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
Scott Chacon
4b683828cd
Merge pull request #3721 from gitbutlerapp/add-commit-id
Add change-id property to commit
2024-05-15 13:37:11 +00:00
Scott Chacon
5becf4e6a6
small fixes 2024-05-15 15:24:08 +02:00
Scott Chacon
b0c5c07a57
some change-id based tests 2024-05-15 15:21:19 +02:00
Scott Chacon
2ce4e5bfd0
remove a bunch of debugging 2024-05-15 14:48:26 +02:00
Scott Chacon
d267dbc77d
rust is not my favorite language 2024-05-15 13:40:27 +02:00
Scott Chacon
a23253e57d
who committed this? 2024-05-15 11:14:05 +02:00
Scott Chacon
9e817b4d04
Merged origin/master into add-commit-id 2024-05-15 10:43:34 +02:00
Caleb Owens
6000ec6ae6 Allow multi-message prompt templates 2024-05-15 08:09:37 +01:00
Caleb Owens
a4a05b0c4c Fix sorting for commit messages 2024-05-15 07:33:23 +01:00
estib
6200b950c6 Ollama client: Add meta-prompt guardrails
- Add some formatting meta-prompts to the chat commands for increased consistency
- Separate steps into private methods
2024-05-14 21:03:14 +01:00
Caleb Owens
3ec7143201 Implement ollama client 2024-05-14 21:03:14 +01:00
Caleb Owens
27583248d8 Remove no-longer-required ts-expect-error 2024-05-14 21:03:14 +01:00
Caleb Owens
efca8a2db2 Updated enums
- Removed duplicated ModelKind enum
- Fixed enum spelling
2024-05-14 21:03:14 +01:00
Caleb Owens
032408a761 Update prompt to emphisise only responding with the commit message 2024-05-14 21:03:14 +01:00
Kiril Videlov
b2f8ab589e
Merge pull request #3764 from gitbutlerapp/update-restore-snapshot-functionality
snapshot of restores keeps more metadata
2024-05-14 16:57:07 +02:00
Scott
520d95aef2 merge upstream 2024-05-14 14:07:09 +00:00
Kiril Videlov
e93ddfac34
snapshot of restores keeps more metadata 2024-05-14 16:04:02 +02:00
Kiril Videlov
569b792b34
Merge pull request #3763 from gitbutlerapp/move-hunk-branch-updates-implementation
snapshots for move hunk include branch name
2024-05-14 15:10:48 +02:00
Kiril Videlov
8bae084518
snapshots for move hunk include branch name 2024-05-14 14:55:27 +02:00
Kiril Videlov
2110c26680
Merge pull request #3762 from gitbutlerapp/apply-unapply-branch-functions-fix
snapshots of (un)appy branches contains name
2024-05-14 14:48:39 +02:00
Kiril Videlov
631bc86031
snapshots of (un)appy branches contains name 2024-05-14 14:35:47 +02:00
Scott Chacon
4cde9ce71d
windows doesn't have permissions like this 2024-05-14 13:43:49 +02:00
Scott Chacon
202c551bc7
remove signing setting 2024-05-14 13:15:11 +02:00
Scott Chacon
b5c9f934d5
supporting gpg.ssh.program 2024-05-14 11:57:23 +02:00