Commit Graph

5142 Commits

Author SHA1 Message Date
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
Caleb Owens
be051d7840 Fix line number calculations 2024-02-18 13:44:30 +01:00
Caleb Owens
2749ea1ccb Remove extra logic
(the start_line_XXX_no_ctx) are the same as the hunk_XXX_start_line values
2024-02-18 13:44:30 +01:00
Caleb Owens
29886f3290 Don't reverse before context 2024-02-18 13:44:30 +01:00
Caleb Owens
cf55bff6bf Clean up increment then decrement into one if expression 2024-02-18 13:44:30 +01:00
Caleb Owens
cf4c5609ba Fix surrounding logic 2024-02-18 13:44:30 +01:00
Caleb Owens
d9b6636462 Fix whitespace that vim removes 2024-02-18 13:44:30 +01:00
Kiril Videlov
709a8f4b2f add rate limiting for file filtering gitignored files 2024-02-18 12:36:34 +01:00
Kiril Videlov
ea927c2b21 perf: filter ignored changes for virtual branch calc 2024-02-18 12:36:34 +01:00
Pavel Laptev
cfb06b9ae0
Merge pull request #2788 from gitbutlerapp/Color-theme-update-and-input-classes-refactoring
Color theme and input classes refactoring
2024-02-18 00:48:21 +01:00
Pavel Laptev
e2b42d5778 input focus bacground updated 2024-02-18 00:33:04 +01:00
Pavel Laptev
ad492d0c77 updated color theme, postcss files renamed to css, input classes refactoring 2024-02-18 00:23:14 +01:00
Pavel Laptev
e3f8948584
Merge pull request #2787 from gitbutlerapp/CSS-fixes
Small CSS fixes
2024-02-18 00:04:40 +01:00
Pavel Laptev
a2a4df45de removed unused CSS, added role="button in order to handle button-like elements 2024-02-17 23:53:23 +01:00
Pavel Laptev
962addd140 comented css removed 2024-02-17 23:53:23 +01:00
Pavel Laptev
8681f1438d commit textarea border-radius fix 2024-02-17 23:53:23 +01:00
Kiril Videlov
64ee34e0a9 feat: update projectCurrentCommitMessage function to include branchId parameter and use it in relevant places 2024-02-17 21:25:00 +01:00
Kiril Videlov
029377be06 feat: when a commit is undone, the commit message box will be pre-filled with the last message 2024-02-17 20:32:24 +01:00
Kiril Videlov
2a48b7f072 feat: the commit message will no longer be lost during navigation 2024-02-17 20:32:24 +01:00
Kiril Videlov
f252d0c8f0 fix: dont automatically show large diffs 2024-02-17 19:54:02 +01:00
Caleb Owens
9af53324d3 Fix linting issues 2024-02-17 18:58:09 +01:00
Caleb Owens
088cf5a4bb Only show "Force push to remote" when pushing zero commits to a branch 2024-02-17 18:58:09 +01:00
Robin Schmidt
37c9ccfe28 fix(docs): clean up some typos in documentation files 2024-02-17 18:54:08 +01:00
Kiril Videlov
dd5049244b chore: increase debounce timeout for file change events to prevent multiple events from being sent for a single file change 2024-02-17 18:28:37 +01:00
Pavel Laptev
af907c2902 remove code duplication, readonly state for file list tree fixed 2024-02-17 18:22:21 +01:00
Caleb Owens
3a4fb738c8 Add loading state to PushButton when in "pr" state 2024-02-17 14:36:52 +01:00
Meesayen
f477d8d277 chore: disable discard button for binary files for now 2024-02-17 13:23:13 +01:00
Meesayen
7023e43806 chore: added confirmation moda & handled multi selection of files 2024-02-17 13:13:12 +01:00
Meesayen
548bd2c3c0 fix: missing branchController input in some components 2024-02-17 12:16:11 +01:00
Meesayen
25e26b28aa chore: lint fixes 2024-02-17 12:16:11 +01:00
Meesayen
bd7bf3b8a9 chore: DRYer approach 2024-02-17 12:16:11 +01:00
Meesayen
fd7c18d121 feat: ability to discard changes to an entire file 2024-02-17 12:16:11 +01:00
Pavel Laptev
4796613c9d
Merge pull request #2770 from gitbutlerapp/UI-fixes
UI updates: file list and checkbox
2024-02-17 00:45:48 +01:00
Pavel Laptev
7bcd2b8ae9 file list item: hover updated, added space between file list items 2024-02-17 00:42:56 +01:00
Pavel Laptev
a9797b22a7 removed :backdrop css variables
checkbox icon updated and removed  `:backdrop` css variables
2024-02-17 00:12:07 +01:00
Kiril Videlov
42302763d6 fix: update regex pattern to allow periods in branch names 2024-02-16 23:42:25 +01:00
Caleb Owens
b787c823af Split Credit prompt into two sentences 2024-02-16 22:57:25 +01:00
Caleb Owens
c5a003318c Remove unused utmost_discresion functions in rust 2024-02-16 22:57:25 +01:00
Caleb Owens
3a75baa89c Update the wording in the settings page to use opt-in terminology. 2024-02-16 22:57:25 +01:00
Caleb Owens
e7a00c7700 Remove the prompt in the commit box as it now targets users who opt in.
This seems counterproductive as they're already supporting by sharing the product
2024-02-16 22:57:25 +01:00
Caleb Owens
433e965a19 Adapt prompt in the commit box to use new setting name 2024-02-16 22:57:25 +01:00
Caleb Owens
7f71b96342 Updated to have allow changing annotation settings and removed copy around the notion of becoming a supporter to disable it (Though you should still become one!!) 2024-02-16 22:57:25 +01:00