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,670 Commits 155 Branches 1,065 Tags 61 MiB
adcf91d165
Commit Graph

1670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattias Granlund
adcf91d165 Right click menu for hunk 
- allows you to open file in vs code
 2023-07-02 18:45:13 +03:00
Scott Chacon
3392ca0b97
tree writing fixes (#586) 
Tree writing (for commits and unapply vbranch stashing) now is tested and works properly for new and removed files as well as hunk level modifications per branch.
 2023-07-02 15:48:44 +02:00
Mattias Granlund
8c888d5e65 Add apply branch to tray context menu 2023-07-02 14:23:34 +03:00
Scott Chacon
0806e94e6f
Fix some vbranch things (#584) 
* add partial test, return branch id
* tests pass now. dont assign hunks if the branch isnt active
 2023-07-02 12:35:50 +02:00
Mattias Granlund
f38671ab02 Add tray context menu and branch meatball menu 
This is more useful than pretty right now, should make it easy to easily
add more actions.
 2023-07-02 12:32:12 +03:00
Mattias Granlund
64da66e75d Make the UI a bit tighter 2023-07-02 12:24:41 +03:00
Kiril Videlov
635486f815 use lscache library for local storage caching 
its nice cause it has eviction strategies. updated the hunk summaries to
use this, with a 24 hour time to live, so that we dont leak
 2023-07-01 21:45:45 +02:00
Mattias Granlund
2f7b6a5ded Put remote/local icons back in 2023-07-01 22:41:18 +03:00
Mattias Granlund
ca757d86cc Fix gravatar dark mode style 2023-07-01 22:41:18 +03:00
Mattias Granlund
5c3e5b8dff Put back theme selector into top nav bar 
- it's useful when developing
 2023-07-01 22:41:18 +03:00
Mattias Granlund
5b8f4fc29b Copy in gravatar code 2023-07-01 22:10:25 +03:00
Scott Chacon
e4e902eeac try again 2023-07-01 22:10:25 +03:00
Scott Chacon
c63988e736 omg, pnpm 2023-07-01 22:10:25 +03:00
Scott Chacon
4b7d6739cc gravatars 2023-07-01 22:10:25 +03:00
Mattias Granlund
5f3aebd519 Bugfix tray accordion 2023-07-01 19:30:54 +03:00
Mattias Granlund
abe07c071c Style the tray according to designs 2023-07-01 18:56:35 +03:00
Mattias Granlund
0cab37b429 Prevent header from resizing on content changes 2023-07-01 18:56:35 +03:00
Scott Chacon
e6937368a7
Fix remote listing (#573) 
* fix remote listing
* dont show commit stuff unless there is something to commit
* filter remote branches
* can create a virtual branch from a remote branch
* show remote/local a little differently
 2023-07-01 14:17:32 +02:00
Kiril Videlov
9b1aa0fbcf button spinner while pushing 2023-07-01 12:13:25 +02:00
Kiril Videlov
30a99b0bbe add a crude branch delete button 2023-07-01 12:10:56 +02:00
Kiril Videlov
f5586aa22d api for deleting a vbranch 2023-07-01 12:10:56 +02:00
Kiril Videlov
4bdaaacf3e add support for deleting vbrahcnes 2023-07-01 12:10:56 +02:00
Scott Chacon
a2a30d05a8
Sc fix remote listing2 (#574) 
* fix remote listing
* dont show commit stuff unless there is something to commit
 2023-07-01 08:54:17 +02:00
Mattias Granlund
8858c19bdb Fix bug causing settings page to not load theme 
Initializing the theme in the page.svelte file meant it was not run when
accessing sub-routes.
 2023-07-01 09:50:44 +03:00
Mattias Granlund
9fe8f7e86e Update login and settings page to match design 
- toggle for showing AI hunks not implemented yet
 2023-06-30 21:21:37 +03:00
Mattias Granlund
d3ab856cdc Separate theme management from theme component 2023-06-30 21:21:37 +03:00
Kiril Videlov
d95cbdb738 fetch after push 2023-06-30 17:34:24 +02:00
Kiril Videlov
488f7862f5 remove unused parameter 2023-06-30 17:34:24 +02:00
Kiril Videlov
f9bc13685a remove target extraction from vbranch, use origin 2023-06-30 17:34:24 +02:00
Kiril Videlov
958979c623 fix an opsie 2023-06-30 17:34:24 +02:00
Kiril Videlov
2c965e8a47 push head directly 2023-06-30 17:34:24 +02:00
Kiril Videlov
5fb2ef580e update upstream 2023-06-30 17:34:24 +02:00
Kiril Videlov
07c4d53078 persisting upstream branch on vbranch upon push 2023-06-30 17:34:24 +02:00
Scott Chacon
a4114185d2
set a remote flag on commits that have been pushed (#568) 2023-06-30 16:50:15 +02:00
Nikita Galaiko
297e0cddc9 new virtual branch button works 2023-06-30 16:00:54 +02:00
Scott Chacon
f8be69575f
Some Docs (#565) 
* document these structs
 2023-06-30 15:36:40 +02:00
Nikita Galaiko
f2024dc578 bubble up hunks that change size 2023-06-30 15:32:28 +02:00
Nikita Galaiko
183940072d fix tests 2023-06-30 14:30:52 +02:00
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