7505 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ndom91	ec9c4c0b68	Merge branch 'ndom91/hunk-viewer' of github.com:gitbutlerapp/gitbutler into ndom91/hunk-viewer	2024-06-06 15:36:27 +02:00
ndom91	6abbf581a8	fix: prettier	2024-06-06 15:36:18 +02:00
Nico Domino	8d7d23c5b6	Merge branch 'master' into ndom91/hunk-viewer	2024-06-06 15:32:30 +02:00
ndom91	347c53b9f7	fix: prettier	2024-06-06 15:26:33 +02:00
ndom91	01236a5dfa	fix: cleanup	2024-06-06 15:19:36 +02:00
Kiril Videlov	cdd596f8bc	Merge pull request #4018 from gitbutlerapp/sign-commit-if-configured ... sign-commit-if-configured	2024-06-06 15:18:31 +02:00
Kiril Videlov	13f580dfbd	signing error toast now happens on more requests	2024-06-06 15:02:57 +02:00
Kiril Videlov	307e055f5c	update signing failure toast	2024-06-06 14:55:19 +02:00
Kiril Videlov	61dd48f915	on commit sign failure, set signing to false ... This way, subsequent attempts will succeed	2024-06-06 14:52:25 +02:00
Nico Domino	3c7fcadbcf	Merge branch 'master' into ndom91/hunk-viewer	2024-06-06 14:47:01 +02:00
Pavel Laptev	6ee2bee101	text case updated to the Sentance case (#4016) ... * text case updated to the Sentance case * text case update continue	2024-06-06 14:38:11 +02:00
Nico Domino	ea3ff78a4f	Merge branch 'master' into ndom91/hunk-viewer	2024-06-06 14:32:14 +02:00
ndom91	c07bbbbdbd	chore: HunkLines.svelte prettier	2024-06-06 14:31:52 +02:00
ndom91	dac1af917b	fix: cleanup dispatching contextMenu events	2024-06-06 14:11:46 +02:00
Nico Domino	5a6d99c1ab	Merge pull request #4009 from TheGB0077/fix-windows-open-vscode	2024-06-06 13:58:34 +02:00
Nico Domino	e0e813399a	Merge branch 'master' into fix-windows-open-vscode	2024-06-06 13:56:57 +02:00
ndom91	e062573c9f	fix: rm need for clsx	2024-06-06 13:56:38 +02:00
Mattias Granlund	3a24886013	Fix a couple of bugs in commit lines component ... - rebased upstream without shadowed commits - removed small 1px gap near the base - base dashed upstream line	2024-06-06 13:46:41 +02:00
ndom91	8f3a7873d5	fix: cleanup loading of HunkViewer/HunkSection	2024-06-06 13:37:23 +02:00
ndom91	b123f12b28	Merge branch 'master' into ndom91/hunk-viewer	2024-06-06 10:29:40 +02:00
Nico Domino	e00e54af7f	Merge pull request #4014 from gitbutlerapp/ndom91/enable-localdev-chrome	2024-06-06 10:28:23 +02:00
Nico Domino	6271fe5560	Merge branch 'master' into ndom91/modal-cleanup	2024-06-06 10:26:15 +02:00
ndom91	a9e3c22258	fix: update e2e test	2024-06-06 10:25:26 +02:00
ndom91	0b545a152a	fix: enable frontend without tauri	2024-06-06 10:16:22 +02:00
Kiril Videlov	f289ed7b6e	Merge pull request #4012 from gitbutlerapp/update-pnpm-lock-file-and-dependencieds ... remove proxy core::Oid	2024-06-06 09:39:19 +02:00
Sebastian Thiel	d7c8586159	fix serde and some find-replace errors ... The first problem was that serde needed to see an extra annotation for deserialzation of Options to work - maybe not the most optimal, but it works. The second and bigger issue was a find-replace error where `branch.tree` was replaced with `branch.head`.	2024-06-06 09:24:53 +02:00
Kiril Videlov	4d2798a1fd	remove unused oid file	2024-06-06 00:45:41 +02:00
Kiril Videlov	0e694c7823	use serde with	2024-06-06 00:43:44 +02:00
Pavel Laptev	2feb18b29c	Add the section card disclaimer as a component (#4013) ... * Add the section card disclaimer as a component * foramtting fix	2024-06-06 00:12:46 +02:00
Kiril Videlov	9c56a5f040	remove proxy core::Oid	2024-06-05 22:56:03 +02:00
Caleb Owens	68a2293ae6	Merge pull request #4011 from gitbutlerapp/reimplement-hunk-locking-code-1 ... Filter out unapplied branches	2024-06-05 22:34:36 +02:00
Caleb Owens	67aad4e597	Filter out unapplied branches ... We don't have any unstaged changes for unapplied branches, so there is nothing there to lock.	2024-06-05 22:21:50 +02:00
ndom91	d471ab3e09	Merge branch 'ndom91/modal-cleanup' of github.com:gitbutlerapp/gitbutler into ndom91/modal-cleanup	2024-06-05 18:09:34 +02:00
ndom91	039e2eaedb	fix: simplify Modal rendering	2024-06-05 18:09:34 +02:00
ndom91	3f9fed6ed2	fix: rm svelte-outclick	2024-06-05 18:09:33 +02:00
ndom91	7eef0bde4e	fix: simplify Modal rendering	2024-06-05 18:09:20 +02:00
ndom91	6c206a823f	fix: rm svelte-outclick	2024-06-05 18:09:20 +02:00
ndom91	026bfb783a	fix: use hunksection instead of individual lines	2024-06-05 17:48:15 +02:00
Caleb Owens	8aebcb4164	Merge pull request #4008 from gitbutlerapp/reimplement-hunk-locking-code-1 ... reimplement-hunk-locking-code	2024-06-05 17:44:14 +02:00
TheGB0077	0abe2c2c9f	fix: absolute path joins with normalized vscodepath for Windows campatibility	2024-06-05 12:35:59 -03:00
Caleb Owens	d61879c2a1	Rust... just... please.... 😢	2024-06-05 17:31:37 +02:00
Caleb Owens	5c5bda651a	Remove some logs	2024-06-05 17:23:41 +02:00
Caleb Owens	ed3294a692	Make clippy a happy clippy	2024-06-05 17:23:11 +02:00
Caleb Owens	31b240265b	Undo all extra refactoring	2024-06-05 17:22:22 +02:00
Caleb Owens	9d93bd8d9d	Defactor workdir	2024-06-05 17:19:26 +02:00
Caleb Owens	c3e9a22454	Put new implementation behind a feature flag	2024-06-05 17:18:12 +02:00
Caleb Owens	d9822be161	Reimplement compute_locks	2024-06-05 17:17:36 +02:00
Scott Chacon	3358e0ebf3	Merge pull request #4002 from gitbutlerapp/commit-signing-settings ... Commit Signing Settings	2024-06-05 15:23:41 +02:00
Kiril Videlov	fc77db72f3	fix import order bullshit	2024-06-05 15:11:28 +02:00
Kiril Videlov	f915304e34	Merged origin/master into commit-signing-settings	2024-06-05 15:10:06 +02:00