tolaria

Files

lucaronin c3722ba8ea feat: add sync conflict resolution — resolve merge conflicts in-app

- Add git_resolve_conflict and git_commit_conflict_resolution Rust commands
- Create useConflictResolver hook for per-file resolution state management
- Create ConflictResolverModal with keyboard shortcuts (K/T/O/Enter/Esc)
- Make StatusBar conflict chip clickable to open resolver modal
- Add 'Resolve Conflicts' command to command palette (conditional)
- Pause auto-pull while conflict resolver modal is open
- Tests: 5 new Rust tests, 10 new hook tests, 1 new auto-sync test

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

2026-03-03 02:45:42 +01:00

fix: property dropdowns adapt to narrow panel width

2026-02-27 16:58:10 +01:00

AiActionCard.test.tsx

feat: AI agent panel UI — 3-layer panel with action cards and WebSocket activity hook (#149 )

2026-02-28 21:30:47 +01:00

AiActionCard.tsx

feat: AI agent panel UI — 3-layer panel with action cards and WebSocket activity hook (#149 )

2026-02-28 21:30:47 +01:00

AIChatPanel.tsx

feat: replace Anthropic API with Claude CLI for AI chat and agent panels (#159 )

2026-03-01 19:49:58 +01:00

AiMessage.test.tsx

feat: AI agent panel UI — 3-layer panel with action cards and WebSocket activity hook (#149 )

2026-02-28 21:30:47 +01:00

AiMessage.tsx

feat: AI agent panel UI — 3-layer panel with action cards and WebSocket activity hook (#149 )

2026-02-28 21:30:47 +01:00

AiPanel.test.tsx

feat: contextual AI chat on open note (Cmd+I) (#169 )

2026-03-02 05:00:29 +01:00

AiPanel.tsx

feat: contextual AI chat on open note (Cmd+I) (#169 )

2026-03-02 05:00:29 +01:00

ArchivedNoteBanner.test.tsx

feat: show archived note indicator banner in editor (#183 )

2026-03-03 02:31:10 +01:00

ArchivedNoteBanner.tsx

feat: show archived note indicator banner in editor (#183 )

2026-03-03 02:31:10 +01:00

BreadcrumbBar.test.tsx

feat: raw editor mode — plain textarea with frontmatter + wikilink autocomplete

2026-03-02 18:44:47 +01:00

BreadcrumbBar.tsx

feat: raw editor mode — plain textarea with frontmatter + wikilink autocomplete

2026-03-02 18:44:47 +01:00

BulkActionBar.tsx

feat: add multi-select notes with bulk archive and trash actions (#125 )

2026-02-27 14:14:21 +00:00

CommandPalette.test.tsx

test: add command palette and fuzzy match tests

2026-02-24 23:43:58 +01:00

CommandPalette.tsx

test: add theme command registry tests and minor fixes

2026-03-02 23:06:12 +01:00

CommitDialog.test.tsx

test: add component tests — StatusBar, CommitDialog, DiffView, QuickOpenPalette, ResizeHandle, CreateNoteDialog, EditableValue, TypeCustomizePopover, DynamicPropertiesPanel, InspectorPanels

2026-02-22 12:02:44 +01:00

CommitDialog.tsx

fix: resolve React hooks/compiler ESLint errors

2026-02-22 14:06:51 +01:00

ConflictResolverModal.tsx

feat: add sync conflict resolution — resolve merge conflicts in-app

2026-03-03 02:45:42 +01:00

CreateNoteDialog.test.tsx

test: add component tests — StatusBar, CommitDialog, DiffView, QuickOpenPalette, ResizeHandle, CreateNoteDialog, EditableValue, TypeCustomizePopover, DynamicPropertiesPanel, InspectorPanels

2026-02-22 12:02:44 +01:00

CreateNoteDialog.tsx

fix: resolve React hooks/compiler ESLint errors

2026-02-22 14:06:51 +01:00

CreateTypeDialog.test.tsx

test: add tests for create type dialog and dynamic sidebar sections

2026-02-21 09:42:45 +01:00

CreateTypeDialog.tsx

fix: resolve React hooks/compiler ESLint errors

2026-02-22 14:06:51 +01:00

DiffView.test.tsx

test: add component tests — StatusBar, CommitDialog, DiffView, QuickOpenPalette, ResizeHandle, CreateNoteDialog, EditableValue, TypeCustomizePopover, DynamicPropertiesPanel, InspectorPanels

2026-02-22 12:02:44 +01:00

DiffView.tsx

refactor: reduce complexity in App, DiffView, Editor, InspectorPanels, NoteList

2026-02-22 10:48:13 +01:00

DynamicPropertiesPanel.test.tsx

feat: note templates per type (💡 Note templates per tipo) (#170 )

2026-03-02 08:37:06 +01:00

DynamicPropertiesPanel.tsx

style: remove letter-spacing from status/property labels in inspector

2026-03-02 21:29:16 +01:00

EditableValue.test.tsx

fix: use Tauri opener plugin for URL property clicks

2026-02-25 00:02:09 +01:00

EditableValue.tsx

fix: tags X button appears on hover without expanding pill width

2026-02-28 10:50:34 +01:00

Editor.css

fix: editor background matches vault theme in dark mode

2026-03-02 19:33:57 +01:00

Editor.test.tsx

feat: trashed notes read-only with visible banner in editor (#181 )

2026-03-03 01:37:25 +01:00

Editor.tsx

feat: add command palette toggles for all BreadcrumbBar panels (#184 )

2026-03-03 02:00:48 +01:00

EditorContent.tsx

feat: show archived note indicator banner in editor (#183 )

2026-03-03 02:31:10 +01:00

EditorRightPanel.tsx

feat: contextual AI chat on open note (Cmd+I) (#169 )

2026-03-02 05:00:29 +01:00

editorSchema.tsx

fix: resolve wikilink paths and show entry title in Getting Started vault (#153 )

2026-02-28 22:03:38 +01:00

EditorTheme.css

Revert "feat: block numbers + active block highlight (onSelectionChange)"

2026-02-16 14:50:29 +01:00

GitHubDeviceFlow.tsx

fix: inline GitHub OAuth device flow in Connect GitHub modal (#136 )

2026-02-28 14:02:38 +01:00

GitHubVaultModal.test.tsx

fix: inline GitHub OAuth device flow in Connect GitHub modal (#136 )

2026-02-28 14:02:38 +01:00

GitHubVaultModal.tsx

fix: inline GitHub OAuth device flow in Connect GitHub modal (#136 )

2026-02-28 14:02:38 +01:00

Inspector.test.tsx

feat: note templates per type (💡 Note templates per tipo) (#170 )

2026-03-02 08:37:06 +01:00

Inspector.tsx

feat: enhance backlinks panel with collapsible section and paragraph context (#167 )

2026-03-02 02:01:24 +01:00

InspectorPanels.test.tsx

feat: note templates per type (💡 Note templates per tipo) (#170 )

2026-03-02 08:37:06 +01:00

InspectorPanels.tsx

feat: enhance backlinks panel with collapsible section and paragraph context (#167 )

2026-03-02 02:01:24 +01:00

NoteAutocomplete.test.tsx

feat: note subtitle — show metadata (date + word count) (#94 )

2026-02-26 19:50:29 +00:00

NoteAutocomplete.tsx

fix: show type icon and label for "Note" type in search and autocomplete

2026-02-28 20:08:55 +01:00

NoteItem.tsx

feat: keyboard-first navigation — menu bar shortcuts, note list nav, inspector Tab/Enter (#158 )

2026-03-01 19:32:15 +01:00

NoteList.test.tsx

feat: sort picker shows custom frontmatter properties (#185 )

2026-03-03 02:31:18 +01:00

NoteList.tsx

feat: sort picker shows custom frontmatter properties (#185 )

2026-03-03 02:31:18 +01:00

NoteSearchList.test.tsx

feat: use light type color as background for note type labels (#93 )

2026-02-26 17:43:29 +00:00

NoteSearchList.tsx

feat: use light type color as background for note type labels (#93 )

2026-02-26 17:43:29 +00:00

QuickOpenPalette.test.tsx

feat: note templates per type (💡 Note templates per tipo) (#170 )

2026-03-02 08:37:06 +01:00

QuickOpenPalette.tsx

feat: unify note search into shared NoteSearchList + useNoteSearch

2026-02-25 19:01:22 +01:00

RawEditorView.test.tsx

feat: sort picker shows custom frontmatter properties (#185 )

2026-03-03 02:31:18 +01:00

RawEditorView.tsx

feat: raw editor mode — plain textarea with frontmatter + wikilink autocomplete

2026-03-02 18:44:47 +01:00

ResizeHandle.test.tsx

test: add component tests — StatusBar, CommitDialog, DiffView, QuickOpenPalette, ResizeHandle, CreateNoteDialog, EditableValue, TypeCustomizePopover, DynamicPropertiesPanel, InspectorPanels

2026-02-22 12:02:44 +01:00

ResizeHandle.tsx

feat: UI polish — typography, layout, and sidebar fixes

2026-02-18 10:52:01 +01:00

SearchPanel.test.tsx

feat: sort picker shows custom frontmatter properties (#185 )

2026-03-03 02:31:18 +01:00

SearchPanel.tsx

test: add theme command registry tests and minor fixes

2026-03-02 23:06:12 +01:00

SettingsPanel.test.tsx

feat: dark theme applies to editor content area

2026-03-02 12:35:22 +01:00

SettingsPanel.tsx

feat: replace Anthropic API with Claude CLI for AI chat and agent panels (#159 )

2026-03-01 19:49:58 +01:00

Sidebar.test.tsx

feat: sort picker shows custom frontmatter properties (#185 )

2026-03-03 02:31:18 +01:00

Sidebar.tsx

fix: add aria-label to InlineRenameInput for test accessibility

2026-03-02 23:20:49 +01:00

SidebarParts.tsx

fix: add aria-label to InlineRenameInput for test accessibility

2026-03-02 23:20:49 +01:00

SingleEditorView.tsx

feat: trashed notes read-only with visible banner in editor (#181 )

2026-03-03 01:37:25 +01:00

SortDropdown.tsx

feat: sort picker shows custom frontmatter properties (#185 )

2026-03-03 02:31:18 +01:00

StatusBar.test.tsx

feat: auto-index vault on open + qmd auto-install + status bar progress

2026-03-03 02:37:49 +01:00

StatusBar.tsx

feat: add sync conflict resolution — resolve merge conflicts in-app

2026-03-03 02:45:42 +01:00

StatusDropdown.test.tsx

fix: apply 3 pending fixes directly to main

2026-02-27 15:35:19 +01:00

StatusDropdown.tsx

style: remove letter-spacing from status/property labels in inspector

2026-03-02 21:29:16 +01:00

TabBar.test.tsx

feat: responsive tab width — shrink tabs to fit window

2026-03-02 14:45:39 +01:00

TabBar.tsx

feat: responsive tab width — shrink tabs to fit window

2026-03-02 14:45:39 +01:00

TagsDropdown.test.tsx

feat: add tags (multi-select) property type (#133 )

2026-02-28 12:34:01 +01:00

TagsDropdown.tsx

feat: add tags (multi-select) property type (#133 )

2026-02-28 12:34:01 +01:00

Toast.tsx

feat: migrate to shadcn/ui

2026-02-16 16:56:44 +01:00

TrashedNoteBanner.test.tsx

feat: trashed notes read-only with visible banner in editor (#181 )

2026-03-03 01:37:25 +01:00

TrashedNoteBanner.tsx

feat: trashed notes read-only with visible banner in editor (#181 )

2026-03-03 01:37:25 +01:00

TypeCustomizePopover.test.tsx

feat: note templates per type (💡 Note templates per tipo) (#170 )

2026-03-02 08:37:06 +01:00

TypeCustomizePopover.tsx

feat: note templates per type (💡 Note templates per tipo) (#170 )

2026-03-02 08:37:06 +01:00

UpdateBanner.test.tsx

feat: auto-build, GitHub Release, and in-app updater (#14 )

2026-02-23 10:50:36 +00:00

UpdateBanner.tsx

fix: move update banner to bottom, white text on blue background

2026-03-01 17:01:22 +01:00

WelcomeScreen.test.tsx

feat: integrate welcome screen with tests and fix App tests

2026-02-28 12:58:21 +01:00

WelcomeScreen.tsx

feat: integrate welcome screen with tests and fix App tests

2026-02-28 12:58:21 +01:00

WikilinkSuggestionMenu.css

feat: unify note search into shared NoteSearchList + useNoteSearch

2026-02-25 19:01:22 +01:00

WikilinkSuggestionMenu.tsx

feat: use light type color as background for note type labels (#93 )

2026-02-26 17:43:29 +00:00