4 Commits

Author	SHA1	Message	Date
Sam Chau	ca84a1c95b	feature: merge conflict detection and resolution (#6) ... - pulls now correctly identify merge conflicts and enter a merge state - user resolves each file individually - commit resolve merge state - allows users to keep custom changes and pull in updates - improve commit message component - seperated commit / add functionality	2025-02-05 16:09:58 +10:30
santiagosayshey	1cee08bdbd	feat(profile-modal): Improvements - Show quality profile type in status page - Increase modal size, split things into columns - Filter formats - Bigger description size	2025-02-05 16:09:58 +10:30
santiagosayshey	d9601eac0f	feat(Modal): Modal, profile improvements - Adjust title based on state - Score formats based on tags	2025-02-05 16:09:58 +10:30
santiagosayshey	330c162b0e	refactor(nav): Implement React Router for navigation ... - Replace button-based navigation with React Router Links in Navbar - Add BrowserRouter, Routes, and Route components in App.js - Update Navbar to determine active tab based on current route - Remove setActiveTab prop from Navbar component - Update RegexPage, FormatPage, and SettingsPage imports in App.js - Adjust Navbar propTypes to remove activeTab and setActiveTab	2025-02-05 16:09:58 +10:30