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
253fc4ed62
Persist auth token
2024-10-11 12:04:11 +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
Chooooo
59513b8d99
Merge branch 'master' into feat/parse-binary-file
2024-10-10 19:52:42 +09:00
Chooooooo
a6ff493673
Code formatting
2024-10-10 19:40:06 +09: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
Chooooooo
3c9eb56a37
Add parsing for binary files
2024-10-10 19:04:36 +09: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
