gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-22 00:51:38 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,890 Commits 155 Branches 1,065 Tags 61 MiB
65b108ad1b
Commit Graph

2890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattias Granlund
92b0ed9a65 Improve file tree UI things 
- sort folder first
- better spacing between chevron and folder icon
- color files by their status
 2023-08-28 20:46:58 +01:00
Mattias Granlund
16c72cd399 Shows added and removed lines by file in vbranch peek 
- also changes the FileTree component to accept single node prop
 2023-08-28 20:46:58 +01:00
Kiril Videlov
e29f508bf3 Add dismissable warning for merging upstream work 
This update introduces a dismissable warning for merging upstream work from the base branch. The user can now choose not to show this warning again, and this choice is remembered by the system. This is achieved by adding a checkbox that triggers a new function, `projectMergeUpstreamWarningDismissed`, altering the interface's vertical space, and tweaking the execution of the `branchController.updateBaseBranch` method.

Detailed changes:
- Introduced a checkbox to the warning modal, binded to `mergeUpstreamWarningDismissedCheckbox`.
- Adjusted the vertical spacing between elements in the warning modal, from `space-y-2` to `space-y-4`.
- Modified the onclick method of the merge button to call `mergeUpstreamWarningDismissed.set(true)`, if `mergeUpstreamWarningDismissedCheckbox` is checked.
- Added `mergeUpstreamWarningDismissed` and `mergeUpstreamWarningDismissedCheckbox` variables to control the checkbox state, using the new `projectMergeUpstreamWarningDismissed` method.
- New `projectMergeUpstreamWarningDismissed` method added to handle persistent dismissal of the warning across sessions
 2023-08-28 13:28:48 +02:00
Kiril Videlov
d3d69096a9 remove unused top bar component 2023-08-28 13:05:15 +02:00
Kiril Videlov
beeab32656 remove upstream branch name component 2023-08-28 13:04:10 +02:00
Nikita Galaiko
86a1691430
Merge pull request #1096 from gitbutlerapp/test-utils 
test_utils::commit_all
 2023-08-28 10:32:46 +02:00
Nikita Galaiko
cfcfa79316 test_utils::commit_all 2023-08-28 10:28:26 +02:00
Nikita Galaiko
fb9cf8eebb
Merge pull request #1095 from gitbutlerapp/test-utils 
init test_utils
 2023-08-28 09:56:53 +02:00
Nikita Galaiko
c458fb145f cargo fmt 2023-08-28 09:44:04 +02:00
Nikita Galaiko
40d101a075 init test_utils 2023-08-28 09:34:30 +02:00
Nikita Galaiko
605c3e0dc1
Merge pull request #1094 from gitbutlerapp/if-locked--return 
if locked, return
 2023-08-28 09:02:06 +02:00
Nikita Galaiko
8e013dcfde if locked, return 2023-08-28 08:57:34 +02:00
Mattias Granlund
8732110d7a Fix small UI issues in vbranch peek file tree 2023-08-25 11:50:41 +01:00
Nikita Galaiko
f74cbdee1c
Merge pull request #1092 from gitbutlerapp/limit-gb-concurrency 
limit number of concurrent gb connections
 2023-08-25 10:15:09 +02:00
Nikita Galaiko
6dc17898d8 just use a lock 2023-08-25 10:10:42 +02:00
Nikita Galaiko
eeef217c63 limit number of concurrent gb connections 2023-08-25 09:06:49 +02:00
Kiril Videlov
ce7aecc026 fix lint 2023-08-24 17:15:02 +02:00
Kiril Videlov
670ed4eca0 rename config 2023-08-24 17:15:02 +02:00
Kiril Videlov
14bee31cc3 show a banner for repos with https remotes informing the user to create an ssh key 2023-08-24 17:15:02 +02:00
Mattias Granlund
d767728350 Update butler/Cargo.lock 
- rust-analyzer wants this
 2023-08-24 15:45:47 +01:00
Mattias Granlund
08e12d54e0 Show changed files in vbranch peek 
- adds a component for rendering a file tree
- needs a bit more iteration
 2023-08-24 15:29:12 +01:00
Kiril Videlov
3a85c50bcb base branch peek tray - call local commits local 2023-08-24 10:02:16 +02:00
Nikita Galaiko
91647507b0
Merge pull request #1087 from gitbutlerapp/refactor 
extract is_integrated calculation
 2023-08-24 09:57:44 +02:00
