406 Commits

Author	SHA1	Message	Date
Kiril Videlov	3117769556	chore: add draggable region to window and update class order for offline status indicator	2023-11-28 15:04:58 +01:00
Kiril Videlov	c077bd965a	chore: update file rendering logic and transition animation in Svelte component	2023-11-28 14:30:17 +01:00
PavelLaptev	83ba2188a4	merged upstream	2023-11-28 14:11:57 +01:00
PavelLaptev	7e44ea0df9	Fix	2023-11-28 14:11:46 +01:00
Kiril Videlov	9e37883aaa	fix: update fetch order to first sync to cloud and then fetch from target	2023-11-28 13:56:56 +01:00
Kiril Videlov	3be483085a	refactor: add readonly prop to BranchHeader component	2023-11-28 13:54:00 +01:00
PavelLaptev	a4f0f92e10	merged upstream	2023-11-28 13:42:18 +01:00
PavelLaptev	e31cee245a	Css fixes	2023-11-28 13:42:03 +01:00
Kiril Videlov	4e466572c1	chore: update branch display layout and add tooltip for merge conflict information	2023-11-28 12:59:15 +01:00
Mattias Granlund	14d2e43294	Make file tree items selectable	2023-11-28 10:51:55 +00:00
Mattias Granlund	5240596ab0	🔨 chore: fix conditional statement for file lock tooltip in header component	2023-11-28 10:44:07 +00:00
Mattias Granlund	160c860425	Add modified lines and file status to file card	2023-11-28 09:58:24 +00:00
Mattias Granlund	5ba99206b9	Add loading status tooltip with spinner icon	2023-11-28 09:58:04 +00:00
Mattias Granlund	a54ed979f3	Remove concept of sessions from front end	2023-11-28 10:09:22 +01:00
PavelLaptev	666da83180	segment control css update	2023-11-28 01:40:45 +01:00
Mattias Granlund	48db234f2a	Improve behaviour of file selection	2023-11-28 00:13:08 +00:00
Mattias Granlund	174e295f3a	Improve no changes branch state	2023-11-28 00:13:08 +00:00
PavelLaptev	2d51fdcf1d	css fixes	2023-11-28 00:55:23 +01:00
Pavel Laptev	352a626817	Merge branch 'master' into css-changes	2023-11-28 00:50:06 +01:00
PavelLaptev	0ebac9075d	css fixes	2023-11-28 00:45:20 +01:00
Mattias Granlund	fb32a06d31	Make file card resizable	2023-11-27 22:39:41 +00:00
Mattias Granlund	ab29fd4e84	Add tags for file card	2023-11-27 23:08:59 +01:00
Mattias Granlund	42883198d0	Improve file selection in branch card	2023-11-27 22:28:43 +01:00
Mattias Granlund	344c24b702	Improve a bunch of stuff	2023-11-27 22:15:26 +01:00
Mattias Granlund	9e61bc05b0	Show file diff next to branch lane	2023-11-27 21:42:01 +01:00
Mattias Granlund	f2827b8978	fix: update dropdown component to include wrapper div for proper styling and positioning	2023-11-27 18:53:08 +00:00
Mattias Granlund	9471e8567a	Move branch lane to branch card	2023-11-27 18:38:33 +00:00
Mattias Granlund	ca106bc3e4	Update navigation bar and selected states	2023-11-27 17:23:51 +00:00
Kiril Videlov	bb1928de1b	fix lint issue	2023-11-27 18:18:44 +01:00
Kiril Videlov	fac45a2d6b	chore: update styling and conditional rendering in branch component	2023-11-27 18:18:44 +01:00
PavelLaptev	61b09582f1	merged upstream	2023-11-27 18:02:01 +01:00
Mattias Granlund	5d3f2e7084	chore: update styling of input field to improve visibility and add placeholder color	2023-11-27 16:59:13 +00:00
Mattias Granlund	88526d237a	Fix commit issue ... - selecting what to commit is currently unavailable	2023-11-27 16:53:25 +00:00
PavelLaptev	22577c6d20	Update tokens	2023-11-27 17:47:39 +01:00
Mattias Granlund	efa80954f6	Refactor the commit box and dropdown button	2023-11-27 16:45:35 +00:00
Kiril Videlov	d1b73fe9cf	chore: remove unused 'baseCurrent' property from Branch class and update its usage in applyBranch function	2023-11-27 14:28:43 +01:00
Kiril Videlov	927bc6c5c1	feat: rename activeBranches$ to stashedBranches$ in VirtualBranchService and update references in the component	2023-11-27 14:21:53 +01:00
Kiril Videlov	15e2c0eb2d	chore: update branch conflict handling and apply button behavior	2023-11-27 14:07:17 +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
Mattias Granlund	0c5bac544d	Continue restyling branches	2023-11-27 00:56:53 +00:00
PavelLaptev	e7222250a1	input and textBox	2023-11-27 00:09:40 +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
PavelLaptev	9473d4b0fd	fixes	2023-11-26 13:34:22 +01:00