Caleb Owens
7c178734ce
Merge pull request #5093 from gitbutlerapp/Common-stuff
...
Move http service and context into shared library
2024-10-10 16:27:53 +02:00
Caleb Owens
d2034e1a5d
Move context into shared
2024-10-10 15:57:16 +02:00
ndom91
8769d7c8ac
fix: check stackingFeature to determine which alg to use for assigning 'localAndRemote' commit status
2024-10-10 15:43:11 +02:00
Caleb Owens
5b8c37f830
Move httpService into shared library
2024-10-10 15:31:17 +02:00
ndom91
9e27fea94e
fix: only set upstreamName if upstreamReference exists
2024-10-10 12:31:13 +02:00
ndom91
fef2865469
fix: branch header bottom border when PR card isnt there
2024-10-10 12:31:13 +02:00
ndom91
8fa6bfc152
fix: hide upstream related btns if stack/series hasn't been pushed yet
2024-10-10 12:31:13 +02:00
Esteban Vega
979b5620a1
Merge pull request #5087 from gitbutlerapp/fix-Set-the-system-prompt-separately
...
fix: Set the system prompt for Anthropic
2024-10-10 11:59:42 +02:00
Caleb Owens
c46eb573a9
Merge pull request #5079 from gitbutlerapp/Add-a-shared-package
...
Add a shared package
2024-10-10 11:52:15 +02:00
estib
9e2e13ae82
fix: Set the system prompt for Anthropic
...
The System Prompt for Anthropic needs to be set in a separate field.
Split that as well when using Anthropic through the Butler AI API.
2024-10-10 11:50:15 +02:00
ndom91
4e051e16ed
fix: status icon for series header
2024-10-10 11:12:53 +02:00
ndom91
89f630e7b3
fix: inline updating of series name
2024-10-10 11:10:24 +02:00
Mattias Granlund
27c23c7627
Capture stack usage metrics
2024-10-10 10:50:56 +02:00
Kiril Videlov
03247b7e22
Merge pull request #5082 from gitbutlerapp/more-pr-details-followups
...
Conflict Resolution: Add a confirmation modal
2024-10-10 10:37:45 +02:00
Esteban Vega
019bd93499
Merge pull request #5080 from gitbutlerapp/small-typing-fix-for-commit-textareas
...
fix: Commit Input: Update the typing of the text areas
2024-10-10 10:36:12 +02:00
estib
936ec01e8f
Conflict Resolution: Add a confirmation modal
...
If attempting to resolve conflicts on non-acestor-most commits, the user will be prompted to confirm whether they actually want that or not.
2024-10-10 10:30:29 +02:00
estib
31f929269f
fix: Commit Input: Update the typing of the text areas
...
Update the typing of the text areas components inside the commit message input component.
Also add guards against them being undefined
2024-10-10 10:14:41 +02:00
Esteban Vega
857cf7816c
More PR details follow-ups ( #5073 )
...
- Add a dedicated 'open PR in browser' button
- Fix the description generation in the modal
2024-10-10 00:02:01 +02:00
Caleb Owens
eead534ab7
Add a shared package
2024-10-09 23:06:31 +02:00
Esteban Vega
e28a4b697c
Merge pull request #5069 from gitbutlerapp/user-mail-is-optional
2024-10-09 22:50:00 +02:00
Kiril Videlov
03144a2683
Merge pull request #5078 from gitbutlerapp/refactor-virtual-branch-commit_integration-bug-fix
...
Stack: fixes an issue with displaying upstream commits
2024-10-09 22:43:59 +02:00
Kiril Videlov
bdb8f50ce8
Stack: fixes an issue with displaying upstream commits
2024-10-09 22:38:17 +02:00
ndom91
95767ab474
fix: rm 'create branch'/'push ref' btns from stacking commit card
2024-10-09 21:44:20 +02:00
ndom91
ebcfa9f9a0
fix: harmonize commitStatus types and ensure correct color commitCard and branchHeader are rendered
...
fix: eslint
2024-10-09 21:44:20 +02:00
ndom91
6e631d8ea4
fix: correctly color branch header
2024-10-09 21:44:20 +02:00
ndom91
b4deaae012
fix: do not group commits in stacking mode series rendering
2024-10-09 21:44:20 +02:00
ndom91
3a642c750f
fix: pass only 'upstreamPatches' and 'patches' from the current series to commitList
2024-10-09 21:44:20 +02:00
Kiril Videlov
43a1563ce4
Merge pull request #5075 from gitbutlerapp/fix-requires-force
...
Stack - correctly set the requires_force atribute
2024-10-09 21:22:18 +02:00
Kiril Videlov
f4a935c600
Stack - correctly set the requires_force atribute
...
If any commit from any series has divergence, forceful push is required
2024-10-09 21:13:38 +02:00
Caleb Owens
6b1bdb82eb
Merge pull request #5076 from gitbutlerapp/List-conflicted-files-in-commit-files-list
...
LIst conflicted files in commit files list
2024-10-09 20:38:50 +02:00
Caleb Owens
5071cc40ff
LIst conflicted files in commit files list
2024-10-09 20:21:57 +02:00
Caleb Owens
f5b904556d
Merge pull request #5074 from gitbutlerapp/Uncommit
...
Commit uncommit
2024-10-09 19:37:17 +02:00
Caleb Owens
3ba4261599
Commit uncommit
2024-10-09 19:35:05 +02:00
Kiril Videlov
f2d2a7ae14
Merge pull request #5071 from gitbutlerapp/Add-extra-info-on-patch-series-remote_commit_id
...
Add an extra field `remote_commit_id` on the API type `VirtualBranchCommit`
2024-10-09 18:25:50 +02:00
Kiril Videlov
3978476b78
Add an extra field remote_commit_id
on the API type VirtualBranchCommit
...
This makes it possibe (and easy) for the UI to determine if there is another (different) commit on the remote for the same patch
2024-10-09 18:15:10 +02:00
Kiril Videlov
f8c702cf03
Merge pull request #5070 from gitbutlerapp/switch-local-and-local-remote-colors
...
switch "local" and "local-remote" colors
2024-10-09 17:22:50 +02:00
Pavel Laptev
e05c1a4a08
Move dummy UI and minor code refactor ( #5061 )
...
* update: storybook styles
* fix: Link button prop
* move borderless textarea to UI
* add: BorderlessTextarea story
* remove unused `autoHeight`
* simplify "Props" names
* migrate to Svelte 5: EmptyState component
* fix: autofocus when open the branches search
* eslint
* lint fixes
* lint fixes
---------
Co-authored-by: estib <stron@me.com>
2024-10-09 17:00:35 +02:00
Nico Domino
531cbde1ff
fix: stackingCommitList reorder-dropzone and "add empty commit" btn rendering ( #5066 )
2024-10-09 16:59:37 +02:00
Pavel Laptev
488e6d2597
switch "local" and "local-remote" colors
2024-10-09 16:48:32 +02:00
estib
8860622ff4
User: Make email optional
...
When authenticating with some IdPs, email doesn't get shared.
In that case, trying to authenticate would just throw a Rust-end error to the users.
This fixes that
2024-10-09 16:43:00 +02:00
ndom91
7858230812
fix: disable deleting series if there is only 1
2024-10-09 15:39:58 +02:00
ndom91
e5fbb18883
fix: reorient new series name modal action btns
2024-10-09 15:39:58 +02:00
Caleb Owens
773a31e5b5
Merge pull request #5068 from gitbutlerapp/Fix-ordering-and-conflict-viewing-and-diffing
...
Make edit mode fantastic
2024-10-09 15:34:50 +02:00
Caleb Owens
82b58b6875
Make edit mode fantastic
2024-10-09 15:27:20 +02:00
Caleb Owens
41c6f5ac5c
Merge pull request #5063 from gitbutlerapp/Float-conflicted-files
...
Float unconflicted files in edit mode
2024-10-09 15:00:48 +02:00
Kiril Videlov
9cc51ff84a
Merge pull request #5065 from gitbutlerapp/dependabot/cargo/tauri-plugin-context-menu-8d5854f
...
Bump tauri-plugin-context-menu from `1cdd3b5` to `8d5854f`
2024-10-09 14:59:03 +02:00
Kiril Videlov
92ccda6f96
Merge pull request #5060 from gitbutlerapp/Consistent-setting-of-stack-head-and-updating-series
...
Consistent setting of stack head and updating series
2024-10-09 11:57:39 +02:00
dependabot[bot]
e414d3d360
Bump tauri-plugin-context-menu from 1cdd3b5
to 8d5854f
...
Bumps [tauri-plugin-context-menu](https://github.com/c2r0b/tauri-plugin-context-menu ) from `1cdd3b5` to `8d5854f`.
- [Commits](1cdd3b5567...8d5854f186
)
---
updated-dependencies:
- dependency-name: tauri-plugin-context-menu
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-10-09 09:36:08 +00:00
Mattias Granlund
aa4e1667c7
Enable prettier for .vscode files
...
- unclear why these were ever ignored
2024-10-09 11:31:08 +02:00
Caleb Owens
39f9f50296
Float unconflicted files in edit mode
2024-10-09 11:21:51 +02:00