gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-21 16:41:32 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,890 Commits 157 Branches 1,064 Tags 61 MiB
65b108ad1b
Commit Graph

2890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattias Granlund
08f45c52cf Left align popup menu button texts 2023-09-04 09:55:30 +01:00
Nikita Galaiko
842a072274
Merge pull request #1154 from gitbutlerapp/git-auth 
Git auth
 2023-09-04 08:15:34 +02:00
Nikita Galaiko
34bb108fa1 move diff to git 2023-09-04 08:10:29 +02:00
Nikita Galaiko
9d3b483d41 merged upstream 2023-09-04 08:10:13 +02:00
Mattias Granlund
21d16d1493 Fix vertical alignment of apply > button in tray 2023-09-03 21:14:10 +01:00
Mattias Granlund
a71102d4c8 Make the new drop zone styling a bit better 
- blue dz color
- miminal "new branch" button
- subtler text color
 2023-09-03 21:11:02 +01:00
Kiril Videlov
653b39205c Refactored Branch Creation Button for Better Accessibility 
In this commit, we've restructured the layout of the branch creation button to improve both visual representation and interaction. 

Changes include:
- Replacing the previous button element with a div container to house the branch creation button.
- The button now lies within the newly created div, making it more distinct and focused in the overall layout.
- The styles associated with the previous button have been transferred to the div.
- The on-click event, initially directly bound to the button, is retained and re-applied to the new button within the div.
 2023-09-03 18:23:13 +02:00
Mattias Granlund
1ecbece360 Make focus outline look better in a few places 2023-09-03 15:40:03 +01:00
Mattias Granlund
8b71b4827a Drop unused z-index class 
- causes gravatar to bleed through lane overlay
 2023-09-03 14:47:22 +01:00
Mattias Granlund
0b2871fd22 Visually improve the drop zone UI 
- overlay rather than additional box
- fixes bug in dropzone.js
 2023-09-03 14:27:08 +01:00
Mattias Granlund
385b8e0e42 Nitpicking use of shorthand params 2023-09-01 17:11:08 +01:00
Mattias Granlund
3408a78d20 Show last modified time ago in file tree 2023-09-01 17:11:08 +01:00
Mattias Granlund
493eaa7b02 Hide "offline" from the status bar 
It draws unnecessary attention to a feature that does not yet add much value.

Came up during live debugging session with my friend Christian.
 2023-09-01 16:13:43 +01:00
Mattias Granlund
b4f825a5e3 Fix ui transition bug 2023-09-01 16:08:24 +01:00
Mattias Granlund
cac266faae Sort files the same way the file tree is sorted 
- this is an experiment, it will be revisited
 2023-09-01 16:08:24 +01:00
Mattias Granlund
f4c8561e05 Fix broken conflict merge 2023-09-01 14:35:05 +01:00
Nikita Galaiko
ce23f1330a
Merge pull request #1142 from gitbutlerapp/git-auth 
Git auth
 2023-09-01 15:28:16 +02:00
Nikita Galaiko
8fd55d80ef log git auth methods 2023-09-01 15:24:18 +02:00
Nikita Galaiko
606b21f17b log all git auth errors 2023-09-01 15:24:07 +02:00
Nikita Galaiko
19aa27fc93
Merge pull request #1140 from gitbutlerapp/Virtual-branch 
bump deps
 2023-09-01 14:48:23 +02:00
Nikita Galaiko
1bcd99f284 bump deps 2023-09-01 14:39:22 +02:00
Nikita Galaiko
da6b45fdd9
Merge pull request #1136 from gitbutlerapp/manual-updates 
Manual updates
 2023-09-01 13:21:05 +02:00
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