Kiril Videlov
263b7d5de7
Merge pull request #5505 from gitbutlerapp/point-to-previous-branch
...
Point stacked PRs to previous branch
2024-11-08 23:21:08 +01:00
Mattias Granlund
ecce51d069
Point stacked PRs to previous branch
...
- if no previous branch, point to base branch
2024-11-08 18:51:18 +01:00
Caleb Owens
92830e51d2
Fix the alignment of the labels in pr card
2024-11-08 18:26:05 +01:00
Pavel Laptev
e627b95e74
Integrate-upstream-modal-updates ( #5487 )
...
* fix: bold target branch name in divergence message
* feat: update IntegrationSeriesRow to use series data instead of title
* feat(ui): add tooltip for additional series in labels row
* feat: add SeriesLabelsRow component to IntegrationSeriesRow
2024-11-08 15:49:57 +01:00
Pavel Laptev
c4aabb6561
feat(prFooter): update footer format to enhance clarity
2024-11-08 12:47:50 +01:00
Pavel Laptev
222b930a0f
refactor styles and copy: update context menu components
2024-11-08 12:47:50 +01:00
Mattias Granlund
baa2a0bf7c
Add stack footer
2024-11-08 12:47:50 +01:00
Mattias Granlund
008d44ca43
Fix draft preference for creating PRs
...
- regressed in previous refactor
2024-11-08 10:24:49 +01:00
Mattias Granlund
78378117ef
Show better error if pr merge fails
...
- doesn't make sense to hide details
2024-11-08 09:29:04 +01:00
Mikael Carpenter
8a8269e831
fix: don't render pre if there's no error message
...
the parent container uses a gap, so an empty pre results in some extra padding that makes the InfoMessage asymmetric
2024-11-07 22:05:25 -08:00
Mattias Granlund
fbd909fd27
Improve branch list search results
...
- fusejs works well, was just lacking some configuration
2024-11-07 22:59:57 +01:00
Caleb Owens
e30aef409c
Merge pull request #5480 from gitbutlerapp/fix-jumpy-things
...
Fix jumpy jumps
2024-11-07 11:52:16 +01:00
Caleb Owens
c1630116dc
Fix jumpy jumps
2024-11-07 11:34:51 +01:00
Kiril Videlov
077626c7bd
Merge pull request #5475 from gitbutlerapp/remove-forge-id-type
...
Replace ForgeIdentifier with string type
2024-11-07 10:01:34 +01:00
Mattias Granlund
4ae424fc8b
Fix selection bug preventing refresh on file change
...
- simplify by updating uncommitted files from svelte file
- call reloadFiles after such an update
- clear selection properly
2024-11-07 09:58:50 +01:00
Mattias Granlund
54caba3951
Replace ForgeIdentifier with string type
...
- simplifying to keep things simple in the front end
2024-11-07 00:05:01 +01:00
Caleb Owens
272a064fa8
Merge pull request #5472 from gitbutlerapp/co-branch-1
...
Fix branch name reactivity issues
2024-11-06 19:24:52 +01:00
Caleb Owens
bf3114a7cf
handle commit number reactivity more wholly
2024-11-06 17:57:44 +01:00
Caleb Owens
26bae0a907
Fix reactivity issue in sidebar entry
2024-11-06 17:57:23 +01:00
Caleb Owens
5def9c8724
Fix reactivity issue in series header
2024-11-06 17:56:57 +01:00
Kiril Videlov
7da794e472
Set default branch no wiggle animation
2024-11-06 17:17:29 +01:00
Pavel Laptev
d0d4a4cafe
style: increase branch labels contrast
2024-11-06 16:18:37 +01:00
ndom91
64a5bf8706
fix: BaseBranch commitLine colors
2024-11-06 14:46:44 +01:00
Pavel Laptev
88f2849341
sidebar-update-for-stacking ( #5463 )
...
* feat: add SeriesLabelsRow component and update imports
Introduce the SeriesLabelsRow component to display a list of series
with an optional counter label. Update the CollapsedLane and HeaderMetaSection
to use the new component. Create stories for SeriesLabelsRow in Storybook
to facilitate testing and documentation. This enhances the UI by providing
a clearer representation of series data.
* feat: refactorEntry to use series instead of title
Remove title prop from SidebarEntry and replace it with a series
array. Update related components and stories to reflect this change.
This enhances the component's flexibility by allowing it to handle
multiple series, improving the overall user experience.
* style: update hover background color in SidebarEntry
* feat: add tooltip to series labels for clarity
* refactor: move wiggle animation to utility styles
Also removes unused DefaultTargetButton component code.
* Merge branch 'master' into sidebar-update-for-stacking
* feat: enhance SidebarEntry with title and optional series
Fix: PR sidebar entry
2024-11-06 11:45:37 +01:00
ndom91
db2905927e
fix: add dropzone over empty new series
2024-11-06 11:33:27 +01:00
ndom91
39012c5604
fix: swap StackingPullRequestCard -> PullRequestCard
2024-11-06 11:31:38 +01:00
estib
32e9e5d2e4
fix: Ollama message generation
...
Allow-list localhost to be fetched from.
Fix the ollama client message retrieval
2024-11-06 10:34:53 +01:00
estib
e688e35454
Branch listings: Display the author information + refresh the listing when needed
...
Display the gravatar image in the branch listing if present.
Refresh the branch listing on every commit done to or undone from it.
2024-10-30 15:58:02 +01:00
Kiril Videlov
149445c89e
Fix DetailedCommit - this no longer has files on it
2024-11-06 00:29:55 +01:00
Kiril Videlov
40cffe091b
Fixes a bug with generating branch names
2024-11-06 00:28:35 +01:00
Mattias Granlund
f39b1cdb10
Fix bug in file selection
...
- forgot this line in last commit
2024-11-05 20:41:22 +01:00
Mattias Granlund
8726ffd566
Fix file selection clearing on file changes
2024-11-05 20:34:35 +01:00
Mattias Granlund
a5e9974aa5
Remove unnecessary refresh after fetch
...
- a fetch emits new branch data
2024-11-05 20:34:17 +01:00
ndom91
107a7f1914
fix: avoid multiple branch.series loops
2024-11-05 17:17:58 +01:00
ndom91
1ccfb88494
fix: dont show push btn if all series have been integrated
2024-11-05 17:17:58 +01:00
Caleb Owens
3a68f93878
Merge pull request #5446 from gitbutlerapp/fix-setthings
...
typihg nsi ihard
2024-11-05 16:48:16 +01:00
Caleb Owens
4624dc1eb3
typihg nsi ihard
2024-11-05 16:45:54 +01:00
Pavel Laptev
1f50954792
some-style-fixes ( #5445 )
...
* fix added/removed tag colors
* fix helper class
* UI edit: integrated modal not so wide
* simplify copy
2024-11-05 16:17:59 +01:00
Pavel Laptev
de47b68e9b
New stack header ( #5437 )
...
* fix search icon in `Select`
* update "scroll into view" btn
* remove unused code
* stick header
* fix sticky top margin
* fix header z-index
* cut first series
* wiggle animation to the header added
* fix lane background on drag
* Delete OldStackHeader.svelte
* Update StackSeriesRow.svelte
* added `ControlSection` - the header top
* icons updated
* added StackMetaSection
* add branches selector
* animation fix
* Merge branch 'master' into new-stack-header
* fix wiggle animation
* stackheader menu added
* update collapsed lane
* Merge branch 'new-stack-header' of https://github.com/gitbutlerapp/gitbutler into new-stack-header
* Fix wrong imports
* Revert wrong change
* rename files
* fix renamed file import
* update get commit color with an existing function
2024-11-05 14:43:18 +00:00
ndom91
0eb38fec90
fix: LineSpacer export
2024-11-05 14:32:45 +01:00
ndom91
c6d90677b5
fix: BaseBranch page with header css
2024-11-05 14:32:45 +01:00
ndom91
6b2de4ef9c
fix: LineSpacer and LineManager args
2024-11-05 14:32:45 +01:00
ndom91
bfd6981311
fix: remove old commitLines
2024-11-05 14:32:45 +01:00
ndom91
77712af539
fix: remove Stacking.. prefix from components
2024-11-05 14:32:45 +01:00
ndom91
afd13534da
feat: remove unused CommitCard and related components
2024-11-05 14:32:45 +01:00
Kiril Videlov
0ebb6f6036
Expose stackBranches on VirtualBranchReference in the UI
...
To be used for rendering the updated design that shows the top-of-stack branch
2024-11-05 14:08:52 +01:00
Pavel Laptev
fdbf545179
Update StackingSeriesHeaderContextMenu.svelte ( #5436 )
2024-11-05 10:44:50 +01:00
ndom91
1bca738991
fix: BranchPreview.svelte
...
fix: BranchPreview.svelte move commitCard import
2024-11-05 10:36:12 +01:00
ndom91
d3df6a2776
feat: remove CommitCard usage from BranchPreview and BaseBranch view
2024-11-05 10:36:12 +01:00
Mattias Granlund
252ac974be
Fix bug preventing file context menu to open
...
- was happening for selected items
2024-11-04 23:34:34 +01:00
