Commit Graph

7328 Commits

Author SHA1 Message Date
Mattias Granlund
850c8119e4 Suppress offline errors from octokit.js 2024-06-03 23:01:42 +02:00
Kiril Videlov
49af6f502a
Merge pull request #3969 from gitbutlerapp/handle-sign-failure
handle sign failure
2024-06-03 22:17:14 +02:00
Kiril Videlov
828bd31a4a add some additional context to the logs when this fails 2024-06-03 22:05:10 +02:00
Kiril Videlov
5fbdd86e5b add an informative toast message when signing fails 2024-06-03 21:49:12 +02:00
Kiril Videlov
28b49be9ae fail when signing enabled for GitButler but with error code 2024-06-03 21:31:14 +02:00
Kiril Videlov
0b57a44d63
Merge pull request #3978 from gitbutlerapp/add-git-config-module
support setting signCommits git config
2024-06-03 21:15:14 +02:00
Mattias Granlund
a62567d22f Show avatar for integrated commit lines 2024-06-03 19:25:39 +02:00
Mattias Granlund
fbc43d45bb Fix one more commit lines bug 2024-06-03 18:07:48 +02:00
Mattias Granlund
0a10661de9 Bugfixes for commit lines
- use correct shadow marker color on shadow line
- correctly calculate remote type
- fix shadow tooltip
2024-06-03 17:25:00 +02:00
Kiril Videlov
40cfc55309 support setting signCommits git config 2024-06-03 17:00:14 +02:00
Caleb Owens
b1409b61a4
Merge pull request #3971 from gitbutlerapp/Introduce-quick-action-menu-for-creating-empty-commits
Introduce quick action menu for creating empty commits
2024-06-03 16:22:36 +02:00
Caleb Owens
2658c37f87 Enable adding blank commit with no commits already made 2024-06-03 16:18:54 +02:00
Caleb Owens
f8c8955613
Merge pull request #3970 from gitbutlerapp/Introduce-quick-action-menu-for-creating-empty-commits
Feat: Add commit editing capabilities
2024-06-03 16:13:27 +02:00
Caleb Owens
1771d8dcd2 Feat: Add commit editing capabilities
going through the commit card, adding a blank commit before or after the current one
2024-06-03 16:03:54 +02:00
Kiril Videlov
c611ff7f9b remove panic from the commit signing flow 2024-06-03 15:30:18 +02:00
Kiril Videlov
7be95b7ea2 better handling if signing fails 2024-06-03 15:28:57 +02:00
Caleb Owens
1be0f43d7d
Merge pull request #3968 from gitbutlerapp/fix-There-is-no-default-target-error-on-adding-a-project
Services: Improved base branch handling
2024-06-03 14:42:24 +02:00
Caleb Owens
342159ddd4 Services: Improved base branch handling
Added a constant for the error message when no default target is set and updated the error handling to use this new message.
2024-06-03 13:31:38 +02:00
Mattias Granlund
416ba78e9e Simplify parameters 2024-06-03 12:12:44 +02:00
Mattias Granlund
bbd0afb556 Move a few things around 2024-06-03 12:12:44 +02:00
Mattias Granlund
2948428632 Remove commit from Avatar params 2024-06-03 12:12:44 +02:00
Mattias Granlund
6d2643eb32 Pass Avatar to Line components
- lets us pass fewer props
2024-06-03 12:12:44 +02:00
Kiril Videlov
b60fc726b2
Merge pull request #3967 from gitbutlerapp/apply-branch-cherry-rebase
applying a branch should use cherry rebase
2024-06-03 12:12:28 +02:00
Kiril Videlov
3d925d9c53 applying a branch should use cherry rebase 2024-06-03 11:59:42 +02:00
Kiril Videlov
eefb27efa0
Merge pull request #3966 from gitbutlerapp/add-nix-flake-devshell
feat: add nix flake devshell
2024-06-03 11:03:47 +02:00
ndom91
7b994972a6
feat: add flake lock file 2024-06-03 10:40:02 +02:00
ndom91
bee186da11
feat: add nix flake devshell 2024-06-03 10:31:11 +02:00
Kiril Videlov
80bfaf0ca8
Merge pull request #3964 from gitbutlerapp/add-blame-functionality
move blame to repository extension trait
2024-06-03 01:58:58 +02:00
Kiril Videlov
8ab770b15a move blame to repository extension trait 2024-06-03 01:40:41 +02:00
Kiril Videlov
8eb7d1d0f0
Merge pull request #3963 from gitbutlerapp/refname-mod-rs-cleanup
refname-mod-rs-cleanup
2024-06-03 01:17:02 +02:00
Kiril Videlov
bc16fadcc5 move commit signing to git2 extension trait 2024-06-03 01:04:14 +02:00
Kiril Videlov
4b6a273e80 remove unused function 2024-06-02 23:47:23 +02:00
Pavel Laptev
05dbf02d63
Fix history appearance animation (#3962) 2024-06-02 22:41:30 +02:00
Pavel Laptev
1436e42ef6
Merge pull request #3961 from gitbutlerapp/UI-history-view-fixes
UI fixes
2024-06-02 22:34:11 +02:00
Pavel Laptev
01f99c5a65 gray out snapshots within restore points 2024-06-02 22:31:50 +02:00
Kiril Videlov
03bb69f36d
Merge pull request #3959 from gitbutlerapp/Virtual-branch-1
remove unnecessary checks in oplog commit
2024-06-02 20:37:39 +02:00
Kiril Videlov
b2481f01e1 remove unnecessary checks in oplog commit
This little manouver costed us 150 milliseconds
2024-06-02 20:25:09 +02:00
Kiril Videlov
4f8adc487a
Merge pull request #3956 from gitbutlerapp/get-head-reference
remove core::git::Reference type
2024-06-02 19:14:49 +02:00
Caleb Owens
aa611e8013
Merge pull request #3954 from gitbutlerapp/draggable-type-update
Drag an drop reordering for commits
2024-06-02 19:07:32 +02:00
Kiril Videlov
4ae1847a28 remove core::git::Reference type 2024-06-02 19:03:03 +02:00
Kiril Videlov
63fb9e9299
Merge pull request #3955 from gitbutlerapp/add-tree-write-function
remove core::git::Index
2024-06-02 18:10:22 +02:00
Kiril Videlov
879a07da64 remove core::git::Index 2024-06-02 17:57:18 +02:00
Caleb Owens
98f87a3800 Add a reordering dropzone 2024-06-02 17:51:54 +02:00
Caleb Owens
3c5b7f9829 Move Draggable type declaration 2024-06-02 17:51:41 +02:00
Caleb Owens
b54b2efa27 Implement class for calculating commit offsets 2024-06-02 17:38:27 +02:00
Caleb Owens
c7651d7c52 Enable moving by more than one commit at a time 2024-06-02 17:37:23 +02:00
Caleb Owens
f32e45dc21
Merge pull request #3953 from gitbutlerapp/Rename-remote-upstream-to-remote
Rename "remote upstream" to "remote"
2024-06-02 17:36:15 +02:00
Kiril Videlov
053fa6096a
Merge pull request #3952 from gitbutlerapp/git-config-implementation
feat: Disable temporary translation of sideview content
2024-06-02 17:29:08 +02:00
Kiril Videlov
24e56a141a feat: Disable temporary translation of sideview content 2024-06-02 17:27:45 +02:00
Kiril Videlov
7ab323a106
Merge pull request #3951 from gitbutlerapp/deprecate-auth-options-system-executable
deprecate-auth-options-system-executable
2024-06-02 16:19:31 +02:00