3680 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kiril Videlov	15e2c0eb2d	chore: update branch conflict handling and apply button behavior	2023-11-27 14:07:17 +01:00
Nikita Galaiko	4c2e1b8ab3	Merge pull request #1733 from gitbutlerapp/update-branch-state-and-write ... Update branch state and write	2023-11-27 12:55:44 +01:00
Mattias Granlund	5d3381cae9	Fix project selector	2023-11-27 11:45:29 +00:00
Mattias Granlund	da3516c31a	Sync to cloud when clicking that button in the sidebar	2023-11-27 11:24:51 +00:00
Scott Chacon	dd8b7fd1b0	Merge pull request #1734 from gitbutlerapp/add-link-to-project-page ... Add link to project page	2023-11-27 11:47:45 +01:00
Mattias Granlund	4a752ed086	Restyle button component and update all instances	2023-11-27 10:46:03 +00:00
Scott Chacon	1a1d7228ac	maybe formatted	2023-11-27 11:30:56 +01:00
Scott Chacon	6b950b3b16	add link to project page	2023-11-27 10:51:25 +01:00
Nikita Galaiko	f41631eb50	instead of flushing vbranches before flushing session, do it all the time	2023-11-27 10:20:16 +01:00
Mattias Granlund	0c5bac544d	Continue restyling branches	2023-11-27 00:56:53 +00:00
Pavel Laptev	762ea00797	Merge pull request #1730 from gitbutlerapp/a-few-css-fixes ... input and textBox css	2023-11-27 00:14:26 +01:00
PavelLaptev	696dc62cad	update	2023-11-27 00:12:26 +01:00
PavelLaptev	e7222250a1	input and textBox	2023-11-27 00:09:40 +01:00
Pavel Laptev	23275cc395	Merge pull request #1729 from gitbutlerapp/new-icons ... new icons	2023-11-26 21:16:43 +01:00
PavelLaptev	c99a5f28d7	new icons	2023-11-26 21:14:45 +01:00
Mattias Granlund	dac321f3a0	Create components out of BranchLane stuff	2023-11-26 17:54:52 +00:00
Mattias Granlund	44a87b4001	Update branch lane header	2023-11-26 13:22:31 +00:00
Pavel Laptev	e06ddac8a8	Merge pull request #1726 from gitbutlerapp/tokens-update ... fixes	2023-11-26 13:35:51 +01:00
PavelLaptev	9473d4b0fd	fixes	2023-11-26 13:34:22 +01:00
Mattias Granlund	69a69788fb	Create account link component and style it according to design	2023-11-26 11:54:15 +00:00
Mattias Granlund	032386e3cb	Fix casing inconsistency in css tokens	2023-11-26 11:52:32 +00:00
Mattias Granlund	b23e5c1178	style: update loading state and styling for merge button	2023-11-26 11:51:27 +00:00
Mattias Granlund	58e4869998	Fix focus related bug in segmented control	2023-11-26 11:05:08 +00:00
Pavel Laptev	1ff5ef87e9	Merge pull request #1720 from gitbutlerapp/tokens-icons-update ... Tokens and icons update	2023-11-26 03:31:17 +01:00
PavelLaptev	d2f8610fb2	new icons	2023-11-26 03:29:22 +01:00
PavelLaptev	b198c64cab	tokens update	2023-11-26 03:25:40 +01:00
Mattias Granlund	01efef77e0	Make segment controls equal width	2023-11-25 13:44:17 +00:00
Mattias Granlund	370b8f589b	Update IconButton to reflect design	2023-11-25 13:41:39 +00:00
Mattias Granlund	cf3600a3f7	Auto close project selector	2023-11-25 12:24:43 +00:00
Mattias Granlund	d9f6249a55	Add branch filtering to sidebar	2023-11-25 12:23:14 +00:00
Pavel Laptev	5fe2ea0d0c	Merge pull request #1715 from gitbutlerapp/some-css-updates ... styles updates	2023-11-25 11:16:11 +01:00
PavelLaptev	3687cf2d40	- updated sidebar paddings. Changed 16 to 12 spacers	2023-11-25 02:27:48 +01:00
PavelLaptev	a547df9b76	dark theme update	2023-11-25 02:09:51 +01:00
PavelLaptev	d398fa3d66	added new color tokens for accent outlines	2023-11-25 01:57:10 +01:00
PavelLaptev	4f7b8d68c3	styles updates	2023-11-25 00:48:46 +01:00
Nikita Galaiko	b1686be9ca	Merge pull request #1712 from gitbutlerapp/refactor-refname-enum ... Refactor refname enum	2023-11-24 17:17:28 +01:00
Pavel Laptev	44cdec3321	Merge pull request #1711 from gitbutlerapp/virtual-branch ... new-icons	2023-11-24 17:15:11 +01:00
Nikita Galaiko	4373b4fe3b	chore: remove unused code related to Refname Tag and refactor Refname HEAD and STASH to Refname Other	2023-11-24 17:13:16 +01:00
PavelLaptev	aa39b2c336	new profile icon	2023-11-24 16:00:58 +01:00
PavelLaptev	1c79b0cc73	busy icon added	2023-11-24 15:06:26 +01:00
PavelLaptev	ec588fef56	new-icons	2023-11-24 15:00:24 +01:00
Mattias Granlund	a5371f9bb1	Improve app drag region	2023-11-24 12:59:19 +00:00
Mattias Granlund	94e2ce108a	Fix assignment bug in projects service	2023-11-24 12:51:14 +00:00
Nikita Galaiko	ccc7405aa7	Merge pull request #1706 from gitbutlerapp/refactor-menu-subscribe ... Refactor menu subscribe	2023-11-24 12:20:21 +01:00
Pavel Laptev	2fd5c9ba7a	Merge pull request #1701 from gitbutlerapp/css-fixes ... Css fixes	2023-11-24 12:19:18 +01:00
PavelLaptev	44a032f492	merged upstream	2023-11-24 12:16:26 +01:00
Nikita Galaiko	b5712d0b00	chore: refactor menu subscription and event handling in components	2023-11-24 12:15:42 +01:00
PavelLaptev	f3068781b8	code review fixes	2023-11-24 12:13:45 +01:00
Mattias Granlund	d477c26930	Fix issue with saving project settings	2023-11-24 09:19:38 +00:00
Nikita Galaiko	6f43d7623e	Merge pull request #1704 from gitbutlerapp/add-support-for-stash-ref ... Add support for stash ref	2023-11-24 10:09:21 +01:00