Commit Graph

1779 Commits

Author SHA1 Message Date
Nikita Galaiko
c78ab6bc4a lock get_current_session 2023-07-05 12:20:09 +02:00
Nikita Galaiko
d82781631e remove println 2023-07-05 12:20:09 +02:00
Nikita Galaiko
ed9247f74c handle errors 2023-07-05 12:20:09 +02:00
Nikita Galaiko
e89bd9bdf6 share storage lock to ensure consistancy 2023-07-05 11:00:49 +02:00
Nikita Galaiko
968c1e2840 fix new hunk ids 2023-07-05 10:10:02 +02:00
Kiril Videlov
79e469f039 update everything on first target set 2023-07-05 09:58:41 +02:00
Mattias Granlund
704dd9efde Revert to textarea for commit message
Also moves the expand collapse toggle into the menu for a cleaner ui.

- expand/collapse toggle under menu
- use rows attribute for textarea height
- from 2-10 rows
2023-07-05 10:27:27 +03:00
Nikita Galaiko
6563f9c9bf fetch --prune 2023-07-05 08:41:06 +02:00
Mattias Granlund
d9316c858d Update modal style to match design 2023-07-04 20:29:30 +03:00
Kiril Videlov
6728dc7d6a on login/out navigate to the corresponding page 2023-07-04 16:44:35 +02:00
Kiril Videlov
0bd0b3628a fix open path allowlist 2023-07-04 16:44:35 +02:00
Kiril Videlov
5e9b9186c3 split login page from user settings 2023-07-04 16:44:35 +02:00
Kiril Videlov
e1adc0bcd5 remove reference of the users page from shortkeys 2023-07-04 16:44:35 +02:00
Ian Donahue
bd7c804e96
Merge pull request #621 from gitbutlerapp/removed-mono-font-from-commit-message
Commit message font changed back to original serif font
2023-07-04 12:54:14 +02:00
idonahue
e6566af618 Commit message font changed back to original serif font 2023-07-04 12:49:24 +02:00
Nikita Galaiko
bef0e44aa2 delete fully merged branches 2023-07-04 12:37:00 +02:00
Nikita Galaiko
ecc09083d4 fix build 2023-07-04 12:27:44 +02:00
Kiril Videlov
e4b6aa7d3c get remote branches only from the store 2023-07-04 11:27:42 +02:00
Nikita Galaiko
f52dd118b2 move vbranches ipc calls to lib 2023-07-04 11:01:30 +02:00
Kiril Videlov
f05bae977d use target store 2023-07-04 10:56:17 +02:00
Kiril Videlov
64bd4d7c86 reactive store for target data 2023-07-04 10:56:17 +02:00
Nikita Galaiko
f7bedf572a fix deltas subscription 2023-07-04 10:22:32 +02:00
Nikita Galaiko
ee35a3f46a fix moving hunks 2023-07-04 10:22:32 +02:00
Nikita Galaiko
06b760d998 add emit event for the watcher 2023-07-04 09:32:21 +02:00
Nikita Galaiko
6473751a60 exponential backoff for failed fetches 2023-07-04 08:52:18 +02:00
Scott Chacon
0a3f9b6adc
Fetch button (#610)
* when not behind, it fetches

* hitting refresh fetches from remote
2023-07-04 07:15:44 +02:00
Scott Chacon
dab665531d
revert breadcrumb (#611) 2023-07-04 07:15:25 +02:00
Scott Chacon
282d95af67
fix the fetching issue (#605) 2023-07-04 06:28:35 +02:00
Kiril Videlov
03e75aa282 fix tray icon size when truncating 2023-07-04 06:19:15 +03:00
Mattias Granlund
48c0473846 Open board after setting target
Fixes outsanding issue where you have to reload after initially setting
the target branch.
2023-07-04 00:31:56 +03:00
Kiril Videlov
20400e97f4 refresh remote branches on delete
when deleting a vbranch sometimes we show it as remote branch, so
trigger a refresh
2023-07-03 22:51:53 +03:00
Kiril Videlov
769d2ba542 reactivity when a remote branch is applied 2023-07-03 22:46:21 +03:00
Mattias Granlund
2df62b737a Use contenteditable div instead of textarea
Input elements do not adjust their height automatically, so let's give
this a chance. It fits our need perfectly.
2023-07-03 21:18:52 +03:00
Mattias Granlund
5b802a677d Add modal confirmation for two tray actions
- update target
- delete virtual branch

We should keep an eye on generics in Svelte, it would be great for slot
props like `item`.
2023-07-03 19:56:56 +03:00
Mattias Granlund
2e6a67c0bc Revert "Add syntax highlighting for hunks"
- fixes NaN

This reverts commit ac3aa9dd30.
2023-07-03 19:48:01 +03:00
Scott Chacon
e8e41f4b11
Can commit un/re-applied branches (#601)
* if a branch has no merge base, leave it out
* change write_tree to use treeUpdater rather than the index
2023-07-03 16:52:32 +02:00
Nikita Galaiko
24988db78a handle errors 2023-07-03 16:34:05 +02:00
Nikita Galaiko
68fadb1209 fix clippy warnings 2023-07-03 16:34:05 +02:00
Nikita Galaiko
ef5ce12fb5 subscribe to fetch events 2023-07-03 16:09:57 +02:00
Nikita Galaiko
f83df47b77 emit git fetch event 2023-07-03 16:09:57 +02:00
Nikita Galaiko
1e3d0244db fetch project in background 2023-07-03 16:09:57 +02:00
Nikita Galaiko
21ec8d9f14 move fetch and push to project 2023-07-03 16:09:57 +02:00
Nikita Galaiko
8878c89f06 track diff timestamps 2023-07-03 14:39:25 +02:00
Scott Chacon
6e73147257
Fix unapply hunks (#598)
* fix hunk ordering
* get unapply with hunked branches working
2023-07-03 14:14:26 +02:00
Kiril Videlov
f2b7058cc3 updateBranchOrder triggers also vbranches refresh
This operation is weird - it needs to update 2 stores
2023-07-03 15:09:36 +03:00
Kiril Videlov
56cd409d85 updateBranchOrder refreshes branches list 2023-07-03 14:54:37 +03:00
Kiril Videlov
09718c5c4b move updateBranchTarget to RemoteBranchOperations 2023-07-03 14:54:37 +03:00
Kiril Videlov
ed487ed916 remote branches store 2023-07-03 14:54:37 +03:00
Mattias Granlund
a1960673ae Add and change context menus
- delete virtual branch from left tray
- unapply branch from swimlane menu
2023-07-03 13:46:07 +03:00
Mattias Granlund
9cfa03c642 Misc UI in tray 2023-07-03 13:46:07 +03:00