Pavel Laptev
e64e787c64
Fix: close context menu on click outside ( #3825 )
2024-05-23 05:14:59 +02:00
Pavel Laptev
6c4c04c9dc
UI fixes ( #3824 )
...
- content shift fix
- icons updated
- removed `#` from shorten SHA
2024-05-23 05:01:12 +02:00
Kiril Videlov
b8dfcf7a82
Merge pull request #3822 from gitbutlerapp/revert-3820-oplog-diff-optimization
...
Revert "fixes incorrect snapshot diff"
2024-05-23 03:31:00 +02:00
Kiril Videlov
f066d6be20
Merge pull request #3821 from gitbutlerapp/oplog-diff-optimization
...
feat(oplog): Improve `lines_since_snapshot` by using tree-to-tree comparison
2024-05-23 03:18:41 +02:00
Kiril Videlov
651a55d3fb
Revert "fixes incorrect snapshot diff"
2024-05-23 03:17:34 +02:00
Kiril Videlov
c3a18ef2b0
feat(oplog): Improve lines_since_snapshot by using tree-to-tree comparison
...
This fixes an issue where snapshots are auto-created too often erroneously
2024-05-23 02:46:40 +02:00
Kiril Videlov
239eb9a84a
Merge pull request #3820 from gitbutlerapp/oplog-diff-optimization
...
fixes incorrect snapshot diff
2024-05-23 01:23:36 +02:00
Kiril Videlov
3517419090
fixes incorrect snapshot diff
2024-05-23 01:10:28 +02:00
Pavel Laptev
14e05adae6
UX/UI: Move collapse lane into kebab menu ( #3819 )
...
* UX/UI: Move `collapse lane ` into kebab menu
- a few `click` events replaced with `mousedown` in order to invoke actions without confirmation
* header style update
* Context menu item: fix disabled cursor
2024-05-22 18:25:11 +02:00
Kiril Videlov
7259e789e3
Merge pull request #3817 from gitbutlerapp/update-branch-footer-style
...
style: Add text style to BranchFooter component.
2024-05-22 14:45:52 +02:00
Kiril Videlov
de79c024ed
style: Add text style to BranchFooter component.
2024-05-22 14:44:23 +02:00
Kiril Videlov
5006b6019d
Merge pull request #3816 from gitbutlerapp/list-remote-branches-refactoring-fix
...
refactor: Improve error handling in branch_to_remote_branch() and list_remote_branches() functions
2024-05-22 14:35:17 +02:00
Kiril Videlov
9dbebba5df
refactor: Improve error handling in branch_to_remote_branch() and list_remote_branches() functions
2024-05-22 14:20:41 +02:00
Kiril Videlov
660d296745
Merge pull request #3814 from gitbutlerapp/update-change-selected-for-changes-branch
...
fix: Use old branch name instead of selected_for_changes in Snapshot creation
2024-05-22 12:32:46 +02:00
Caleb Owens
8314e24c90
Merge pull request #3813 from gitbutlerapp/fix-doubble-time-issue
...
Fix timestamp compensation
2024-05-22 11:29:07 +01:00
Kiril Videlov
f68ce21962
fix: Use old branch name instead of selected_for_changes in Snapshot creation
2024-05-22 12:20:59 +02:00
Caleb Owens
f2471734b4
Fix timestamp compensation
2024-05-22 12:17:04 +02:00
Kiril Videlov
8a88b26d4e
Merge pull request #3812 from gitbutlerapp/add-reload-functionality-folder-history
...
reload after restoring a snapshot
2024-05-22 12:16:50 +02:00
Kiril Videlov
d792d4fee9
reload after restoring a snapshot
2024-05-22 11:13:18 +02:00
Scott Chacon
cba5b7ca6d
Merge pull request #3788 from gitbutlerapp/show-local-branches
...
show local branches
2024-05-22 11:08:42 +02:00
Caleb Owens
8fa200a217
Merge pull request #3810 from gitbutlerapp/rename-clear-url
...
Rename function to better indicate functionality
2024-05-22 09:59:40 +01:00
Caleb Owens
a0d7ae1445
Rename function to better indicate functionality
2024-05-22 10:53:41 +02:00
Caleb Owens
0ab611fe7b
Merge pull request #3809 from lisiur/master
...
fix: Update cleanUrl method to handle ssh URLs
2024-05-22 09:52:13 +01:00
Scott Chacon
8b7fe790e5
return all local branches as well as remote ones
...
also deduplicate them in the branch listing
2024-05-22 10:45:29 +02:00
lisiur
31d9576991
lint
2024-05-22 16:44:51 +08:00
lisiur
bcdd5f68fe
lint
2024-05-22 16:37:18 +08:00
lisiur
b779f6fbbf
Extract cleanUrl and add tests
2024-05-22 16:13:41 +08:00
LisiurDay
f52c5ae358
lint
2024-05-22 14:50:41 +08:00
lisiur
038dba6710
fix: Update cleanUrl method to handle ssh URLs
2024-05-22 14:43:25 +08:00
Pavel Laptev
647cbb3cac
Better days separation ( #3806 )
2024-05-22 00:51:47 +02:00
Pavel Laptev
ec8b171fc7
Project menu items update + new "Open in VS code" ( #3804 )
2024-05-21 23:57:38 +02:00
Kiril Videlov
eda9651bf9
Merge pull request #3800 from anaisbetts/no-dosbox-on-sign
...
Don't show command prompt when commit signing is enabled
2024-05-21 23:33:22 +02:00
Kiril Videlov
9f318626f8
Merge pull request #3737 from anaisbetts/flushable-debounce
...
Avoid file locks by being smarter about when we try to rebuild our information
2024-05-21 13:47:54 +02:00
Kiril Videlov
c7401cc790
Merge pull request #3794 from gitbutlerapp/dependabot/github_actions/pnpm/action-setup-4
...
Bump pnpm/action-setup from 3 to 4
2024-05-21 13:43:58 +02:00
Caleb Owens
0085c0901d
Merge pull request #3802 from anaisbetts/disallow-unc-paths
...
Disallow UNC paths
2024-05-21 12:27:34 +01:00
Ani Betts
532715fd96
Shell Scripts can't have CRLF
2024-05-21 13:02:32 +02:00
Ani Betts
eece290edd
Stop users from adding project paths that won't work
2024-05-21 12:44:10 +02:00
Ani Betts
4e68e593e5
Stop trashing every file on Prettier
2024-05-21 12:37:39 +02:00
Ani Betts
a47ebbc22d
Don't show command prompt when commit signing is enabled
2024-05-21 12:04:41 +02:00
Mattias Granlund
21e98fd9f2
Simplify getting default target
...
- remove try function in favor of returning error
- drop unused function
2024-05-21 12:02:38 +02:00
Caleb Owens
e2c88d87cf
Merge pull request #3781 from gitbutlerapp/improve-lazy-file-list
...
Use ScrollableContainer's bottomReached event to load more
2024-05-21 10:58:44 +01:00
Caleb Owens
b061537952
Use ScrollableContainer's bottomReached event to load more
...
Bit of a refactor over my async/await based gradual rendering.
It was still struggling if you had in the neigherbourhood of 9000 files, so this will only render as the user scrolls down.
There is still the issue of scrolling taking quite a long time, but it feels like the solution would need to be a floating commit button.
2024-05-21 10:38:22 +01:00
Ani Betts
f54c12fd55
Halve the dead air time
2024-05-21 11:03:18 +02:00
Anaïs Betts
d23ca10028
Bring back tempfile moves
2024-05-21 10:36:22 +02:00
Ani Betts
8e65ed6be8
Merge remote-tracking branch 'upstream/master' into flushable-debounce
...
* upstream/master:
Fix shadow line height in commits section
2024-05-21 10:39:07 +02:00
Ani Betts
12143b0a54
Embrace your Chill, cargo
2024-05-21 10:39:00 +02:00
Mattias Granlund
b1cf9b4e10
Fix shadow line height in commits section
2024-05-21 10:32:31 +02:00
Ani Betts
b4b0de6a3c
Merge remote-tracking branch 'upstream/master' into flushable-debounce
...
* upstream/master: (85 commits)
History and minor UI fixes (#3797 )
History fixes (#3796 )
make GitGuardian happy
bump playwright version
add vitest exclude for node_modules
Remove unused exports from ipc
Update auth.ts to use absolute import
Use correct invoke function
setup for async tasks on oplog update
formatting
save and restore the gitbutler/integration branch
remove unneccessary CSPs
Fix ollama request security
fix: forgot the port
feat: Set default snapshot lines threshold to 20 when undefined
fix: Updated connect-src to allow local connections for ollama
Minor tweaks to CSS and use real branch name
Unmount history component when hidden
Fix bug leaving PR button visible
Small refactor of history component
...
2024-05-21 10:29:42 +02:00
Pavel Laptev
6e6272983b
History and minor UI fixes ( #3797 )
...
* Convert Capital case to Uper case "History menu"
* UI updates: target branch styles
* Remove console.log
* CSS: space between "Trunk" and the timer
* UI: reversed chevron arrows fix
* remove commented console.log
* UX: toggle file preview in History
* UI: target branch set animation fix
2024-05-21 01:07:22 +02:00
Pavel Laptev
8c78395ca3
History fixes ( #3796 )
...
* History fixes
- fix footrer button
- added a method to listed if there are no snapshots to load
- style fixes
* formatting
2024-05-20 19:28:03 +02:00
