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

1655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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