5889 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kiril Videlov	8e0a28ef88	Merge pull request #3306 from gitbutlerapp/update-virtual-branch-context-migration ... feat: Migrate use_diff_context to true if no active virtual branches	2024-03-24 17:37:47 +01:00
Kiril Videlov	1b54b7efdb	feat: Migrate use_diff_context to true if no active virtual branches ... Migrate to use diff context for any projects that have stale unapplied branches. This will facilitate removing the old code for supporting zero context hunks	2024-03-24 17:28:17 +01:00
Kiril Videlov	a328ad4d7d	Merge pull request #3305 from gitbutlerapp/add-state-dir-for-project ... feat: namespace virtual_branches.toml under .git/gitbutler	2024-03-24 17:16:59 +01:00
Kiril Videlov	9d7e847f82	feat: namespace virtual_branches.toml under .git/gitbutler ... The virtual_branches.toml was never read	2024-03-24 17:06:14 +01:00
Kiril Videlov	7e8eab4726	Merge pull request #3304 from gitbutlerapp/expand-lane ... feat: Update "Collapse lane" help text to "Expand lane"	2024-03-24 16:24:47 +01:00
Eyal Cherevatsky	8fbbe38432	fix: improve Segment button selected state style (#3301) ... * fix: improve `Segment` button selected state style * Update Segment.svelte - styles updated. align with the `IconButton` styles - unused CSS removed - accessibility navigation fixed. Instead of arrows — use tabs * Update Segment.svelte --------- Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>	2024-03-24 16:16:33 +01:00
Kiril Videlov	b929d180ee	feat: Update "Collapse lane" help text to "Expand lane"	2024-03-24 16:08:24 +01:00
Kiril Videlov	17c9620395	Merge pull request #3294 from gitbutlerapp/fix-unneeded-config-set-calls ... refactor(AISettings): Remove unneeded config set calls	2024-03-24 15:56:22 +01:00
Kiril Videlov	37a9e6d916	Merge pull request #3299 from gitbutlerapp/update-repository-dependencies ... fix: remove unused import	2024-03-24 12:21:11 +01:00
Kiril Videlov	f61679c082	fix: remove unused import	2024-03-24 12:10:39 +01:00
Mattias Granlund	f2a54b7f9f	Fix bug occasionally preventing hunks from being moved ... - hunks equal if hash is same, regardless of line numbers - send hash from front end when updating ownership - use updated line numbers after hunk intersection match	2024-03-24 01:46:17 +01:00
Pavel Laptev	debea8f343	styles: ai options page updated (#3296) ... + small fixes for related components + Settings text case fixed to capitalize only first letter	2024-03-23 23:26:03 +01:00
Kiril Videlov	02dcc3f1e7	Merge pull request #3295 from gitbutlerapp/handle-git-push-update-refs-error ... feat(virtual_branches): handle push error with user-friendly message	2024-03-23 21:50:07 +01:00
Kiril Videlov	d26cddf445	feat(virtual_branches): handle push error with user-friendly message	2024-03-23 21:40:03 +01:00
Caleb Owens	af9b104059	refactor: Remove unneeded config set calls	2024-03-23 20:14:08 +00:00
Pavel Laptev	2575bbfbd5	Styles updates (#3292) ... * hover states for outline buttons + tokens upd * design tokens update * disable showing project name in settings + Titles case update * added settings section component	2024-03-23 17:25:17 +01:00
Mattias Granlund	c78923843c	Fix incorrect tooltip position when zoomed in (cmd+-) ... Units should be in pixels because they are calculated according to actual layout.	2024-03-23 15:02:36 +01:00
Mattias Granlund	b75d03b267	Add retries to loading pull request data ... - github can respond with 422 right after pushing - make three attempts to load data	2024-03-23 15:02:08 +01:00
Kiril Videlov	7c41b56222	Merge pull request #3289 from gitbutlerapp/fetch-with-prune ... feat: Add --prune option to git fetch command	2024-03-23 10:33:40 +01:00
Kiril Videlov	32c57edaea	feat: Add --prune option to git fetch command	2024-03-23 10:24:04 +01:00
Kiril Videlov	a29c46de87	Merge pull request #3287 from gitbutlerapp/add-trace-propagation-targets-1 ... feat: Add tests for `normalize_branch_name` function	2024-03-22 13:36:34 +01:00
Kiril Videlov	8075f9e04f	feat: Add tests for normalize_branch_name function	2024-03-22 13:26:44 +01:00
Kiril Videlov	47f1ea06a1	Merge pull request #3284 from FaithfulDev/master ... Allow "#" in branch names #3280	2024-03-22 11:48:29 +01:00
Caleb Owens	61d6c678fc	Merge pull request #3270 from gitbutlerapp/refactor-sync-button-to-use-tag ... refactor: replace custom sync button with Tag component	2024-03-22 11:32:28 +01:00
Caleb Owens	64e676ae79	Merge pull request #3254 from gitbutlerapp/consolidate-diff-formatting ... Pass in hunk array rather than diff	2024-03-22 11:19:01 +01:00
Caleb Owens	bffcdbdae4	Pass in hunk array rather than diff	2024-03-22 11:09:14 +01:00
Scott Chacon	5a8b3969de	refactor: Update function parameter to use sortedFiles instead of files	2024-03-22 11:08:10 +01:00
Marcel R	df4578a459	Merge branch 'master' into master	2024-03-22 10:51:47 +01:00
Rütjerodt, Marcel	7e550dd0ca	Resolves #3280 - allow # in branch names	2024-03-22 10:46:56 +01:00
Kiril Videlov	a4a2a4fc67	Merge pull request #3283 from gitbutlerapp/add-trace-propagation-targets ... feat(sentry): add trace propagation targets	2024-03-22 10:43:38 +01:00
Kiril Videlov	610eab9424	feat(sentry): add trace propagation targets	2024-03-22 10:42:16 +01:00
Josh Junon	43df57c1ec	Merge pull request #3279 from gitbutlerapp/fix-windows-images ... fix profile pictures on windows	2024-03-22 02:02:18 +01:00
Josh Junon	fdbf5a0184	fix profile pictures on windows	2024-03-22 01:51:58 +01:00
Josh Junon	1fe14145bc	Merge pull request #3278 from gitbutlerapp/no-console-running-git ... don't show a console when running git.exe on windows	2024-03-22 01:49:33 +01:00
Josh Junon	3e41872591	don't show a console when running git.exe on windows	2024-03-22 01:34:24 +01:00
Mattias Granlund	29a9e18b66	Use context API for sharing User instance ... More refactoring, this time removing the need for prop drilling the user.	2024-03-22 01:01:22 +01:00
Josh Junon	b3f45b6157	Merge pull request #3277 from gitbutlerapp/proper-bundle-path ... fix release script bundle search path on windows	2024-03-22 00:59:56 +01:00
Josh Junon	e9c7a2cf8c	fix release script bundle search path on windows	2024-03-22 00:59:25 +01:00
Josh Junon	fead12e26f	Merge pull request #3275 from gitbutlerapp/first-perl-only ... only set the first perl that we find instead of all that are on PATH	2024-03-22 00:31:01 +01:00
Josh Junon	f803dd4de3	only set the first perl that we find instead of all that are on PATH	2024-03-22 00:30:18 +01:00
Josh Junon	cc5dcc4b2e	Merge pull request #3274 from gitbutlerapp/set-perl-from-windows ... ser PERL env from powershell instead of bash	2024-03-22 00:26:10 +01:00
Josh Junon	5a04dac58f	ser PERL env from powershell instead of bash	2024-03-22 00:25:19 +01:00
Josh Junon	0fe4104e46	Merge pull request #3273 from gitbutlerapp/set-perl-envs ... set PERL env for openssl build	2024-03-22 00:19:26 +01:00
Josh Junon	1e0e650075	set PERL env for openssl build	2024-03-22 00:18:44 +01:00
Josh Junon	25ba29408c	Merge pull request #3272 from gitbutlerapp/dont-checkout-twice ... remove extra checkout step from windows publish action	2024-03-21 23:39:54 +01:00
Josh Junon	4ed54ce9d6	remove extra checkout step from windows publish action	2024-03-21 23:39:20 +01:00
Josh Junon	e93cac8298	Merge pull request #3271 from gitbutlerapp/fix-perl-on-windows-builds ... replace Perl installation with strawberry on windows	2024-03-21 23:35:56 +01:00
Josh Junon	9070873212	replace Perl installation with strawberry on windows	2024-03-21 23:33:57 +01:00
Caleb Owens	39864eeb5a	refactor: replace custom sync button with Tag component ... The custom sync button is replaced with the Tag component. The Tag component is updated to support a loading state and help text. The busy label is moved inside the Tag component. The custom sync button styles are removed.	2024-03-21 23:30:24 +01:00
Mattias Granlund	1bd2dfda2e	Fix save project description	2024-03-21 23:19:10 +01:00