Commit Graph

1103 Commits

Author SHA1 Message Date
josh@gitbutler.com
9133ef3607 add DefaultTrue type 2023-12-12 17:25:15 +01:00
Pavel Laptev
680cf192db wip 2023-12-11 15:12:31 +01:00
Nikita Galaiko
d0603c5643 fix test 2023-12-11 14:03:34 +01:00
Nikita Galaiko
9c157ae0af do not show create pr button for pushed branches 2023-12-11 14:00:51 +01:00
Nikita Galaiko
e5f7a71f7c docs: add documentation for ok_with_force_push field in Project struct 2023-12-11 14:00:26 +01:00
Nikita Galaiko
c2b8eb6a71 test force push setting 2023-12-11 13:01:17 +01:00
Nikita Galaiko
0a311f14b5 Merged origin/master into Add ok with force push to project 2023-12-11 11:25:27 +01:00
Nikita Galaiko
a1e4e651cc ui for ok with force pushing 2023-12-11 11:17:20 +01:00
Nikita Galaiko
0840e69db8 configurable "ok with force pushing" 2023-12-11 11:17:08 +01:00
josh@gitbutler.com
333ded9534 fix clippy lints in nightly 2023-12-11 11:09:27 +01:00
Nikita Galaiko
fdfe34b21b add credentials tests 2023-12-11 09:33:11 +01:00
Mattias Granlund
e7990b41ba Fix bug in hunk context menu
- it wasn't always referring to the right file
2023-12-10 23:56:56 +00:00
Mattias Granlund
ebbc71a0bc Go back on flex container in scrollable
- using block is more ergonomic for its contents
- undo the decision on using flex I made earlier today
2023-12-10 23:54:43 +00:00
Pavel Laptev
57ee23bf77 hover updated 2023-12-11 00:08:39 +01:00
Mattias Granlund
5dc93d932d Fix a couple of scrollable glitches 2023-12-10 21:38:52 +00:00
Kiril Videlov
2aaeac1f80 🐛 fix: correctly handle user authentication status for enabling branch name and commit message generation
🔨 chore: remove unused userSettings variable from login page
2023-12-10 21:42:16 +01:00
Kiril Videlov
10165be6ac 🐛 fix: correct typo in error message for failed pull request creation 2023-12-10 21:36:31 +01:00
Kiril Videlov
136eb65225 fix a nasty auth bug — incorrect url conversion 2023-12-10 21:27:38 +01:00
Pavel Laptev
ce9ffdf3bd small css fix 2023-12-10 20:26:24 +01:00
Pavel Laptev
ef096fa480 default branch width updated 2023-12-10 16:52:29 +01:00
Pavel Laptev
fd42da0774 New branch dragzone updated 2023-12-10 16:42:02 +01:00
Pavel Laptev
b72f2e4b1f Wip 2023-12-09 21:54:12 +01:00
Pavel Laptev
8fa960cdee Wip 2023-12-09 21:07:59 +01:00
Pavel Laptev
8e196b1274 Fixed files list gap and added bottom padding 2023-12-09 21:03:04 +01:00
Pavel Laptev
433db0cd32 Sync button, new icons, tag updated 2023-12-09 20:53:13 +01:00
Pavel Laptev
961df0852e padding updates 2023-12-09 14:59:06 +01:00
Pavel Laptev
5cbc98fca0 new icon “commit" 2023-12-09 14:56:51 +01:00
Pavel Laptev
1b48cd40ac merged from upstream 2023-12-09 14:47:32 +01:00
Pavel Laptev
2727312b77 Added new overlay color 2023-12-09 10:23:18 +01:00
Pavel Laptev
48ad2c4e99 Updated tokens 2023-12-08 17:27:04 +01:00
Pavel Laptev
7dc40b0c1f Css fix 2023-12-08 17:18:14 +01:00
Pavel Laptev
ae4a13450d codereview fixes from https://github.com/gitbutlerapp/gitbutler-client/pull/1961 2023-12-08 17:14:05 +01:00
Pavel Laptev
478f672acb hover color updated 2023-12-08 17:09:07 +01:00
Pavel Laptev
6089678198 Merged origin/master into Update gravatar icons and branch item 2023-12-08 17:03:39 +01:00
Pavel Laptev
0e98acd370 Wip 2023-12-08 17:03:22 +01:00
Nikita Galaiko
29b6430fb4
Merge pull request #1964 from gitbutlerapp/update-dependencies-1
Update dependencies 1
2023-12-08 16:26:40 +01:00
Pavel Laptev
07b501f6a5 Codereview fixes 2023-12-08 15:07:49 +01:00
Pavel Laptev
9dcf5b49aa Merged origin/master into Improve label editing using keyboard 2023-12-08 14:54:41 +01:00
Nikita Galaiko
14254fe23c fix: ensure known_hosts is up to date 2023-12-08 14:51:16 +01:00
Nikita Galaiko
9e57b90f7d
Merge pull request #1957 from gitbutlerapp/smarter-credentials-helper
smarter credentials helper
2023-12-08 12:28:45 +01:00
Nikita Galaiko
f1fd6e6a59 hint absolute path 2023-12-08 11:13:35 +01:00
Mattias Granlund
56537d428c Create ScrollableContainer component
- use it for all scrollable containers other than board
- commit got too big, includes github PR stuff (not active)
2023-12-08 10:04:11 +00:00
Nikita Galaiko
a1d8b8cb8c test all the keys 2023-12-08 11:02:17 +01:00
Pavel Laptev
2d12e953ea Fixes 2023-12-07 17:29:56 +01:00
Pavel Laptev
6dfc9203fa Fix 2023-12-07 17:24:56 +01:00
Pavel Laptev
39d4b5f861 Wip 2023-12-07 17:22:19 +01:00
Pavel Laptev
f6f9d57520 Update 2023-12-07 14:03:22 +01:00
Pavel Laptev
935376ed8c Wip 2023-12-07 13:14:37 +01:00
Nikita Galaiko
346685cc64 if we know which auth to use, only use that 2023-12-07 11:13:49 +01:00
Nikita Galaiko
287fe9d3db smarter credentials helper 2023-12-06 17:24:48 +01:00