Commit Graph

661 Commits

Author SHA1 Message Date
Caleb Owens
4d29cd0723
Get things working a little tiny bit more 2024-07-01 21:09:10 +02:00
ndom91
b46c2c4d5b
feat: add initial turbo cli 2024-07-01 18:47:43 +02:00
ndom91
f0ae83fda5
fix: move CommitLines dir and update export map 2024-07-01 13:04:47 +02:00
Nico Domino
6f403b9325
Merge branch 'master' into ndom91/create-gitbutler-ui-package 2024-07-01 10:28:55 +02:00
Mattias Granlund
d4c0b97f7d Use pr source branch as title in branch list 2024-06-30 19:56:44 +03:00
Mattias Granlund
8851780851 Fix bug related to switching from integration branch
- value of projects store should never be undefined
2024-06-30 19:53:19 +03:00
Pavel Laptev
d9f314f49b
Do not allow pxToRem function get undifined (#4206)
* Do not allow `pxToRem` function get `undifined`

* `TextBox` width fix
2024-06-29 15:26:44 +02:00
Mattias Granlund
7f929837f9 Show remote branch using name instead of sha
- multiple branches can have the same sha
2024-06-28 17:58:42 +03:00
Mattias Granlund
7073308c9a Drop unused symbols
- been meaing to remove these for a while
2024-06-28 15:41:03 +03:00
Mattias Granlund
9912e2df40 chore: update incorrect variable names in BranchFooter 2024-06-28 14:38:10 +03:00
Mattias Granlund
0082099f8c Fix bug in PushButton component
- show selected action rather than preferred action
2024-06-28 14:23:21 +03:00
ndom91
007f3516fe
fix: commitlines type import 2024-06-28 12:55:26 +02:00
ndom91
836b86a753
Merge branch 'master' into ndom91/create-gitbutler-ui-package 2024-06-28 12:50:44 +02:00
Mattias Granlund
fd3e846989 Fail gracefully if remote branch not found 2024-06-28 12:57:43 +03:00
ndom91
7e8ebdab76
fix: move globals dep to root 2024-06-28 11:57:16 +02:00
ndom91
e84946d9b5
fix: move eslint/prettier config to root 2024-06-28 11:40:36 +02:00
Mattias Granlund
8f052c04b7 Fix commit dialog backspace bug
- place curstor at end of commit title when backspacing from empty description
2024-06-28 12:39:07 +03:00
ndom91
25068de8bb
fix: move eslint/prettier to root only 2024-06-28 11:34:54 +02:00
Mattias Granlund
f67744eea1 Fix for incorrect GitHub error when working in non-GitHub repos 2024-06-28 12:32:33 +03:00
Caleb Owens
dd0b4eccf1
Improve ai error handling (#4180)
* Introduce a result type

* Update AI error handling to use the result type

* Handle ollama json parse error

* Migrate using Error as the type that represents errors

* Remove now useless condition

* asdfasdf

* Use andThen

* Correct unit tests
2024-06-27 20:50:44 +01:00
Pavel Laptev
518cc8b77e
Fix overflow issue for the Generate msg dropdown (#4195) 2024-06-27 16:48:57 +02:00
ndom91
7e75780b1a
fix: commitList path 2024-06-27 16:37:54 +02:00
ndom91
a93cd3ceb7
fix: cleanup dependencnies in app and ui 2024-06-27 14:26:56 +02:00
ndom91
0214fab13f
fix: rm commitLines from app 2024-06-27 14:26:41 +02:00
ndom91
2eeb93b81f
feat: add consumption of @gitbutler/ui pkg 2024-06-27 11:39:48 +02:00
Pavel Laptev
900316ad7a
Fix: Base icon CSS (#4193)
- Fix top margin for unfolded base row
- Fix CSS variables (added new, remove ununsed)
2024-06-27 00:40:33 +02:00
ndom91
091b45d5e9
feat: create separate component library subpackage 2024-06-26 18:01:09 +02:00
Pavel Laptev
b4509efa44
Allow rebasing toogle menu position updated (#4189) 2024-06-26 15:48:01 +02:00
Kiril Videlov
324941ea0e
add tooltip on the allow rebasing toggle for lanes 2024-06-26 14:02:36 +02:00
Kiril Videlov
3fb7f3b8bb
add the ability to toggle the allow rebasing flag for lanes in the UI 2024-06-26 13:53:13 +02:00
Pavel Laptev
8de4c3b651
Don't focus the last item if multiple selection (#4186) 2024-06-25 22:48:33 +02:00
Kiril Videlov
dc27f164f6
Merge pull request #4183 from gitbutlerapp/amend-commit-label-update
style: Correct spelling of "Ammend" to "Amend" in CardOverlay.
2024-06-25 20:14:16 +02:00
Kiril Videlov
2aa22a16de
style: Correct spelling of "Ammend" to "Amend" in CardOverlay. 2024-06-25 20:12:38 +02:00
Caleb Owens
c0102d4f95
Merge pull request #4182 from gitbutlerapp/Remove-log-that-was-intended-at-one-point-in-time
Remove log that was intended at one point in time
2024-06-25 19:54:09 +02:00
Caleb Owens
5be7b26731
Remove log that was intended at one point in time 2024-06-25 19:46:55 +02:00
Caleb Owens
439320ebeb
Don't auto-generate branch names 2024-06-25 19:43:23 +02:00
Caleb Owens
676b05b318
Merge pull request #4179 from gitbutlerapp/Fix-daft-mistake
Fix daft mistake
2024-06-25 19:05:25 +02:00
Caleb Owens
2952b0355f
Fix daft mistake 2024-06-25 15:26:04 +02:00
Mattias Granlund
6d6789d494 Update branch delete modal message
- it is no longer true the action cannot be undone
- resolves gh issue #4066
2024-06-25 15:27:28 +03:00
Pavel Laptev
fd86ec7a64 CSS: Dashed line fix 2024-06-24 23:55:28 +02:00
Pavel Laptev
3735be9d70 CSS: remove extra div wrapper 2024-06-24 23:22:13 +02:00
Pavel Laptev
90186f5154 The dotted line was not seamless
This approach seems to be working
2024-06-24 22:59:49 +02:00
Pavel Laptev
ee2054c1ea CSS tweaks
- Move matching line classes into a separate CSS file in order to track and maintain styles changes better
- small z-index issue fixed
2024-06-24 22:46:16 +02:00
Caleb Owens
80cf077b16 Undo oopsie 2024-06-24 21:21:40 +02:00
Caleb Owens
eb2205b92b sadfsadfafds 2024-06-24 21:14:03 +02:00
Caleb Owens
3ac69f8ccb fix linting errors 2024-06-24 21:14:03 +02:00
Caleb Owens
a06a9518a4 Allow passing in a height override to the line group 2024-06-24 21:14:03 +02:00
Caleb Owens
869982ce93 Remove storybook-build script 2024-06-24 21:14:03 +02:00
Caleb Owens
a4e791dfd6 Add comments and tweak styles 2024-06-24 21:14:03 +02:00
Caleb Owens
ece26f0f11 Fix story bookks 2024-06-24 21:14:03 +02:00