Nico Domino
7d1b7b99db
fix(ui): update ui output ( #4649 )
2024-08-08 14:51:37 +02:00
Caleb Owens
99eac848cf
Merge pull request #4640 from gitbutlerapp/write-tests-for-existing-gitbutler-modes
...
Write tests for existing modes
2024-08-08 10:54:20 +02:00
Caleb Owens
035fafa30b
Merge pull request #4644 from gitbutlerapp/inline-unified-word-diffs
...
Add inline unified word diffs
2024-08-08 10:48:57 +02:00
Kiril Videlov
6d0fc5e8da
Merge pull request #4632 from Byron/git2-to-gix
...
branch-listing with `gix`
2024-08-08 09:51:00 +02:00
Sebastian Thiel
f43f8c1d2b
assure both applications enforce max-performance settings for gitoxide.
2024-08-07 20:21:56 +02:00
Sebastian Thiel
17850bd210
Use gix for branch listing
2024-08-07 20:21:29 +02:00
Sebastian Thiel
e42fcd4643
add benchmark for branch-listing
2024-08-07 20:10:02 +02:00
Caleb Owens
5bead87303
Add inline unified word diffs
2024-08-07 18:50:14 +02:00
Nico Domino
b741b9fbe4
fix: update flake config to run again ( #4641 )
2024-08-07 17:54:57 +02:00
Caleb Owens
9a0e484171
Merge pull request #4638 from gitbutlerapp/add-conditional-author-display-branch-sidebar
...
Add conditional author display branch sidebar
2024-08-07 14:44:14 +02:00
Caleb Owens
58043dd16e
Make state calls more consistent
2024-08-07 14:42:42 +02:00
Caleb Owens
1b6a6fc91c
Added guards to prevent state update races
2024-08-07 14:38:35 +02:00
Caleb Owens
5c3ce56353
Merge pull request #4637 from gitbutlerapp/make-branch-lising-sort-more-stable
...
Make branch listing sort more stable
2024-08-07 14:18:42 +02:00
Caleb Owens
7ea1a5929c
Write tests for existing modes
2024-08-07 12:43:56 +02:00
Caleb Owens
f475ed1dff
Default to showing the current author when there are no commits
2024-08-07 11:54:23 +02:00
Caleb Owens
de8cf25439
SidebarEntry can be displayed without lastCommitAt
2024-08-07 11:35:15 +02:00
Caleb Owens
96857a1955
Fix lint error?
2024-08-07 11:31:35 +02:00
Caleb Owens
d8d44f8c56
Make branch listing sort more stable
2024-08-07 11:18:49 +02:00
Nico Domino
565c5c218f
chore(docs): add note about turbo telemetry ( #4636 )
2024-08-07 08:52:18 +00:00
Caleb Owens
becb61548b
Merge pull request #4634 from gitbutlerapp/fix-branch-preview-remote-link
...
Fix branch preview remote link
2024-08-07 10:50:37 +02:00
Pavel Laptev
554f3b31a0
Merge pull request #4635 from gitbutlerapp/UI-update--branches-search-style
...
UI update: branches search style
2024-08-07 00:52:39 +02:00
Pavel Laptev
92f44e3661
UI update: branches search style
2024-08-07 00:42:11 +02:00
Pavel Laptev
959bdfad1f
Merge pull request #4633 from gitbutlerapp/Sidebar-branches-UI-update-2
...
Sidebar branches UI update 2
2024-08-07 00:39:35 +02:00
Caleb Owens
04391663b9
Fix branch preview remote link
2024-08-07 00:25:13 +02:00
Pavel Laptev
70022a4656
update local tag color
2024-08-06 23:19:46 +02:00
Pavel Laptev
09605acd46
copy update
2024-08-06 23:12:31 +02:00
Pavel Laptev
96a399bc92
branches grouping update
2024-08-06 23:12:22 +02:00
Pavel Laptev
b93b335dfe
Sidebar branches UI update ( #4631 )
...
* update "added/removed" and "commits" tags
* Update: search transition duration
* gap between tags update
2024-08-06 16:52:59 +02:00
Pavel Laptev
440a4f7b80
unused code removed
2024-08-06 16:46:13 +02:00
Caleb Owens
f97be080df
Merge pull request #4630 from gitbutlerapp/update-act-test-e2e-runner
...
feat: Update act:test:e2e command with specific image
2024-08-06 16:23:47 +02:00
Pavel Laptev
67165c7cff
Merge pull request #4627 from gitbutlerapp/Sidebar-branches--search
...
feat(navigation): improve search UX/UI
2024-08-06 16:18:47 +02:00
Caleb Owens
6136bc6109
feat: Update act:test:e2e command with specific image
...
Update the act:test:e2e script in package.json to use a specific
Docker image for running GitHub Actions locally. This change ensures
consistency and reliability when testing the e2e workflow on
different environments.
2024-08-06 16:15:03 +02:00
Nico Domino
94014f6b25
fix: conditionally use with: ref on actions/checkout ( #4628 )
2024-08-06 14:14:43 +00:00
Pavel Laptev
6de1215c56
remove unused imports
2024-08-06 16:04:01 +02:00
Pavel Laptev
530727b2b8
feat(navigation): improve search UX/UI
2024-08-06 16:01:41 +02:00
Mattias Granlund
1eeebc3c28
Fix: remember last opened project again
2024-08-06 13:15:00 +01:00
Caleb Owens
91c2e9fec7
Merge pull request #4625 from gitbutlerapp/make-branch-listing-more-reactive
...
feat: Integrate BranchListingService for better branch management
2024-08-06 13:39:12 +02:00
Caleb Owens
f47684bf8a
Merge pull request #4624 from gitbutlerapp/dont-error-when-cicking-virtual-branch
...
Don't error when clicking a virtual branch and going to workspace
2024-08-06 13:37:47 +02:00
Caleb Owens
b466619ec3
feat: Integrate BranchListingService for better branch management
...
Adds BranchListingService to VirtualBranchService and RemoteBranchService
to improve branch synchronization and refresh mechanisms. Updates layout
files to provide the service through context. This change enhances the
overall branch management system and ensures consistent branch listing
across different components.
2024-08-06 13:37:35 +02:00
Caleb Owens
2902721367
Don't error when clicking a virtual branch and going to workspace
2024-08-06 13:33:10 +02:00
Caleb Owens
d41ec8adb1
Merge pull request #4623 from gitbutlerapp/add-act-e2e-tests-script
...
Add script for using act for e2e tests
2024-08-06 13:33:05 +02:00
Caleb Owens
22762745e3
Merge pull request #4618 from gitbutlerapp/Use-better-comparison-point-for-real-branches
...
feat: Update merge base comparison for branch listing
2024-08-06 13:32:36 +02:00
Caleb Owens
576a314a27
Add script for using act for e2e tests
2024-08-06 13:30:45 +02:00
Pavel Laptev
1bba118b9b
Sidebar branches UI ( #4622 )
...
* update illustration
* update tooltip show delay
* remove `showBorderWhenScrolled`
* sticky headers added
2024-08-06 13:11:56 +02:00
Nico Domino
0ccda08d33
fix: improve GHA code re-use ( #4612 )
2024-08-06 10:08:49 +00:00
Kiril Videlov
2f065d0d0a
Merge pull request #4621 from gitbutlerapp/check-pathspeck-when-creating-workdir-tree
...
Ensure ignored/submodule files and dirs are ignored
2024-08-06 11:59:31 +02:00
Kiril Videlov
05a814146e
Ensure ignored/submodule files and dirs are ignored
2024-08-06 11:47:59 +02:00
Caleb Owens
fbbd2a1d1c
Merge pull request #4619 from gitbutlerapp/add-tooltip-to-commit-details
...
feat(SidebarEntry): Enhance commit info display
2024-08-06 10:32:47 +02:00
Caleb Owens
439b5e8b20
feat(SidebarEntry): Enhance commit info display
...
Improve last commit details presentation in sidebar entry
- Add tooltip with full date on hover
- Include 'ago' suffix in TimeAgo component
- Wrap commit info in conditional block for cleaner rendering
2024-08-06 10:31:43 +02:00
Caleb Owens
b36c85b211
feat: Update merge base comparison for branch listing
...
Improves branch listing accuracy by adjusting the merge base
comparison logic. For virtual branches in the workspace, uses the
default target SHA. For others, uses the head commit of the default
branch's upstream. This change ensures more precise branch
comparisons, especially for virtual branches.
2024-08-06 10:24:44 +02:00
