5154 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nikita Galaiko	658a1ab1be	connect ui to move_commit	2024-02-19 14:43:20 +01:00
Nikita Galaiko	2a07acf46e	implement move_commit api	2024-02-19 09:21:12 +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
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