gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-21 08:31:40 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,127 Commits 156 Branches 1,064 Tags 61 MiB
1b3560ca2d
Commit Graph

4127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
8b3d8e42d0
Merge pull request #1988 from gitbutlerapp/add-force-pushing-error 
disallow amending if force pushing is not ok
 2023-12-11 16:54:04 +01:00
Nikita Galaiko
768bde4f27 disallow amending if force pushing is not ok 2023-12-11 15:49:43 +01:00
Pavel Laptev
3cb80305e6
Merge pull request #1986 from gitbutlerapp/virtual-branch-2 
Virtual branch
 2023-12-11 15:14:39 +01:00
Pavel Laptev
680cf192db wip 2023-12-11 15:12:31 +01:00
Nikita Galaiko
937749d886
Merge pull request #1983 from gitbutlerapp/add-ok-with-force-push-to-project 
Add ok with force push to project
 2023-12-11 14:16:15 +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
Qix
763a4138a3
Merge pull request #1982 from gitbutlerapp/add-rust-toolchain-file 
add rust toolchain file
 2023-12-11 11:23:48 +01:00
josh@gitbutler.com
6cd7e60343 sort dependencies 2023-12-11 11:19:17 +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
josh@gitbutler.com
dc06dadb10 add rust-toolchain.toml file 2023-12-11 11:09:19 +01:00
Nikita Galaiko
911bb88f3f
Merge pull request #1980 from gitbutlerapp/add-unit-tests-for-helper 
Add unit tests for helper
 2023-12-11 09:39:02 +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
419d9c5924
Merge pull request #1977 from gitbutlerapp/segmented-control-hover-updated 
Segmented control - hover updated
 2023-12-11 00:10:25 +01: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
9dd441887d
Merge pull request #1972 from gitbutlerapp/small-css-fix 
Small CSS fix
 2023-12-10 20:28:05 +01:00
Pavel Laptev
ce9ffdf3bd small css fix 2023-12-10 20:26:24 +01:00
Pavel Laptev
0e557897c7
Merge pull request #1971 from gitbutlerapp/add-new-virtual-branch-button 
Updated "Create new virtual branch" design
 2023-12-10 16:56:41 +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
b7b15b5195
Merge pull request #1970 from gitbutlerapp/add-theme-overlay-bg-color 
Sync button update
 2023-12-09 21:10:24 +01:00
Pavel Laptev
8fa960cdee Wip 2023-12-09 21:07:59 +01:00
Pavel Laptev
5086468c1e
Merge pull request #1969 from gitbutlerapp/add-theme-overlay-bg-color 
💅 CSS updates
 2023-12-09 21:04:55 +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
d11adae19d
Merge pull request #1968 from gitbutlerapp/add-theme-overlay-bg-color 
Some CSS updates
 2023-12-09 15:05:21 +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
d842a01622
Merge pull request #1966 from gitbutlerapp/update-theme-colors 
Update theme colors
 2023-12-08 17:30:22 +01:00
Pavel Laptev
48ad2c4e99 Updated tokens 2023-12-08 17:27:04 +01:00
Pavel Laptev
ee096d9c0e
Merge pull request #1965 from gitbutlerapp/update-gravatar-icons-and-branch-item 
Update gravatar icons and branch item
 2023-12-08 17:19:53 +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