Commit Graph

6900 Commits

Author SHA1 Message Date
Ani Betts
a47ebbc22d
Don't show command prompt when commit signing is enabled 2024-05-21 12:04:41 +02:00
Mattias Granlund
b1cf9b4e10 Fix shadow line height in commits section 2024-05-21 10:32:31 +02:00
Pavel Laptev
6e6272983b
History and minor UI fixes (#3797)
* Convert Capital case to Uper case "History menu"

* UI updates: target branch styles

* Remove console.log

* CSS: space between "Trunk" and the timer

* UI: reversed chevron arrows fix

* remove commented console.log

* UX: toggle file preview in History

* UI: target branch set animation fix
2024-05-21 01:07:22 +02:00
Pavel Laptev
8c78395ca3
History fixes (#3796)
* History fixes

- fix footrer button
- added a method to listed if there are no snapshots to load
- style fixes

* formatting
2024-05-20 19:28:03 +02:00
Kiril Videlov
e3cb98d1ee
Merge pull request #3790 from gitbutlerapp/update-ipc-code
Update IPC imports and remove old logic
2024-05-19 23:16:47 +02:00
Kiril Videlov
f768221b09
Merge pull request #3791 from gitbutlerapp/Virtual-branch
make GitGuardian happy
2024-05-19 19:03:05 +02:00
Kiril Videlov
330b48003b make GitGuardian happy 2024-05-19 19:01:43 +02:00
Kiril Videlov
d7578f19c9
Merge pull request #3702 from ndom91/ndom91/add-playwright-test
feat: add `@playwright/test` e2e test setup
2024-05-19 19:00:10 +02:00
Kiril Videlov
89295f8933 bump playwright version 2024-05-19 17:30:37 +02:00
Kiril Videlov
60fcfde2fb add vitest exclude for node_modules 2024-05-19 16:53:36 +02:00
Caleb Owens
fa973fd8f1 Remove unused exports from ipc 2024-05-19 15:43:07 +01:00
Caleb Owens
87a10e2bd3 Update auth.ts to use absolute import 2024-05-19 15:43:07 +01:00
Caleb Owens
c1f295f6f4 Use correct invoke function 2024-05-19 15:43:07 +01:00
Kiril Videlov
9875dff1d7 Merge branch 'master' into ndom91/add-playwright-test 2024-05-19 16:28:47 +02:00
Kiril Videlov
bb1b5ce0e5
Merge pull request #3789 from gitbutlerapp/gitbutler-tracked-data-files-implementation
setup for async tasks on oplog update
2024-05-19 16:07:40 +02:00
Kiril Videlov
662a62c2f2 setup for async tasks on oplog update
As we start building out code collaboration we wanna have the ability to push gitbutler state to, when enabled
2024-05-19 15:53:27 +02:00
Scott Chacon
070a88beb9
Merge pull request #3787 from gitbutlerapp/save-and-restore-the-gitbutler/integration-branch
save and restore the gitbutler/integration branch
2024-05-19 07:36:52 +02:00
Scott Chacon
18de60740b formatting 2024-05-19 07:24:15 +02:00
Scott Chacon
2a89fa6b93 save and restore the gitbutler/integration branch
when we save the snapshots, save and restore the integration branch commit properly so we don't get in a weird state after restore
2024-05-19 07:07:55 +02:00
Kiril Videlov
b3a1699cbf
Merge pull request #3786 from gitbutlerapp/Virtual-branch-1
remove unneccessary CSPs
2024-05-18 18:26:51 +02:00
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