Commit Graph

9499 Commits

Author SHA1 Message Date
Pavel Laptev
ba2d95a338
style: button color updates (#5134) 2024-10-14 15:42:55 +02:00
Nico Domino
88611b6ab5 fix: layout updates 2024-10-14 15:40:47 +02:00
ndom91
f2fffce255 feat: add additional feature flag to disable adding multiple series within a stack 2024-10-14 15:40:47 +02:00
ndom91
5e7e87cab1 fix: hide commitList if there are no commits 2024-10-14 15:37:33 +02:00
ndom91
49a4f2581f fix: do not show upstream label when branch has not been pushed yet 2024-10-14 15:03:32 +02:00
Pavel Laptev
3fdc4d1b1e
UI: PR card tweaks (#5131)
* add tooltips

* fix kebaba size and margins
2024-10-14 14:49:54 +02:00
Pavel Laptev
31020d9dec
style(ui): Simplify label badge conditional rendering in IntegrationSeriesRow (#5130) 2024-10-14 14:27:37 +02:00
Esteban Vega
fdd64015b7
Merge pull request #5110 from gitbutlerapp/fix-histroy-pagination
fix: History lazy loading
2024-10-14 14:15:53 +02:00
Sebastian Thiel
0be8710752
Merge pull request #5111 from Byron/fix-5096
Probably fix #5096
2024-10-14 14:03:31 +02:00
ndom91
90ae4eccd9 fix: dont allow changing series name once pushed 2024-10-14 13:48:07 +02:00
ndom91
5724136e88 fix: change stacking header line alignment 2024-10-14 12:29:37 +02:00
ndom91
26784d1ae7 fix: divergent commit shorten to 7 char sha 2024-10-14 12:22:18 +02:00
ndom91
0ff749f036 fix: show diverged commitId in diverged state 2024-10-14 12:03:15 +02:00
Pavel Laptev
1b8cfd2723
Merge pull request #5126 from gitbutlerapp/Fix-remove-sidebar-focus-state
feat: Remove tabindex attribute from Navigation menu
2024-10-14 11:56:25 +02:00
Pavel Laptev
2797afd5c0 clear the AI description body after generation 2024-10-14 11:43:09 +02:00
Pavel Laptev
cf08814bee feat: Remove tabindex attribute from Navigation menu 2024-10-14 11:32:56 +02:00
Esteban Vega
ae283c4a65
Merge pull request #5123 from gitbutlerapp/fix-state-update-for-PR-modal-title
fix: Title state update for the PR modal
2024-10-14 11:28:17 +02:00
Kiril Videlov
3a833261e0
Merge pull request #5121 from gitbutlerapp/handle-undo-commit
Stack - handle reorder correctly
2024-10-14 11:27:21 +02:00
Pavel Laptev
c7342b1cdf
Integration modal design (#5116)
* new IntegrationListItem component

* Simple commit row added, componenets rename

* Tweak styles and `Select` update

* check fix
2024-10-14 11:10:00 +02:00
Kiril Videlov
6b6fc9b016
Merge pull request #5118 from navtoj/master
fix: "The `Shell` module is not enabled"
2024-10-14 11:09:47 +02:00
Kiril Videlov
331f61f5f0
Merge pull request #5124 from boc-the-git/patch-1
Tidy grammar and inaccuracies
2024-10-14 11:06:41 +02:00
boc-the-git
d5aa8beb25
docs: Keeping Apple happy 2024-10-14 20:03:40 +11:00
boc-the-git
77d80bcb8c
Tidy grammar and inaccuracies 2024-10-14 20:00:25 +11:00
estib
e65fd1c947 fix: State update for the PR modal
The PR modals title would only be correctly updated on blur, because it was using the 'onchange' listener.
Using the 'oninput' listener fixed that.
Also: 
Only fetch the pull-request body if the modal is open
2024-10-14 10:52:52 +02:00
Esteban Vega
49a88430a2
Merge pull request #5048 from Pranav2612000/feat/4889-allow-moving-any-commit-from-stack-to-lane
[#4889] feat: allow moving any commit from a stack into another lane
2024-10-14 09:10:23 +02:00
Navtoj Chahal
1e59bb412c
enable opening URLs with the default browser 2024-10-13 19:44:26 -07:00
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
d63babff0a
Assure that Project::path can be compared reasonably with other paths (#5096)
When testing paths for prefix-matches it's important they are all normalized in
the same fashion.

`canonicalize()` is very particular about canonicalizing Windows paths, which
makes it easy for these paths to not be compatible to other absolute-looking
paths.

The difficulty here is to get the right trade-off between performance and
safety, e.g. we wouldn't want these canonicalized Windows paths to be used
anywhere as they are very uncommon (and don't even work everywhere).
2024-10-11 21:59:51 +02:00
Sebastian Thiel
b58a3f6dc3
Assure tests don't assume the default branch is set to master globally.
Unfortunately, with anything `git2`, it's impossible (or unknown) to
prevent it from picking up the users configuration, hence tests aren't
isolated.

This change alleviates the worst results of this which at least makes
the tests run in my particular setup.
2024-10-11 21:59:48 +02:00
Sebastian Thiel
44a6125c3c
Merge pull request #5100 from Byron/fix-5099
fix 5099
2024-10-11 20:53:36 +02:00
estib
9bf6ef7995 fix: History lazy loading
Lazy loading the history side bar list items wouldn't paginate correctly.
There seems to have been two issues that caused this:
1. The intersection observer would was not initially set correctly
2. The "all loaded" flag was incorrectly set to true when clearing the history snapshots store. It should have been set to false.
2024-10-11 19:07:06 +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
estib
c9f2f479e5 Move commits: Renamings, copy changes and a small fix
- Update the variable names so that they convey the right things that we're moving around.
- Correct the thrown error messages
- Append the source commit to the list of commits we're testing against the source commit diffs.
2024-10-11 16:50:49 +02:00
estib
f71187ed05 feat: allow moving any commit from a stack into another lane
Rebasing fixes
2024-10-11 15:06:55 +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