Commit Graph

415 Commits

Author SHA1 Message Date
ndom91
14abc11061 fix: cleanup toast showError method 2024-06-04 14:15:32 +02:00
ndom91
c87ca9d1f3 fix: rm unnecessary svelte-french-toast imports 2024-06-04 14:15:32 +02:00
Mattias Granlund
8d0c97dc09 Exclude pull requests when getting branch modifiedAt timestamp 2024-06-04 13:52:58 +02:00
Mattias Granlund
bd77da52a9 Fix integrated commit lines in commit graph 2024-06-04 01:56:38 +02:00
Mattias Granlund
a4b2476e52 Fix rebase detection in commit graph
- uses new fork points
2024-06-04 00:52:09 +02:00
Mattias Granlund
e68dc45359 Show fork point instead of merge base 2024-06-04 00:52:09 +02:00
Mattias Granlund
71aeb9a285 Fix another remote line bug in the commit graph 2024-06-03 23:12:48 +02:00
Mattias Granlund
850c8119e4 Suppress offline errors from octokit.js 2024-06-03 23:01:42 +02:00
Kiril Videlov
5fbdd86e5b add an informative toast message when signing fails 2024-06-03 21:49:12 +02:00
Kiril Videlov
0b57a44d63
Merge pull request #3978 from gitbutlerapp/add-git-config-module
support setting signCommits git config
2024-06-03 21:15:14 +02:00
Mattias Granlund
a62567d22f Show avatar for integrated commit lines 2024-06-03 19:25:39 +02:00
Mattias Granlund
fbc43d45bb Fix one more commit lines bug 2024-06-03 18:07:48 +02:00
Mattias Granlund
0a10661de9 Bugfixes for commit lines
- use correct shadow marker color on shadow line
- correctly calculate remote type
- fix shadow tooltip
2024-06-03 17:25:00 +02:00
Kiril Videlov
40cfc55309 support setting signCommits git config 2024-06-03 17:00:14 +02:00
Caleb Owens
2658c37f87 Enable adding blank commit with no commits already made 2024-06-03 16:18:54 +02:00
Caleb Owens
1771d8dcd2 Feat: Add commit editing capabilities
going through the commit card, adding a blank commit before or after the current one
2024-06-03 16:03:54 +02:00
Caleb Owens
1be0f43d7d
Merge pull request #3968 from gitbutlerapp/fix-There-is-no-default-target-error-on-adding-a-project
Services: Improved base branch handling
2024-06-03 14:42:24 +02:00
Caleb Owens
342159ddd4 Services: Improved base branch handling
Added a constant for the error message when no default target is set and updated the error handling to use this new message.
2024-06-03 13:31:38 +02:00
Mattias Granlund
416ba78e9e Simplify parameters 2024-06-03 12:12:44 +02:00
Mattias Granlund
bbd0afb556 Move a few things around 2024-06-03 12:12:44 +02:00
Mattias Granlund
2948428632 Remove commit from Avatar params 2024-06-03 12:12:44 +02:00
Mattias Granlund
6d2643eb32 Pass Avatar to Line components
- lets us pass fewer props
2024-06-03 12:12:44 +02:00
Pavel Laptev
05dbf02d63
Fix history appearance animation (#3962) 2024-06-02 22:41:30 +02:00
Pavel Laptev
1436e42ef6
Merge pull request #3961 from gitbutlerapp/UI-history-view-fixes
UI fixes
2024-06-02 22:34:11 +02:00
Pavel Laptev
01f99c5a65 gray out snapshots within restore points 2024-06-02 22:31:50 +02:00
Caleb Owens
98f87a3800 Add a reordering dropzone 2024-06-02 17:51:54 +02:00
Caleb Owens
3c5b7f9829 Move Draggable type declaration 2024-06-02 17:51:41 +02:00
Caleb Owens
b54b2efa27 Implement class for calculating commit offsets 2024-06-02 17:38:27 +02:00
Caleb Owens
f32e45dc21
Merge pull request #3953 from gitbutlerapp/Rename-remote-upstream-to-remote
Rename "remote upstream" to "remote"
2024-06-02 17:36:15 +02:00
Kiril Videlov
24e56a141a feat: Disable temporary translation of sideview content 2024-06-02 17:27:45 +02:00
Kiril Videlov
623d9954cd remove auto detect flow from UI 2024-06-02 16:02:08 +02:00
Pavel Laptev
0ffbbee4e7 "Signed" commit icon update 2024-06-02 15:24:32 +02:00
Caleb Owens
91179111ef Rename "remote upstream" to "remote" 2024-06-02 15:16:11 +02:00
Pavel Laptev
d4b167fda0 remove console.log 2024-06-02 11:45:54 +02:00
Pavel Laptev
34a514c652 List item last-child double border fix 2024-06-02 11:29:02 +02:00
Pavel Laptev
18567d13db upstream line height fix 2024-06-02 11:21:43 +02:00
Pavel Laptev
28e8b60ed8 List item last-child style updated 2024-06-02 11:14:49 +02:00
Pavel Laptev
ae07c224ba Loading state appearance fix 2024-06-02 10:57:04 +02:00
Pavel Laptev
3adf248ba6 Fix history view animation 2024-06-02 10:50:46 +02:00
Kiril Videlov
bff8cf1ca5
Merge pull request #3898 from Byron/error-handling-pt2
error handling ergonomics
2024-06-01 17:04:02 +02:00
Pavel Laptev
6946d6ddeb
Refactor-Tailwind-remove (#3936)
* remove teilwind CSS imports

* remove Teilwind package

* remove unused CSS

* update from master

* file format changes

* update reset file

* Drop unused Differ file

* update hunk line highlight color
2024-06-01 16:27:36 +02:00
Sebastian Thiel
dedd721dc3
capitalize error message
Let's not assume, nor force, that the backend provides error messages
in a format that we want to present. Hence we capitalize ourselves
for consistency.
2024-06-01 15:56:02 +02:00
Sebastian Thiel
20d84247e9
Prune Code to only what's used by the UI
Also adjust the `Code` documentation to clarify this - otherwise
we will have more and more variants and nobody actually cares.

The frontend code is adjusted as well, as its `Code` counterpart
contained unsused variants which are now removed.
2024-06-01 14:32:27 +02:00
Kiril Videlov
39e157fac6
Merge pull request #3939 from gitbutlerapp/show-infobox-if-workspace-update-stashed-branches
show infobox if workspace update stashed branches
2024-06-01 14:04:34 +02:00
Mattias Granlund
a50fa6613b Scale branch icons when zooming 2024-06-01 13:59:23 +02:00
Mattias Granlund
24466c8f11 Fix inconsistencies in commit graph
- terrible code, needs immediate refactoring
2024-06-01 13:56:53 +02:00
Kiril Videlov
dc385b6a77 Shows infobox if update workspace stashes branches
In case branches were stashed due to a conflict we want to communicate what happened. Hopefully soon we wont need any of that with the new conflict resolution flow
2024-06-01 13:51:17 +02:00
Kiril Videlov
72799dacf1 feat: Add help text to Revert button on Snapshot Card. 2024-06-01 12:54:05 +02:00
Caleb Owens
76e3b3f164 removed tooltip and added a hover state to help indicate clickableness 2024-05-31 22:59:46 +02:00
Caleb Owens
3ac4a18c93 disable tooltip length limiter 2024-05-31 14:33:20 +02:00