Commit Graph

7234 Commits

Author SHA1 Message Date
Kiril Videlov
d164457299 update_base_branch returns unapplied branches list
If merge conflicts caused branches to become unapplied, return them as a list
2024-06-01 13:11:53 +02:00
Kiril Videlov
ad4d94208b
Merge pull request #3937 from gitbutlerapp/add-revert-help-text
feat: Add help text to Revert button on Snapshot Card.
2024-06-01 12:55:42 +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
23b6760b82
Merge pull request #3931 from gitbutlerapp/svelte-commit-card-updates
Remove non-advanced mode
2024-05-31 23:03:00 +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
9cde2babcb
Merge pull request #3818 from gitbutlerapp/customizable-ai-prompts
Leeerrrooyyyy jeeennnkkkininnsss
2024-05-31 22:02:31 +02:00
Caleb Owens
0b36e4bcc4 Fixed some stupid shit 2024-05-31 22:00:08 +02:00
Pavel Laptev
564830d8ff
remove console.log (#3934) 2024-05-31 16:56:45 +02:00
Pavel Laptev
e8b70859bd
Revert "Refactor: Tailwind remove (#3932)" (#3933)
This reverts commit 89d97d2017.
2024-05-31 16:20:17 +02:00
Pavel Laptev
89d97d2017
Refactor: Tailwind remove (#3932)
* remove teilwind CSS imports

* remove Teilwind package

* remove unused CSS
2024-05-31 16:05:47 +02:00
Kiril Videlov
565535ba6d
Merge pull request #3927 from anaisbetts/use-debouncer-0.3.1
Use notify-debouncer-full v0.3.1
2024-05-31 15:58:14 +02:00
Caleb Owens
509b72409d Fix prompt selector 2024-05-31 15:38:35 +02:00
Ani Betts
035736a245
Fix the test paths 2024-05-31 15:27:16 +02:00
Ani Betts
4363f0fcc4
Leave these exports here in case we need them later 2024-05-31 15:27:16 +02:00
Ani Betts
73ab4bdd90
First hack at readding the tests 2024-05-31 15:27:16 +02:00
Ani Betts
3e34a92634
Chill out some of these logs 2024-05-31 15:27:16 +02:00
Ani Betts
bc31c65fc3
Let's just get it working 2024-05-31 15:27:16 +02:00
Ani Betts
2b3690308c
Roll back to v0.3.1 + flush changes 2024-05-31 15:27:15 +02:00
Pavel Laptev
2b131097ce copy updated 2024-05-31 15:00:33 +02:00
Pavel Laptev
bd365fd08a UI: Custom AI prompts layouts updated 2024-05-31 15:00:33 +02:00
Pavel Laptev
3991cea11f default prompts updated
In order to correctly display code snippets, the code was wrapped in special triple backticks.
2024-05-31 15:00:33 +02:00
Pavel Laptev
c69d3956df icon typo fix 2024-05-31 15:00:33 +02:00
Pavel Laptev
e2f37d884b fix removed --size-1 variable error 2024-05-31 15:00:33 +02:00
Pavel Laptev
690d96c818 markdown styles updated 2024-05-31 15:00:33 +02:00
Pavel Laptev
bcd89d5c4c TextArea: added autoresize 2024-05-31 15:00:33 +02:00
Caleb Owens
a936f89485 Go to a manual save step 2024-05-31 15:00:33 +02:00
Caleb Owens
53abdffb5c Better defaults if prompt becomes invalid 2024-05-31 15:00:33 +02:00
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