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
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
Caleb Owens
8a75a0f40f
Merge pull request #4617 from gitbutlerapp/Fix-tag-positioning-when-no-authors
...
feat(ui): Improve SidebarEntry layout and styling
2024-08-06 10:24:08 +02:00
Caleb Owens
5c8ade70c2
feat(ui): Improve SidebarEntry layout and styling
...
Add 'authors-and-tags' class to row-group for better organization.
Hide empty first child in authors-and-tags group to prevent gaps.
Enhances visual consistency and reduces unnecessary white space.
2024-08-06 10:23:31 +02:00
Nico Domino
141943215a
fix(prettier): turbo.json ( #4616 )
2024-08-05 20:35:02 +00:00
Caleb Owens
3412ed3194
Merge pull request #4615 from gitbutlerapp/selected-state-for-sidebar-entries
...
fix: Add selected state for sidebar entries
2024-08-05 22:32:36 +02:00
Caleb Owens
8d1841585d
Merge pull request #4611 from gitbutlerapp/filter-out-virtual-branches-without-local-remote
...
feat: filter out virtual branches without local or remote
2024-08-05 22:25:22 +02:00
Nico Domino
44d9282204
fix: add .vercel and dist to turbo cached outptus ( #4614 )
2024-08-05 22:22:45 +02:00
Caleb Owens
5a488b6dd7
fix: Add selected state for sidebar entries
...
Refactors sidebar entries for branches and pull requests to show
selected state based on the current URL. This improves the visual
indication of the current active view. Introduces helper methods
for formatting URLs to prevent duplication.
2024-08-05 22:20:57 +02:00
Nico Domino
e57792639d
fix(eslint): missed file rename ( #4613 )
2024-08-05 20:14:34 +00:00
Caleb Owens
7b008a4a54
feat: filter out virtual branches without local or remote
2024-08-05 22:09:26 +02:00
Nico Domino
fc70ef2ce7
fix(web): minor cleanup on downloads page ( #4610 )
2024-08-05 19:49:04 +00:00
Nico Domino
9d5eded33d
fix(web): initial services cleanup ( #4607 )
2024-08-05 19:27:24 +00:00
Sebastian Thiel
0c29949360
Merge pull request #4590 from Byron/git2-to-gix
...
make the notion of `identity` typesafe.
2024-08-05 20:46:40 +02:00
Caleb Owens
d482f2eda0
Merge pull request #4609 from gitbutlerapp/Don't-group-by-day-when-searching
...
Don't group by day when searching
2024-08-05 20:44:45 +02:00
Caleb Owens
d03a94eb02
Don't group by day when searching
2024-08-05 20:43:15 +02:00
Caleb Owens
5f2f552ca7
Merge pull request #4608 from gitbutlerapp/Fix-wrong-authors-when-listing
...
Fix wrong authors when listing
2024-08-05 20:34:31 +02:00
Caleb Owens
553ce474e7
Fix wrong authors when listing
2024-08-05 20:29:15 +02:00
Sebastian Thiel
e8cc7f9f03
make the notion of identity typesafe.
2024-08-05 20:01:00 +02:00
Caleb Owens
a57238a371
Merge pull request #4605 from gitbutlerapp/Vidluther-ai
...
Vidluther ai
2024-08-05 17:17:49 +02:00
Caleb Owens
3285ba6e90
Don't refer to claude
2024-08-05 17:14:46 +02:00
Caleb Owens
8e424b2405
Correct sonnet key
2024-08-05 17:12:55 +02:00
Caleb Owens
c751ab2922
Merged origin/master into gitbutler/master
2024-08-05 17:08:41 +02:00
Caleb Owens
e5a9c4687f
Merge pull request #4593 from patelka2211/improvements-in-drag-regions-of-welcome-page
...
Improvements in drag regions of welcome page.
2024-08-05 17:07:51 +02:00
Caleb Owens
0c7a750627
Merge pull request #4604 from gitbutlerapp/Add-branch-searching
...
Add in searching with Fuse
2024-08-05 16:45:22 +02:00
