git-sync/profilarr

mirror of https://github.com/Dictionarry-Hub/profilarr.git synced 2026-01-22 10:51:02 +01:00

Files

History

santiagosayshey df16d7c52f fix: merge/delete conflicts (#151 )

feat: enhance merge conflict handling with improved status messages and conditional rendering
feat: improved modify / delete conflict handling
- fix ours/theirs messages for deleted files
- fix handling of choice moniker
- fix parsing of local/incoming name when deleted

2025-02-26 18:11:35 +10:30

..

feat: Add clone button with SVG icon to FormatCard component

2025-02-05 16:09:58 +10:30

fix: merge/delete conflicts (#151 )

2025-02-26 18:11:35 +10:30

.gitignore

feat(backend): Major overhaul of backend structure, git integration, and settings management

2025-02-05 16:09:58 +10:30

Dockerfile

chore(dev): Improve Vite hot reloading in Docker environment

2025-02-05 16:09:58 +10:30

eslint.config.js

Initial Commit

2025-02-05 16:09:58 +10:30

index.html

feature: merge conflict detection and resolution (#6 )

2025-02-05 16:09:58 +10:30

package-lock.json

chore: add react-markdown dependency to package.json

2025-02-05 16:09:59 +10:30

package.json

chore: add react-markdown dependency to package.json

2025-02-05 16:09:59 +10:30

postcss.config.js

Initial Commit

2025-02-05 16:09:58 +10:30

README.md

Initial Commit

2025-02-05 16:09:58 +10:30

tailwind.config.js

style: enhance ProfileGeneralTab and MarkdownEditor with improved UI components and styles

2025-02-05 16:09:59 +10:30

vite.config.js

refactor: remove URL prefixes from blueprints in the application

2025-02-05 16:09:59 +10:30

README.md

React + Vite

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:

@vitejs/plugin-react uses Babel for Fast Refresh
@vitejs/plugin-react-swc uses SWC for Fast Refresh