7537 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nico Domino	e6efc15f4b	Merge branch 'master' into ndom91/rm-editorconfig	2024-06-07 14:06:53 +02:00
Pavel Laptev	5301181c49	fix button style (#4032)	2024-06-07 12:37:59 +02:00
Pavel Laptev	e735959e69	Button refactoring (#4031) ... new props `outline`, `dashed` and `solidBackground`	2024-06-07 12:29:29 +02:00
ndom91	b3bebca3a2	chore: rm .editorconfig	2024-06-07 11:29:27 +02:00
Nico Domino	d03f1bf6c2	Merge branch 'master' into ndom91/hunk-viewer	2024-06-07 09:38:51 +02:00
ndom91	15f5bdefac	fix: limit hunk viewer to 2500 lines	2024-06-07 09:37:53 +02:00
Kiril Videlov	db6558b2dd	Merge pull request #4028 from gitbutlerapp/revert-4010-ndom91/modal-cleanup ... Revert "fix: simplify Modal logic"	2024-06-06 22:54:41 +02:00
Kiril Videlov	61226358b4	Revert "fix: simplify Modal logic"	2024-06-06 22:52:26 +02:00
Kiril Videlov	1013b3891c	Merge pull request #4026 from gitbutlerapp/change-use-new-locking-to-true ... feat(project): enable new locking by default	2024-06-06 19:19:35 +02:00
Mattias Granlund	81feed64d7	More fixes for commit lines	2024-06-06 18:39:49 +02:00
Kiril Videlov	1e253b8a59	feat(project): enable new locking by default	2024-06-06 18:08:10 +02:00
Nico Domino	ce5dced72f	Merge branch 'master' into ndom91/hunk-viewer	2024-06-06 17:32:45 +02:00
ndom91	5595ac1398	fix: cleanup extra squirrely brace	2024-06-06 17:32:19 +02:00
Nico Domino	b06f70054a	Merge pull request #4010 from gitbutlerapp/ndom91/modal-cleanup	2024-06-06 17:22:50 +02:00
ndom91	66f80babee	fix: pnpm-lock	2024-06-06 17:10:05 +02:00
Nico Domino	d5fe2a88d9	Merge branch 'master' into ndom91/modal-cleanup	2024-06-06 17:08:17 +02:00
Nico Domino	da3b27ca83	Merge pull request #4023 from gitbutlerapp/ndom91/add-corepack	2024-06-06 17:05:12 +02:00
Nico Domino	fde990294c	Merge branch 'master' into ndom91/modal-cleanup	2024-06-06 17:01:32 +02:00
Kiril Videlov	85065d9c3a	Merge pull request #4024 from gitbutlerapp/clean-up-core-git-Error ... remove unused variants of core::Error	2024-06-06 17:01:16 +02:00
ndom91	ea70514b98	fix: avoid handling if no modalForm	2024-06-06 16:59:59 +02:00
Kiril Videlov	5922ed7459	remove error type core::Error	2024-06-06 16:49:33 +02:00
Nico Domino	268f8ab521	Merge branch 'master' into ndom91/add-corepack	2024-06-06 16:47:09 +02:00
Kiril Videlov	113d238753	cleanup config.rs unused functions	2024-06-06 16:41:19 +02:00
Kiril Videlov	462a98e5d1	remove unused variants of core::Error	2024-06-06 16:38:02 +02:00
ndom91	228fc6e462	fix: use the same version of pnpm across everything	2024-06-06 16:14:57 +02:00
Kiril Videlov	3f32e659e5	Merge pull request #4022 from gitbutlerapp/add-log-for-sign-commits-setting ... fix a bug where the "sign commits" toggle did not work	2024-06-06 16:12:19 +02:00
ndom91	a0fb6060f0	feat: add packageManager package.json option and bump lock file to v9	2024-06-06 16:11:50 +02:00
Kiril Videlov	59abae2a04	fix a bug where the "sign commits" toggle did not work	2024-06-06 16:09:33 +02:00
Caleb Owens	d2d02eee7e	Merge pull request #4021 from gitbutlerapp/update-node-version-20.14 ... Introduce a strict node version	2024-06-06 16:06:04 +02:00
Caleb Owens	f3464a0136	Introduce a strict node version	2024-06-06 16:03:13 +02:00
Caleb Owens	452ae8fe7d	Merge pull request #4020 from gitbutlerapp/update-vscode-settings ... Add in some vscode settings	2024-06-06 15:45:52 +02:00
Caleb Owens	50b5b88593	Add in some vscode settings	2024-06-06 15:43:21 +02:00
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