gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-23 01:22:12 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,782 Commits 155 Branches 1,065 Tags 61 MiB
977852798a
Commit Graph

1782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
13ef7435b4 bubble new hunks and files up 2023-06-30 14:15:12 +02:00
Nikita Galaiko
b3cc802f1a explicitly move and always update hunks 2023-06-30 14:15:12 +02:00
Scott Chacon
8cc1d7b3f5
Merge status (#554) 
* show merge status of virtual branches
* add merge conflict list and tests and fix uncommitted work
 2023-06-30 11:27:54 +02:00
Kiril Videlov
c090837b17 use default target 2023-06-30 11:23:49 +02:00
Kiril Videlov
e0006dbf43 formatting 2023-06-30 11:23:49 +02:00
Kiril Videlov
4092554bdf Pushing of vBranches 2023-06-30 11:23:49 +02:00
Mattias Granlund
8fa04cbd99 Remove two-way bindings for board 
Updates are now pushed from the backend so we are ok with a one
directional data flow.
 2023-06-30 11:33:44 +03:00
Nikita Galaiko
da8e40645c one-way branches binding 2023-06-30 10:13:03 +02:00
Nikita Galaiko
1df31ec1ee rm move_files 2023-06-30 09:13:22 +02:00
Nikita Galaiko
fd7d2f9d87 remove selected branch id 2023-06-30 08:11:23 +02:00
Nikita Galaiko
ace5b8468f store branch order 2023-06-30 08:11:23 +02:00
Nikita Galaiko
785013d611 create branch with ownership 2023-06-30 08:11:23 +02:00
Nikita Galaiko
b7c9940eb3 rm move_files api 2023-06-30 08:11:23 +02:00
Mattias Granlund
0bafe62390 Bump dnd library version to fix bug 2023-06-29 19:32:32 +03:00
Mattias Granlund
78cab1b2e9 Enable zoom using +, -, and = 2023-06-29 15:37:23 +03:00
Mattias Granlund
960d603696 Refresh the project selection look 
Implemented according to Ian's designs, but skipping the favorites
functionality for now.
 2023-06-29 15:27:19 +03:00
Nikita Galaiko
47fc2924ab fix clippy warnings 2023-06-29 11:47:23 +02:00
Nikita Galaiko
4120ea4e56 send full branch updates instead of atomic moves 2023-06-29 11:33:20 +02:00
Nikita Galaiko
df935248c0 support updating branch ownership 2023-06-29 11:33:20 +02:00
Nikita Galaiko
87476939a8 make branch ownerhip order matter 2023-06-29 11:33:20 +02:00
Scott Chacon
4480f690fe
add placeholder for push, fix checkout (#548) 2023-06-29 08:59:41 +02:00
Scott Chacon
4a0bcb8665
Apply and Unapply Virtual Branches (#544) 
* apply and unapply branches
* show unapplied branches in vbranch list
* pick random branch if selected isnt applied
 2023-06-29 07:48:48 +02:00
Mattias Granlund
6008ec3c69 Bugfix file card expansion 2023-06-28 20:44:46 +03:00
Mattias Granlund
98c09bb094 Allow resizing of tray from bottom right corner 
The size is store in localStorage under `config:tray-width`.
 2023-06-28 20:30:21 +03:00
Mattias Granlund
71f7165833 Simplify typescript interface 2023-06-28 19:35:29 +03:00
Nikita Galaiko
cac92dd027 sort new hunks as they come in 2023-06-28 16:55:04 +02:00
Kiril Videlov
48128bf597 update breadcrumbs component link to point to repo 2023-06-28 16:13:23 +02:00
Mattias Granlund
bc11075b1b Rename projects_new -> repo 2023-06-28 15:27:48 +02:00
Nikita Galaiko
8cbef59988 rm hunk timestamps 2023-06-28 13:19:50 +02:00
Nikita Galaiko
511c5b6124 more tests for moving hunks 2023-06-28 13:19:50 +02:00
Nikita Galaiko
4dd70ee5b1 refactor ownership types 2023-06-28 13:19:50 +02:00
Nikita Galaiko
201e666fe3 store timstamp in a hunk 2023-06-28 13:19:50 +02:00
Scott Chacon
045ddbf16e
Delete (unapply) branch when it's integrated upstream (#515) 
* delete (unapply branch when the head matches the merge result)
* add debug stuff, create new branch if none applied
* if there are modified files on a vbranch, dont unapply it
* fix args in the wrong order
 2023-06-28 12:40:10 +02:00
Kiril Videlov
44df0ac482 cleanup root layout scripts 2023-06-28 10:33:19 +02:00
Kiril Videlov
7fbfc7de20 Disable command palette 
It's a good supporting featured, but it was not made with virtual
branches in mind. In it's current state it only introduces confusions,
and it's probably not functioning correctly.
 2023-06-28 10:17:45 +02:00
Kiril Videlov
5c1f92b44b after vbranch target is updated refresh the vbranches 2023-06-28 09:53:05 +02:00
Kiril Videlov
494492992a this may be fixing freezing up when computer is ofline 2023-06-28 09:42:03 +02:00
Kiril Videlov
ca701b9979 more clear ternary operator 2023-06-27 22:33:17 +02:00
Kiril Videlov
6742211859 vbranches move functions 2023-06-27 22:33:17 +02:00
Kiril Videlov
e969abe1dc drop unused function from interface 2023-06-27 22:33:17 +02:00
Kiril Videlov
d334221b8a rename vbranches interface 2023-06-27 22:33:17 +02:00
Kiril Videlov
1a6c3b704f split the interfaces 2023-06-27 22:33:17 +02:00
Kiril Videlov
ca155eeeb8 dnd dropzone uses virtualbranch create 2023-06-27 18:30:13 +02:00
Kiril Videlov
bf7d62b62b move_virtual_branch_files to VirtualBranchesStore 2023-06-27 18:30:13 +02:00
Kiril Videlov
52839c2306 update_virtual_branch to VirtualBranchesStore 2023-06-27 18:30:13 +02:00
Kiril Videlov
59ddd5cf39 update_branch_target to VirtualBranchesStore 2023-06-27 18:30:13 +02:00
Kiril Videlov
b44ede5557 commit_virtual_branch to VirtualBranchesStore 2023-06-27 18:30:13 +02:00
Kiril Videlov
4a684e06cc move create_virtual_branch to virtualbranchesstore 2023-06-27 18:30:13 +02:00
Kiril Videlov
5cf11cee87 move set_target_branch to VirtualBranchesStore 2023-06-27 18:30:13 +02:00
Kiril Videlov
cfc756128a make no-cycle a warning until we solve 4 cycles 2023-06-27 14:46:39 +02:00