Nikita Galaiko
d141446d18 extract is_integrated calculation 2023-08-24 09:54:06 +02:00
Mattias Granlund
1aafe95943 Renaming TrayNext -> Tray, and FileCardNext -> FileCard 2023-08-23 15:42:53 +01:00
Mattias Granlund
19a023f455 Fixes all current eslint warnings 2023-08-23 15:33:21 +01:00
Mattias Granlund
d9f9e36ba5 Drop redundant refreshes of stores 
- we rely on dependencies between stores for most updates
 2023-08-23 15:03:46 +01:00
Mattias Granlund
ec7ea4cb6b Refresh vbranches when trunk changes 
- this will make sure "branch is integrated" becomes visible when repo is fetched
 2023-08-23 15:03:46 +01:00
Nikita Galaiko
bfc6f9f9ee
Merge pull request #1084 from gitbutlerapp/refactor 
simplify branch list
 2023-08-23 15:36:22 +02:00
Nikita Galaiko
32fc7a3783 simplify branch list 2023-08-23 15:17:59 +02:00
Mattias Granlund
47dadf3903 Removes the "New virtual branch" button 
- looks quite ugly
- in empty state we do not show it
 2023-08-23 13:52:08 +01:00
Mattias Granlund
8c935f2844 Always unhighlight after mosueup 2023-08-23 13:39:03 +01:00
Nikita Galaiko
7d6fa7a165
Merge pull request #1081 from gitbutlerapp/pnpm-updates 
name all tasks
 2023-08-23 14:38:45 +02:00
Nikita Galaiko
e14b03b24d refactor init 2023-08-23 14:30:50 +02:00
Nikita Galaiko
4b928fed61 name all tasks 2023-08-23 14:14:53 +02:00
Nikita Galaiko
2ab3ca135a merged upstream 2023-08-23 14:14:39 +02:00
Nikita Galaiko
99211ea776
Merge pull request #1079 from gitbutlerapp/pnpm-updates 
pnpm updates
 2023-08-23 13:49:56 +02:00
Nikita Galaiko
28b2fa558e pnpm updates 2023-08-23 13:47:59 +02:00
Kiril Videlov
a13a425f65 make minimum lane width smaller 2023-08-23 13:38:41 +02:00
Nikita Galaiko
ce364516b8
Merge pull request #1060 from gitbutlerapp/dependabot/cargo/src-tauri/tauri-plugin-window-state-6647e6e 
Bump tauri-plugin-window-state from `700549a` to `6647e6e` in /src-tauri
 2023-08-23 13:30:49 +02:00
Nikita Galaiko
646c8f23f7
Merge pull request #1059 from gitbutlerapp/dependabot/cargo/src-tauri/tauri-plugin-websocket-6647e6e 
Bump tauri-plugin-websocket from `700549a` to `6647e6e` in /src-tauri
 2023-08-23 13:30:41 +02:00
Nikita Galaiko
e156385e15
Merge pull request #1033 from gitbutlerapp/dependabot/cargo/src-tauri/tokio-tungstenite-0.20.0 
Bump tokio-tungstenite from 0.19.0 to 0.20.0 in /src-tauri
 2023-08-23 13:30:25 +02:00
Nikita Galaiko
355c9678b0
Merge pull request #1031 from gitbutlerapp/dependabot/cargo/src-tauri/urlencoding-2.1.3 
Bump urlencoding from 2.1.2 to 2.1.3 in /src-tauri
 2023-08-23 13:29:49 +02:00
Nikita Galaiko
b5bc83d88c
Merge pull request #1029 from gitbutlerapp/dependabot/cargo/src-tauri/filetime-0.2.22 
Bump filetime from 0.2.21 to 0.2.22 in /src-tauri
 2023-08-23 13:29:37 +02:00
Nikita Galaiko
519dddc18b
Merge pull request #1077 from gitbutlerapp/push-after-flush 
emit push after flush
 2023-08-23 13:02:28 +02:00
Nikita Galaiko
0b5bbcbd14 emit push after flush 2023-08-23 12:58:46 +02:00
Nikita Galaiko
4260d186d3
Merge pull request #1076 from gitbutlerapp/separate-pushing 
separate gitbutler data push
 2023-08-23 12:33:50 +02:00
Nikita Galaiko
5ad41123f9 separate gitbutler data push 2023-08-23 11:09:54 +02:00
Nikita Galaiko
7691c7294d
Merge pull request #1075 from gitbutlerapp/watcher-split-events 
Watcher split events
 2023-08-23 08:59:25 +02:00
Nikita Galaiko
374d3c7187 emit dedicated fetch events 2023-08-23 08:35:18 +02:00