Caleb Owens
c35787a848
fix rust tests
2024-08-05 14:17:46 +02:00
Caleb Owens
e4c3557255
Merged origin/master into sidebar-branches
2024-08-05 14:02:01 +02:00
Caleb Owens
8eb5371b0a
Fix the worst conflicts I've ever delt with
2024-08-05 14:01:49 +02:00
Nico Domino
43341c4d0b
fix: cleanup dependencies in JS packages ( #4591 )
2024-08-05 13:45:31 +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
1e342de03a
fix merge
2024-08-05 11:45:45 +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
ee6a13c093
Merge pull request #4 from vidluther/add-gpt4o-mini-and-claude3.5-sonnet
...
✨ feat(desktop): add new OpenAI and Anthropic model options
2024-08-04 11:26:05 -05: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
d62ac9b003
Merge branch 'master' into improvements-in-drag-regions-of-welcome-page
2024-08-04 17:36:10 +05:30
Nico Domino
d559cffe6a
feat: add @gitbutler/ui, userService, authService and some minor cleanup ( #4595 )
2024-08-04 11:39:41 +00: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
Nico Domino
e5498665b4
feat: add WebdriverIO based E2E test setup ( #4561 )
2024-08-02 10:46:56 +00:00
Pavel Laptev
c177419aee
Package UI update ( #4587 )
...
* bump SB version
* fix Segmented control import
* formatting fix
2024-08-02 11:39:27 +02:00
Sebastian Thiel
89cce9555c
Merge pull request #4583 from Byron/normalization-fix
...
improve ref normalization
2024-08-02 09:28:09 +02:00
Sebastian Thiel
7fea6b8130
fix: don't allow trailing . ( #4570 )
...
This is a quick-fix for a specific case, even though the actual fix
should be offering branch normalization as part of the validation.
2024-08-02 09:15:39 +02:00
Kiril Videlov
e2bd607c94
Merge pull request #4581 from Byron/improve-git-revert
...
improve git revert
2024-08-02 08:35:57 +02:00
Sebastian Thiel
37c81b991b
show that revert branch name now fails to validate ( #4570 )
2024-08-01 22:17:42 +02:00
Sebastian Thiel
9476bf3b96
update gix to the latest version for gix-validate update ( #4570 )
2024-08-01 22:17:42 +02:00
Kiril Videlov
84b6815bd8
Merge pull request #4580 from gitbutlerapp/dependabot/cargo/rust-updates-191d328b20
...
Bump the rust-updates group across 1 directory with 8 updates
2024-08-01 22:13:30 +02:00
dependabot[bot]
c9c4630087
Bump the rust-updates group across 1 directory with 8 updates
...
Bumps the rust-updates group with 8 updates in the / directory:
| Package | From | To |
| --- | --- | --- |
| [thiserror](https://github.com/dtolnay/thiserror ) | `1.0.62` | `1.0.63` |
| [tokio](https://github.com/tokio-rs/tokio ) | `1.38.0` | `1.39.2` |
| [console-subscriber](https://github.com/tokio-rs/console ) | `0.3.0` | `0.4.0` |
| [serde_json](https://github.com/serde-rs/json ) | `1.0.120` | `1.0.121` |
| [assert_cmd](https://github.com/assert-rs/assert_cmd ) | `2.0.14` | `2.0.15` |
| [clap](https://github.com/clap-rs/clap ) | `4.5.9` | `4.5.13` |
| [bstr](https://github.com/BurntSushi/bstr ) | `1.9.1` | `1.10.0` |
| [toml](https://github.com/toml-rs/toml ) | `0.8.14` | `0.8.15` |
Updates `thiserror` from 1.0.62 to 1.0.63
- [Release notes](https://github.com/dtolnay/thiserror/releases )
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.62...1.0.63 )
Updates `tokio` from 1.38.0 to 1.39.2
- [Release notes](https://github.com/tokio-rs/tokio/releases )
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.38.0...tokio-1.39.2 )
Updates `console-subscriber` from 0.3.0 to 0.4.0
- [Release notes](https://github.com/tokio-rs/console/releases )
- [Changelog](https://github.com/tokio-rs/console/blob/main/release-plz.toml )
- [Commits](https://github.com/tokio-rs/console/compare/console-subscriber-v0.3.0...console-subscriber-v0.4.0 )
Updates `serde_json` from 1.0.120 to 1.0.121
- [Release notes](https://github.com/serde-rs/json/releases )
- [Commits](https://github.com/serde-rs/json/compare/v1.0.120...v1.0.121 )
Updates `assert_cmd` from 2.0.14 to 2.0.15
- [Changelog](https://github.com/assert-rs/assert_cmd/blob/master/CHANGELOG.md )
- [Commits](https://github.com/assert-rs/assert_cmd/compare/v2.0.14...v2.0.15 )
Updates `clap` from 4.5.9 to 4.5.13
- [Release notes](https://github.com/clap-rs/clap/releases )
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.9...v4.5.13 )
Updates `bstr` from 1.9.1 to 1.10.0
- [Commits](https://github.com/BurntSushi/bstr/compare/1.9.1...1.10.0 )
Updates `toml` from 0.8.14 to 0.8.15
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.14...toml-v0.8.15 )
---
updated-dependencies:
- dependency-name: thiserror
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: tokio
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-updates
- dependency-name: console-subscriber
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-updates
- dependency-name: serde_json
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: assert_cmd
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: clap
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: bstr
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: rust-updates
- dependency-name: toml
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-01 19:45:06 +00:00
Kiril Videlov
265f8f934e
Merge pull request #4577 from gitbutlerapp/dependabot/cargo/tauri-plugin-window-state-7c9dac1
...
Bump tauri-plugin-window-state from `76b0f65` to `7c9dac1`
2024-08-01 21:41:53 +02:00
Kiril Videlov
3b89b5cc94
Merge pull request #4576 from gitbutlerapp/dependabot/cargo/tauri-plugin-single-instance-7c9dac1
...
Bump tauri-plugin-single-instance from `76b0f65` to `7c9dac1`
2024-08-01 21:41:48 +02:00
Kiril Videlov
77095f72e2
Merge pull request #4575 from gitbutlerapp/dependabot/cargo/tauri-plugin-store-7c9dac1
...
Bump tauri-plugin-store from `76b0f65` to `7c9dac1`
2024-08-01 21:41:41 +02:00
Kiril Videlov
8ce77c26c4
Merge pull request #4574 from gitbutlerapp/dependabot/cargo/tauri-plugin-log-7c9dac1
...
Bump tauri-plugin-log from `76b0f65` to `7c9dac1`
2024-08-01 21:41:33 +02:00
Kiril Videlov
a23350dbcc
Merge pull request #4579 from gitbutlerapp/upgrade-sysinfo
...
update sysinfo crate version
2024-08-01 21:39:30 +02:00
Kiril Videlov
bb86eeacf3
update sysinfo crate version
2024-08-01 21:11:53 +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
dependabot[bot]
eb8644f118
Bump tauri-plugin-window-state from 76b0f65 to 7c9dac1
...
Bumps [tauri-plugin-window-state](https://github.com/tauri-apps/plugins-workspace ) from `76b0f65` to `7c9dac1`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases )
- [Commits](76b0f657d1...7c9dac1f42
2024-08-01 15:37:07 +00:00
dependabot[bot]
9d27bdf2fe
Bump tauri-plugin-single-instance from 76b0f65 to 7c9dac1
...
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace ) from `76b0f65` to `7c9dac1`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases )
- [Commits](76b0f657d1...7c9dac1f42
2024-08-01 15:36:45 +00:00
dependabot[bot]
a680bd61d6
Bump tauri-plugin-store from 76b0f65 to 7c9dac1
...
Bumps [tauri-plugin-store](https://github.com/tauri-apps/plugins-workspace ) from `76b0f65` to `7c9dac1`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases )
- [Commits](76b0f657d1...7c9dac1f42
2024-08-01 15:36:25 +00:00
dependabot[bot]
d699e7d582
Bump tauri-plugin-log from 76b0f65 to 7c9dac1
...
Bumps [tauri-plugin-log](https://github.com/tauri-apps/plugins-workspace ) from `76b0f65` to `7c9dac1`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases )
- [Commits](76b0f657d1...7c9dac1f42
2024-08-01 15:36:02 +00:00
Kiril Videlov
6d2ef8afe6
Merge pull request #4564 from Byron/git2-to-gix
...
branch-listing tests and refactors
2024-08-01 17:26:00 +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
Sebastian Thiel
949ac1698d
add more tests for a deeper understanding on the graph traversal.
2024-08-01 16:25:03 +02:00
Mattias Granlund
0cee9378cc
Switch tooltip from mouseover to pointerenter
...
- makes tooltip work on disabled buttons
2024-08-01 15:12:39 +01:00
Sebastian Thiel
d0e10ff570
make it possible to show remotes for virtual branches that are targets, too.
2024-08-01 15:34:42 +02:00
Sebastian Thiel
e6b00b5e0e
more tests and refactors for branch-listing
2024-08-01 15:21:30 +02:00
Caleb Owens
e9d1192b6d
correct orderign and PR duplication
2024-08-01 14:47:22 +02:00
Caleb Owens
5450ef15a1
mergey merge
2024-08-01 14:14:40 +02:00
Caleb Owens
32b9b523ca
stuff and things
2024-08-01 14:11:54 +02:00
