Commit Graph

5234 Commits

Author SHA1 Message Date
Pavel Laptev
9a5fe102a7 NotOnGitButlerBranch refactor
- fixed screen flickering
- page layout updated
2024-02-19 21:43:51 +01:00
Pavel Laptev
7227d7acf6 small copy change
in order to make the button shorter
2024-02-19 21:42:27 +01:00
AbhishekThorat
48ea49f323 - Lint fix 2024-02-20 01:20:14 +05:30
AbhishekThorat
dea2b64b6f - Minor variable name change 2024-02-20 01:16:56 +05:30
Abhishek Thorat
7acfd2a8a9
Merge branch 'master' into support/remove-project-from-not-on-git-butler-branch 2024-02-20 01:01:13 +05:30
AbhishekThorat
411f85b783 - Fix project not found issue after deleting project from non-git-butler-branch screen 2024-02-19 23:47:48 +05:30
Kiril Videlov
35cba464dc
Merge pull request #2689 from namanlp/replace-context-menu-plugin
Replace fork of Context Menu Plugin with Upstream
2024-02-19 18:59:36 +01:00
Kiril Videlov
94373436f8
Merge pull request #2806 from namanlp/fix-window-show-issue
Fix #2630:  The Linux window show bug
2024-02-19 18:55:18 +01:00
Kiril Videlov
fde55c81ac
Merge pull request #2816 from Meesayen/add-file-discard-menu-in-tree-view
chore: applied context menu to discard file to the tree view
2024-02-19 18:51:43 +01:00
AbhishekThorat
016d79928c - lint fix 2024-02-19 21:30:48 +05:30
AbhishekThorat
abf4f9d16e Merge branch 'master' of https://github.com/AbhishekThorat/gitbutler into support/remove-project-from-not-on-git-butler-branch 2024-02-19 21:27:51 +05:30
AbhishekThorat
19495250e0 - Add Remove this project ... button with not on git butler branch screen 2024-02-19 21:23:09 +05:30
Pavel Laptev
302b179d21
Merge pull request #2817 from gitbutlerapp/small-CSS-fixes-and-replace-textarea-tag
Small css fixes and replace textarea tag
2024-02-19 16:10:03 +01:00
Pavel Laptev
9c52e18d39 UI fix: replaced textarea element with TextArea component 2024-02-19 15:30:57 +01:00
Pavel Laptev
aa20f30f4d CSS fix: trancate long virtual branch names 2024-02-19 15:27:00 +01:00
Pavel Laptev
673e6c1a42 project setup card feature style fix 2024-02-19 15:26:22 +01:00
Meesayen
a8e1c7bc7d chore: applied context menu to discard file to the tree view 2024-02-19 14:59:27 +01:00
Meesayen
0fddf1bc5b chore: consider "contextmenu" event as a click outside event too 2024-02-19 15:46:16 +02:00
Nikita Galaiko
658a1ab1be connect ui to move_commit 2024-02-19 14:43:20 +01:00
AbhishekThorat
52607dfb75 - Add default branch check before deleting virtual branch directly 2024-02-19 15:35:10 +02:00
AbhishekThorat
fa8386552c fix - Avoid showing delete branch modal for empty virtual branch. 2024-02-19 15:35:10 +02:00
Meesayen
de7d869411 fix: hunk and file context menu now correctly dismiss 2024-02-19 15:27:09 +02:00
Meesayen
f36ba52b27 fix: the branch card's options menu is truncated by a recently added overflow:hidden 2024-02-19 15:14:59 +02:00
Dino Lindlau
16f834fc08 Add a custom renderer for links, same as in ToastControlelr 2024-02-19 13:08:18 +02:00
Pavel Laptev
5fe888c1b0
Merge pull request #2802 from gitbutlerapp/Small-CSS-and-copy-updates
Small updates
2024-02-19 11:39:28 +01:00
Naman Garg
aa27f8d3a8
Fix the Linux window show issue 2024-02-19 14:47:29 +05:30
Nikita Galaiko
2a07acf46e implement move_commit api 2024-02-19 09:21:12 +01:00
Pavel Laptev
21d11c84c5 refactor: TextBox component refactor, select component updated 2024-02-19 01:29:01 +01:00
Pavel Laptev
54a5e4eef9 UI: card style update 2024-02-19 01:27:40 +01:00
Pavel Laptev
ae0c24ffaa shadow design tokens update 2024-02-19 00:24:14 +01:00
Pavel Laptev
2959840c3f discard file copy update 2024-02-19 00:22:52 +01:00
Kiril Videlov
739da32243
Merge pull request #2726 from Meesayen/discard-entire-file-via-contextmenu
feat: ability to discard changes to an entire file
2024-02-18 21:08:31 +01:00
Meesayen
d133f21b30 chore: fix linting issue 2024-02-18 20:53:35 +01:00
Federico Giovagnoli
bbdb24973c
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 20:51:37 +01:00
Pavel Laptev
29f380e642
Merge pull request #2800 from gitbutlerapp/CSS-fix-Lane-resizer-position
CSS fix: Resizer position bug
2024-02-18 20:17:35 +01:00
Pavel Laptev
564ea365f1 resizer position bug fixed 2024-02-18 20:12:36 +01:00
Kiril Videlov
4797efd663
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 15:48:17 +01:00
Pavel Laptev
d5b39f0494
Merge pull request #2796 from gitbutlerapp/UI-fixes
Small CSS fixes
2024-02-18 15:31:48 +01:00
Pavel Laptev
bd01a2d88d small css fixes, color theme tweaking 2024-02-18 15:27:56 +01:00
Pavel Laptev
ccaa380b36 light color for intaractive states updated 2024-02-18 15:23:03 +01:00
Meesayen
8ba3ad3fe1 chore: fix linting issue 2024-02-18 14:22:50 +01:00
Federico Giovagnoli
10ae89202d
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 14:18:26 +01:00
Caleb Owens
77ddeb79ec Move comments to a rust FMT approved location 2024-02-18 13:44:30 +01:00
Caleb Owens
fa5d938590 Updated comments in context.rs 2024-02-18 13:44:30 +01:00
Caleb Owens
f790ca1b3d Add tests to verify changes 2024-02-18 13:44:30 +01:00
Caleb Owens
1378a8a8ca Change weird_testcase to not panic when it fails 2024-02-18 13:44:30 +01:00
Caleb Owens
df2e1e22c9 Fix "weird_testcase" whitespace 2024-02-18 13:44:30 +01:00
Caleb Owens
f90463c26f Fix most of the tests 2024-02-18 13:44:30 +01:00
Caleb Owens
ada7bee5d0 Fix clippy issues 2024-02-18 13:44:30 +01:00
Caleb Owens
894f9adb3b Remove whitespace
Run rust FMT
2024-02-18 13:44:30 +01:00