Commit Graph

2768 Commits

Author SHA1 Message Date
Nikita Galaiko
ee6fc083aa
Merge pull request #1138 from gitbutlerapp/symbols
do not strip debug symbols
2023-09-01 13:18:19 +02:00
Nikita Galaiko
01a4c8a796
Merge pull request #1139 from gitbutlerapp/fix-names
fix branch name conversion
2023-09-01 13:18:10 +02:00
Nikita Galaiko
519637c2a2 fix branch name conversion 2023-09-01 13:14:22 +02:00
Nikita Galaiko
01a61cc4ac do not strip debug symbols 2023-09-01 13:10:44 +02:00
Nikita Galaiko
a9aa36089f disable dialog explicitly 2023-09-01 13:09:59 +02:00
Mattias Granlund
c77e8ae939 Use an on hover "apply >" button in vbranch tray section 2023-09-01 12:01:24 +01:00
Nikita Galaiko
0a1af9d1c2 small fixes 2023-09-01 12:54:36 +02:00
Nikita Galaiko
014db488db manually trigger updater 2023-09-01 12:50:54 +02:00
Mattias Granlund
12baca5ebf Fix pnpm check errors 2023-09-01 08:28:41 +01:00
Mattias Granlund
ac34a48f02 Use branch lane for peeking at vbranches
- makes it more of a preview
- experimental still, likely good direction
- other trays should be styled in a similar direction
2023-09-01 08:28:41 +01:00
Mattias Granlund
142a9a2c9a Pass branch directly to BranchLane 2023-09-01 08:28:41 +01:00
Mattias Granlund
8c3becfd83 Fix remote ahead/behind font-color in tray 2023-08-31 20:47:42 +01:00
Mattias Granlund
bb78af5d14 Fix branch lane popup
- remove maximise option
- fix rendering position
- change meatball icon to kebab icon
2023-08-31 20:30:54 +01:00
Mattias Granlund
3f093f5500 Change the UX around applying/unapplying lanes
- checkbox has been removed
- actions appear on hovering tray vbranches
- close icon in top right corner of lane stashes lane
- virtual branches tray section now shows stashed branches only
2023-08-31 18:57:06 +01:00
Nikita Galaiko
cb34e351bc
Merge pull request #1131 from gitbutlerapp/Virtual-branch
Virtual branch
2023-08-31 15:43:19 +02:00
Nikita Galaiko
eecbbd4073 small fixes 2023-08-31 15:35:08 +02:00
Nikita Galaiko
b06cce901d use branch name to lookup branch 2023-08-31 15:20:25 +02:00
Nikita Galaiko
60b65685be
Merge pull request #1129 from gitbutlerapp/branch-name
move branch name inside git
2023-08-31 14:40:54 +02:00
Mattias Granlund
f4239ca5f2 Limit file tree height to max content size
- can still be resized, just not bigger than the full file list
2023-08-31 13:38:55 +01:00
Nikita Galaiko
9fd64d3b36 move branch name inside git 2023-08-31 14:27:05 +02:00
Mattias Granlund
7541d65fab Reduce default tree height
- also remember last adjustment as default for new branches
2023-08-31 13:17:23 +01:00
Nikita Galaiko
440f11c96e
Merge pull request #1127 from gitbutlerapp/Virtual-branch
Virtual branch
2023-08-31 13:20:16 +02:00
Nikita Galaiko
8d73cc30da cargo fmt 2023-08-31 13:15:51 +02:00
Nikita Galaiko
effc5fa183 clippy 2023-08-31 12:55:40 +02:00
Nikita Galaiko
7860dd3c97 git error 2023-08-31 12:53:57 +02:00
Nikita Galaiko
fef92705bc
Merge pull request #1126 from gitbutlerapp/git-config
git config for publish
2023-08-31 10:09:09 +02:00
Nikita Galaiko
61c6e1ef99 git config for publish 2023-08-31 10:07:37 +02:00
Nikita Galaiko
15bdff860c
Merge pull request #1125 from gitbutlerapp/Virtual-branch-1
all purpose tree builder
2023-08-31 09:58:11 +02:00
Nikita Galaiko
af3bc967c7 all purpose tree builder 2023-08-31 09:43:17 +02:00
Nikita Galaiko
fe39b76de5
Merge pull request #1124 from gitbutlerapp/fix-modal
call .show
2023-08-31 08:27:19 +02:00
Nikita Galaiko
adab1c7c06 call .show 2023-08-31 08:22:45 +02:00
Nikita Galaiko
b66cb16e32
Merge pull request #1123 from gitbutlerapp/wrapper
bring back tree updater
2023-08-31 08:10:00 +02:00
Nikita Galaiko
61de01ae98 bring back tree updater 2023-08-31 08:06:15 +02:00
Nikita Galaiko
76a34dbeb8
Merge pull request #1122 from gitbutlerapp/wrapper
Wrap most git2 structures into our own structures
2023-08-30 17:42:26 +02:00
Nikita Galaiko
56d652b042 wrap tree entry 2023-08-30 17:37:59 +02:00
Nikita Galaiko
8a6c2811df wrap index entry 2023-08-30 17:30:51 +02:00
Nikita Galaiko
739b190bc1 cargo fmt 2023-08-30 17:04:34 +02:00
Nikita Galaiko
9c4bbb5595 more wrapping 2023-08-30 17:03:00 +02:00
Nikita Galaiko
55fee3056c wrap index 2023-08-30 15:27:30 +02:00
Nikita Galaiko
1adb0e4edb wrap remote 2023-08-30 15:09:59 +02:00
Nikita Galaiko
5fc365658e wrap trees 2023-08-30 14:16:37 +02:00
Nikita Galaiko
9004892e76 rm some git2 references 2023-08-30 13:51:52 +02:00
Nikita Galaiko
5d301ff2cc more wrappers 2023-08-30 13:46:53 +02:00
Nikita Galaiko
aea1297249 wrapper for commit 2023-08-30 11:16:15 +02:00
Nikita Galaiko
93241139b1 wrapper for reference 2023-08-30 10:40:15 +02:00
Nikita Galaiko
d667980891 less exposed types 2023-08-30 09:58:34 +02:00
Nikita Galaiko
f27168304a clippy fix 2023-08-30 09:51:57 +02:00
Nikita Galaiko
51b50ba324 remove revparse_single 2023-08-30 09:49:27 +02:00
Nikita Galaiko
38517cdb19 create a wrapper for git::repository 2023-08-30 09:46:52 +02:00
Nikita Galaiko
af2f232772
Merge pull request #1121 from gitbutlerapp/integrated-commits
mark individual commits as integrated
2023-08-29 15:28:36 +02:00