Pavel Laptev
62ffe0986d
Revert dialog modal implementation ( #5143 )
...
* rename `default` size to `medium`
* animation on close and focus trap
* focus trap fix
* fix clickoutside bug with open select
* Update focusTrap.ts
* fix check
* remove unnesessery code
2024-10-15 10:45:09 +02:00
Kiril Videlov
8b79007165
Merge pull request #5138 from gitbutlerapp/dependabot/github_actions/Swatinem/rust-cache-2.7.5
...
build(deps): bump Swatinem/rust-cache from 2.7.3 to 2.7.5
2024-10-15 10:25:28 +02:00
Kiril Videlov
dcf645da6c
Merge pull request #5141 from gitbutlerapp/handle-undo-commit
...
Stacking flow/ UI handles already pushed vbranches
2024-10-14 23:42:18 +02:00
Kiril Videlov
d168588596
change default stack series reference to match the virtual branch legacy one if set
...
This is only applicable during the migration period - when a virtual branch has been pushed, and therefore there is a reference set. If that is the case, this will make the default series reference match that reference name
2024-10-14 20:49:49 +02:00
Caleb Owens
562ad1493b
Merge pull request #5140 from gitbutlerapp/no-push-hooks
...
Pass --no-verify to git push
2024-10-14 18:45:38 +02:00
Caleb Owens
22daef3681
Merge pull request #5136 from gitbutlerapp/Update-how-auth-tokens-are-passed-about
...
Update how auth tokens are passed about
2024-10-14 18:29:04 +02:00
Caleb Owens
94ff87a72c
Pass --no-verify to git push
2024-10-14 18:27:58 +02:00
Caleb Owens
5f49663265
Update how auth tokes are passed around
...
I forgot to run pnpm check
I forgot to run pnpm test
2024-10-14 17:31:02 +02:00
dependabot[bot]
34fe5ba4a5
build(deps): bump Swatinem/rust-cache from 2.7.3 to 2.7.5
...
Bumps [Swatinem/rust-cache](https://github.com/swatinem/rust-cache ) from 2.7.3 to 2.7.5.
- [Release notes](https://github.com/swatinem/rust-cache/releases )
- [Changelog](https://github.com/Swatinem/rust-cache/blob/master/CHANGELOG.md )
- [Commits](https://github.com/swatinem/rust-cache/compare/v2.7.3...v2.7.5 )
---
updated-dependencies:
- dependency-name: Swatinem/rust-cache
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-10-14 15:12:26 +00:00
ndom91
c5efb7f246
fix: dont show 'set remote branch name' option in stack header contextMenu
2024-10-14 16:40:45 +02:00
Kiril Videlov
e8732f72e2
initialize stack with the same reference as the legacy reference
2024-10-14 16:29:38 +02:00
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
