mirror of
https://github.com/iflytek/skillhub.git
synced 2026-08-28 11:25:00 +00:00
Resolved 9 conflicts according to documented strategy: - .gitignore: kept both entries (docs/review/ + CLAUDE.md) - ClawHubCompatController.java: manual merge (use @AuthenticationPrincipal + platformRoles) - ClawHubCompatControllerTest.java: kept ours (HEAD security tests) - CliControllerTest.java: kept ours (HEAD platform roles tests) - ReviewPermissionChecker.java: kept ours (stricter permission model) - SkillPublishService.java: kept theirs (main SUPER_ADMIN bypass + events) - SkillPublishServiceTest.java: kept theirs (main complete test suite) - router.tsx: manual merge (HEAD's createLazyRouteComponent + main's privacy/terms) - markdown-renderer.tsx: kept ours (HEAD frontmatter stripping + styles) All A1-A9 security fixes preserved. No new logic introduced. |
||
|---|---|---|
| .. | ||
| docker-entrypoint.d | ||
| public | ||
| src | ||
| .dockerignore | ||
| .eslintrc.cjs | ||
| components.json | ||
| Dockerfile | ||
| index.html | ||
| LANDING_PAGE_REDESIGN.md | ||
| nginx.conf.template | ||
| package.json | ||
| pnpm-lock.yaml | ||
| postcss.config.js | ||
| PREVIEW.md | ||
| runtime-config.js.template | ||
| tailwind.config.ts | ||
| TODO.md | ||
| tsconfig.json | ||
| vite.config.ts | ||