Commit Graph

66 Commits

Author SHA1 Message Date
Caleb Owens
a57238a371
Merge pull request #4605 from gitbutlerapp/Vidluther-ai
Vidluther ai
2024-08-05 17:17:49 +02:00
Caleb Owens
3285ba6e90 Don't refer to claude 2024-08-05 17:14:46 +02:00
Caleb Owens
8e424b2405 Correct sonnet key 2024-08-05 17:12:55 +02:00
Caleb Owens
c751ab2922 Merged origin/master into gitbutler/master 2024-08-05 17:08:41 +02:00
Caleb Owens
e5a9c4687f
Merge pull request #4593 from patelka2211/improvements-in-drag-regions-of-welcome-page
Improvements in drag regions of welcome page.
2024-08-05 17:07:51 +02:00
Caleb Owens
f5f80baa61 Add in searching with Fuse 2024-08-05 16:41:12 +02:00
Nico Domino
cec6ed6fbf
fix: add two additional tsconfig options (#4592) 2024-08-05 14:21:38 +00:00
Nico Domino
a21d1bcfae
fix: ssh clone posthog event (#4603) 2024-08-05 14:06:50 +00:00
Nico Domino
91808b94b3
fix: add additional 'open' boolean to AppUpdater.svelte (#4602) 2024-08-05 13:55:12 +00:00
Caleb Owens
9593904fa7
Merge pull request #4600 from gitbutlerapp/restore-sidebar-filters
Restore filters
2024-08-05 15:22:42 +02:00
Caleb Owens
7903c73ae4 Restore filters 2024-08-05 15:16:56 +02:00
Kartavya Patel
49f9d67b81
Merge branch 'master' into improvements-in-drag-regions-of-welcome-page 2024-08-05 18:32:00 +05:30
Nico Domino
5c0b87a353
fix: remove CloneForm clone type segment select (#4599) 2024-08-05 12:56:47 +00:00
Caleb Owens
8eb5371b0a Fix the worst conflicts I've ever delt with 2024-08-05 14:01:49 +02:00
Pavel Laptev
aaf933f42d
UI package update (#4598)
* add `Button` and `Icon` to UI library

* Update Button.stories.ts

* button stories added

* remove unused dependencies

* update button stories

* Update DemoButton.stories.ts

* update tokens

* dark theme toggle fix

* replace buttons with buttons from the package UI

* Update FileCardHeader.svelte

* Update BranchLaneContextMenu.svelte

* replace the app `Icon` component with the `UI` component

* fix `Icon` import in the `package UI`

* update imports for `icons.json`

* fix wrong type on Storybook

* update imports for `types`

* fix import order

* storybook grouping update
2024-08-05 13:20:03 +02:00
Caleb Owens
0b31743a2e mergey merge 2024-08-05 11:43:10 +02:00
Caleb Owens
aec1bda197 stuff 2024-08-05 11:37:39 +02:00
Nico Domino
7a33fc8ffe
fix: commit message component behaviour (#4597) 2024-08-05 11:06:02 +02:00
Vid Luther
ff6c9f4c7d fix lint check
lint test was failing due to extra comma
2024-08-04 11:14:03 -05:00
Vid Luther
1dfe4ed4e7 feat: Rename 'Claud35Sonnet' to 'Claude35Sonnet'
The 'Claud35Sonnet' enum value has been renamed to 'Claude35Sonnet' to
correctly reflect the model name. This change ensures consistency in
the codebase and improves readability.
2024-08-04 11:05:13 -05:00
Vid Luther
2b9da0d6d8 feat(desktop): add new OpenAI and Anthropic model options
The changes introduced in this commit add new OpenAI and Anthropic model options to the AI settings page in the desktop application. Specifically, the following changes were made:

- Added 'GPT 4o mini' as a new OpenAI model option
- Added 'Claude 3.5 Sonnet' as a new Anthropic model option
- Updated the labels for existing model options to improve clarity and readability

These changes provide users with more choices when selecting the AI model they want to use, allowing them to better tailor the application to their specific needs and preferences.
2024-08-04 11:01:05 -05:00
Pavel Laptev
48d2e8baea
Package UI update (#4594)
* bump SB version

* fix Segmented control import

* formatting fix

* fix formatting on build

* migrate to Terrazzo + utility classes WIP

* copy update

* Update c-colors.mdx

* fix hex color

* move diff variables into tokens

* Update c-colors.mdx

* Update pnpm-lock.yaml

* Update pnpm-lock.yaml

* update terrazzo

* Update pnpm-lock.yaml
2024-08-04 14:53:45 +02:00
Kartavya Patel
201a626315 Improvements in drag regions of welcome page. 2024-08-03 23:00:11 +05:30
Nico Domino
549dff6205
fix: remove playwright (#4588) 2024-08-02 14:17:32 +02:00
Caleb Owens
691c5b3700 linty linty fixy fixy 2024-08-01 18:24:34 +02:00
Caleb Owens
00b778638a Demoing conflict resolution 2024-08-01 18:09:23 +02:00
Caleb Owens
91b939563c asdf 2024-08-01 18:05:03 +02:00
Nico Domino
cda04e9b5b
feat: clone repo onboarding step (#4542)
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-08-01 16:54:49 +02:00
Caleb Owens
bbcfbbd72b Redid branch page 2024-08-01 16:28:37 +02:00
Caleb Owens
e9d1192b6d correct orderign and PR duplication 2024-08-01 14:47:22 +02:00
Caleb Owens
32b9b523ca stuff and things 2024-08-01 14:11:54 +02:00
Caleb Owens
70422439d7 integrated the thign 2024-07-31 19:41:08 +02:00
Caleb Owens
09de80f6f0 Mergy merge 2024-07-31 13:11:02 +02:00
Caleb Owens
43600c0a13 Moved some stuff into the UI package 2024-07-31 13:08:48 +02:00
Pavel Laptev
626ae0e390
Merge pull request #4556 from gitbutlerapp/Style-updates
Style updates
2024-07-31 13:05:05 +02:00
Caleb Owens
970a14930c Make the service reactive 2024-07-31 11:55:55 +02:00
Nico Domino
ad92566cb3
fix: AppUpdater popover not able to be closed (#4555) 2024-07-31 11:51:04 +02:00
Pavel Laptev
3a93599e5c styles fix: board links 2024-07-31 11:45:27 +02:00
Pavel Laptev
6fe1f25959
Diff-hunk-style-fixes (#4551)
* remove styles duplication

* Add hunk background color

* fix: gap between commits when dragging

* update hunk line colors

* fix: number columns cliping

* fix: number column border clipping

* diff styles update

* update "large diff" message style
2024-07-31 00:31:26 +02:00
Kiril Videlov
9ac21d39b5
fix one more callsite 2024-07-30 22:31:43 +02:00
Kiril Videlov
9fd02c41c0
update the UI for sync-ing (feature flagged) 2024-07-30 22:08:39 +02:00
Mattias Granlund
235a6a5d83 Fix a few problems in hunk/commit drag operations 2024-07-30 18:16:15 +01:00
Mattias Granlund
e1eea3c5ab Relax the amend restriction
We currently don't have accurate lock data. Also, we should allow amending to any commit _later_ than the lock subject.
2024-07-30 16:29:04 +01:00
Caleb Owens
142798383f Merged origin/master into sidebar-branches 2024-07-30 17:11:00 +02:00
Caleb Owens
445bd6a66f Use our svelte based explosion handling 2024-07-30 16:44:27 +02:00
Caleb Owens
e53c11a477 introduce last commiter field, use jsdoc, add type transforms 2024-07-30 16:42:20 +02:00
Nico Domino
7175d28304
fix: tweak pii onboarding copy (#4540) 2024-07-30 15:16:16 +02:00
Caleb Owens
32868092ed Merged origin/master into sidebar-branches 2024-07-30 13:45:00 +02:00
Nico Domino
9646684f92
feat: refactor diff rendering (#4497)
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-07-30 13:27:19 +02:00
Pavel Laptev
2e3e733ac5 Merged origin/master into sidebar-branches 2024-07-29 14:24:48 +02:00