Commit Graph

7507 Commits

Author SHA1 Message Date
Caleb Owens
d80475e563 Introduce Customizable AI Prompts 2024-05-31 15:00:33 +02:00
Caleb Owens
78c4fedbbe Replace PromptMessage[] with Prompt type 2024-05-31 14:59:41 +02:00
Caleb Owens
3ac4a18c93 disable tooltip length limiter 2024-05-31 14:33:20 +02:00
Caleb Owens
07ed7c8a88 Remove non-advanced mode 2024-05-31 14:33:07 +02:00
Kiril Videlov
1d788f0e64
Merge pull request #3930 from gitbutlerapp/update-ubuntu-20.04
feat(workflow): Update Linux dependencies and target Ubuntu 20.04
2024-05-31 13:58:48 +02:00
Kiril Videlov
4b87eca5ca feat(workflow): Update Linux dependencies and target Ubuntu 20.04 2024-05-31 13:58:27 +02:00
Kiril Videlov
0f58195485
Merge pull request #3929 from gitbutlerapp/Virtual-branch
feat(ci): install Linux dependencies in a single command
2024-05-31 13:48:47 +02:00
Kiril Videlov
50919de25c feat(ci): install Linux dependencies in a single command 2024-05-31 13:48:29 +02:00
Kiril Videlov
b8516882a6
Merge pull request #3928 from gitbutlerapp/Virtual-branch
do update first
2024-05-31 12:34:04 +02:00
Kiril Videlov
21be7ef8fe do update first 2024-05-31 12:22:11 +02:00
Kiril Videlov
0aed71ee0e
Merge pull request #3926 from gitbutlerapp/Virtual-branch
lets try this linux version
2024-05-31 12:09:53 +02:00
Kiril Videlov
a17ec82346 lets try this linux version 2024-05-31 11:57:33 +02:00
Kiril Videlov
1539103596
Merge pull request #3925 from gitbutlerapp/Virtual-branch
newer github worker
2024-05-31 11:41:09 +02:00
Kiril Videlov
f79cca0ca5 Newer github worker 2024-05-31 11:15:39 +02:00
Kiril Videlov
ea67cf21f8
Merge pull request #3923 from gitbutlerapp/Virtual-branch
remove duplicate line
2024-05-31 10:40:58 +02:00
Kiril Videlov
ab9766d7ec remove duplicate line 2024-05-31 10:28:14 +02:00
Kiril Videlov
7dda611275
Merge pull request #3891 from AliRezaTaleghani/master
Update publish.yaml
2024-05-31 10:24:44 +02:00
Mattias Granlund
97dfa93bda Remove error logging related to blame
- blame range can include commits not in vbranch
- lookup returning none expected behavior
2024-05-31 02:37:47 +02:00
Mattias Granlund
b47a947398 Fix blame merge base
- use the merge base of the first commits on active branches
2024-05-31 01:57:59 +02:00
Kiril Videlov
12e2275d84
Merge pull request #3920 from gitbutlerapp/snapshots-save-errors
snapshots save errors
2024-05-31 00:23:47 +02:00
Kiril Videlov
4b8d97a500 save error on undo commit snapshot 2024-05-30 23:59:30 +02:00
Kiril Videlov
0f482934c8 save error on unapply branch snapshot 2024-05-30 23:44:58 +02:00
Kiril Videlov
618c7adedc save error on apply branch snapshot 2024-05-30 22:31:16 +02:00
Mattias Granlund
d0bf62cb37 Add upstream line from commit lines base 2024-05-30 22:09:10 +02:00
Kiril Videlov
d7ae4d85f1 first stab at saving errors in snapshots 2024-05-30 22:07:02 +02:00
Mattias Granlund
f1fa43060b Fix criteria for showing shadow commit line column 2024-05-30 21:38:49 +02:00
Mattias Granlund
68a71570a2 Stop the pr card from refreshing all the time
- a derived store is clutch for this
2024-05-30 21:35:11 +02:00
Kiril Videlov
0da06a1551
Merge pull request #3916 from gitbutlerapp/revert-3915-remove-idle-check-and-flush
Revert "fix: performance issue "
2024-05-30 20:23:13 +02:00
Kiril Videlov
2e788de86f
Revert "fix: performance issue " 2024-05-30 20:10:23 +02:00
Kiril Videlov
e908828b3a
Merge pull request #3910 from gitbutlerapp/check-mergeable-state-of-virtual-branch
feat: Show merge base of virtual branch in commit list
2024-05-30 20:03:18 +02:00
Kiril Videlov
4fef581397
Merge pull request #3915 from gitbutlerapp/remove-idle-check-and-flush
fix: performance issue
2024-05-30 19:50:50 +02:00
Kiril Videlov
e6f75dae0f fix: performance issue
this is an undo of cdf508e04c
2024-05-30 19:35:10 +02:00
Mattias Granlund
60f289f92a Fix bug in commit lines
- handle case where only some commits have been rebased
2024-05-30 19:19:19 +02:00
Mattias Granlund
10df1621a7 Keep change id when amending a commit 2024-05-30 19:09:18 +02:00
Caleb Owens
c32447f7bc
Merge pull request #3913 from gitbutlerapp/improve-copy-for-merge-commit
Improve copy for merge commit
2024-05-30 19:05:15 +02:00
Caleb Owens
d70b73b256 Improve copy for merge commit 2024-05-30 19:03:49 +02:00
Caleb Owens
6a809433be
Merge pull request #3911 from gitbutlerapp/improve-styles-of-remotes
Components: Enhanced Commit List Display
2024-05-30 18:45:17 +02:00
Caleb Owens
8c887c73cc Components: Enhanced Commit List Display
Updated the Remote Branch Preview component to display commits with proper styling and highlighting of first and last commit in a list.
2024-05-30 18:43:54 +02:00
Kiril Videlov
088eb23f8e feat: Show merge base of virtual branch in commit list 2024-05-30 18:41:40 +02:00
Kiril Videlov
0f93cf6772
Merge pull request #3909 from gitbutlerapp/branch-add-persisted-show-history-view
feat(Board.svelte): show history view on error
2024-05-30 18:23:32 +02:00
Kiril Videlov
83e4886a73 feat(Board.svelte): show history view on error 2024-05-30 18:20:38 +02:00
Caleb Owens
b7587ecafc
Merge pull request #3908 from gitbutlerapp/fix-branch-files-list
Fix shift clicking files
2024-05-30 18:12:31 +02:00
Caleb Owens
20f253c3c5 Fix shift clicking files 2024-05-30 18:06:34 +02:00
Kiril Videlov
3c66d8a8e7
Merge pull request #3907 from gitbutlerapp/add-map-oid-from
fix a small thing
2024-05-30 18:03:21 +02:00
Kiril Videlov
909894149f fix a small thing 2024-05-30 17:51:27 +02:00
Mattias Granlund
d9c96e84db Fix bug in commit lines
- we can rely on change id's when establishing commit relationships
2024-05-30 17:47:05 +02:00
Caleb Owens
a4878b234d
Merge pull request #3904 from gitbutlerapp/improve-file-id-selection
Sanitize file preview code
2024-05-30 17:40:00 +02:00
Caleb Owens
726ec5ade9 Don't allow moving hunks if commit is upstream 2024-05-30 17:37:20 +02:00
Caleb Owens
3ee9e2724d Improve maybe move selection 2024-05-30 17:32:05 +02:00
Kiril Videlov
0e7c430d65
Merge pull request #3905 from gitbutlerapp/handle-merge-commits
handle merge commits
2024-05-30 16:46:00 +02:00