Kiril Videlov
|
77a03917e5
|
Stack - handle reorder correctly
|
2024-10-14 01:41:24 +02:00 |
|
Pavel Laptev
|
c8c269eef7
|
style: Update design token for shadow commit (#5120)
|
2024-10-14 01:02:34 +02:00 |
|
Kiril Videlov
|
77b9ca4819
|
Merge pull request #5119 from gitbutlerapp/handle-undo-commit
stack - replace head on undo commit
|
2024-10-14 00:52:57 +02:00 |
|
Kiril Videlov
|
08a00a93b3
|
stack - replace head on undo commit
|
2024-10-13 23:59:30 +02:00 |
|
Kiril Videlov
|
c5cf1499ba
|
Merge pull request #5112 from gitbutlerapp/stack-update-target-commit
Adds replace_head method on the Stack trait
|
2024-10-12 14:10:43 +02:00 |
|
Kiril Videlov
|
ca6f3fd055
|
remove out of date todo
|
2024-10-11 22:57:52 +02:00 |
|
Kiril Videlov
|
18286a2142
|
Stack - adds a method to update the target commit with another in the stack
This is useful when a commit is destroyed (uncommit, squash, move)
|
2024-10-11 22:55:35 +02:00 |
|
Sebastian Thiel
|
44a6125c3c
|
Merge pull request #5100 from Byron/fix-5099
fix 5099
|
2024-10-11 20:53:36 +02:00 |
|
ndom91
|
373ba6036e
|
fix: add emptystateplaceholder to series header empty state
fix: update StackingBranchHeader with empty state
fix: empty state marginBottom: 10
|
2024-10-11 19:05:26 +02:00 |
|
Sebastian Thiel
|
9175e60e60
|
re-enable now working test thanks to gitoxide fix
|
2024-10-11 18:59:38 +02:00 |
|
ndom91
|
b86e171e8c
|
fix: rename series title
|
2024-10-11 18:45:17 +02:00 |
|
ndom91
|
a38c3cc5c1
|
fix: always show gap on stackingstatusicon and use border radius css variable
|
2024-10-11 17:03:03 +02:00 |
|
ndom91
|
2bdac25646
|
fix: add global 'package' npm script to package packages/* in one command
|
2024-10-11 15:04:15 +02:00 |
|
ndom91
|
43f8fa1b2c
|
fix: update stacking mode CommitNode tooltip contents
|
2024-10-11 15:04:15 +02:00 |
|
Kiril Videlov
|
dd440a8d56
|
Merge pull request #5102 from gitbutlerapp/Ensure-stack-initialized-when-re-applying-branch
Ensure stack initialized when re-applying branch
|
2024-10-11 12:06:59 +02:00 |
|
Caleb Owens
|
a4d7cb2783
|
Merge pull request #5097 from gitbutlerapp/Extract-persisted
Extract persisted into a shared library
|
2024-10-11 11:57:17 +02:00 |
|
Caleb Owens
|
316dd8d2b6
|
Extract persisted into a shared library
|
2024-10-11 11:55:07 +02:00 |
|
Mattias Granlund
|
9499bde372
|
Ensure stack initialized when re-applying branch
- set_stack_head could throw without it
- nolith reported this breakage on discord
|
2024-10-11 10:53:23 +02:00 |
|
Sebastian Thiel
|
4420f5d6be
|
Do not allow folders without a .git directory to be added as project (#5099)
|
2024-10-11 07:53:05 +02:00 |
|
Sebastian Thiel
|
21b463982c
|
reproduce #5099, adding a submodule as project fails (#5099)
|
2024-10-11 07:34:36 +02:00 |
|
Sebastian Thiel
|
304f92bf70
|
Use new 'self-contained' style for integration tests
|
2024-10-11 07:18:28 +02:00 |
|
ndom91
|
902b6526bf
|
fix: refactor historyViewToggle and add ctrl+z alias keyboard shortcut
|
2024-10-10 17:42:14 +02:00 |
|
Pavel Laptev
|
56d0fe44c8
|
"unnaply and drop changes" update copy, update modals UI and layout (#5092)
* update copy, update modals UI and layout
* Update BranchLaneContextMenu.svelte
|
2024-10-10 14:39:07 +00:00 |
|
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 |
|