Commit ce96885
merge: integrate main into begin-backlog-task-271
Resolve conflicts from diverged branches:
- api/index.js: include both audio/lyrics (main) and stats (PR) exports
- db/schema.rs: keep play_history migration (PR) and deduplicated_tracks/file_ctime_ns migrations (main)
- lib.rs: register both stats commands (PR) and network cache commands (main)
- Cargo.lock: include both image (PR) and libc (main) dependencies
- Update test_create_all_tables count: 13 tables (play_history in create_tables, deduplicated_tracks via migration only)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>116 files changed
Lines changed: 89886 additions & 560 deletions
File tree
- .claude/skills/repomix-reference-mt
- references
- .github
- actions/setup-tauri-build
- workflows
- .serena
- .superset
- .vscode
- app/frontend
- __tests__
- js
- api
- components
- stores
- tests
- views
- backlog
- completed
- tasks
- crates/mt-tauri
- capabilities
- gen/schemas
- src
- audio
- cache
- commands
- db
- library
- scanner
- docs
- scripts
- taskfiles
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
0 commit comments