Commit Graph
2884 Commits
Author SHA1 Message Date
Alexey Martemyanov 31644d1010 [2026-09-26] eagle: personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 18:55:15 +06:00
Alexey Martemyanov 82f27a69da [2026-09-26] eagle: personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 18:50:11 +06:00
Alexey Martemyanov 157877d82f [2026-09-26] eagle: personal/tech/music-tags-repair-truenas.md 2026-09-26 18:40:03 +06:00
Alexey Martemyanov baf0274cb0 [2026-09-26] eagle: personal/tech/music-tags-repair-truenas.md 2026-09-26 18:14:44 +06:00
Taiga 7997fa5408 [2026-09-26 12:05:56] syncthing-out: personal/tech/agents-bridge.md 2026-09-26 12:05:57 +00:00
Alexey Martemyanov dd9e081273 [2026-09-26] eagle: personal/plans/balda-mm-phase4-agents.md personal/plans/music-tags-review/music-tags-review.md personal/tech/agents-bridge.md personal/tech/music-tags-repair-truenas.md 2026-09-26 18:04:35 +06:00
Alexey Martemyanov d2f6a411f9 [2026-09-26] eagle: personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 17:54:28 +06:00
Alexey Martemyanov 33e4c4e948 [2026-09-26] eagle: personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 17:44:20 +06:00
Alexey Martemyanov 94930a68b3 [2026-09-26] eagle: personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 17:39:16 +06:00
Alexey Martemyanov bf95d4c825 [2026-09-26] eagle: personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 17:34:12 +06:00
Alexey Martemyanov 857b8931fc Merge remote-tracking branch 'nas/main' 2026-09-26 17:29:11 +06:00
Alexey Martemyanov 18386780e3 [2026-09-26] eagle: personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 17:29:09 +06:00
Taiga 82d6d0bdae [2026-09-26 11:27:16] syncthing: family/documents/vault-sync/2026-09-26-marker-check-false-positive.md 2026-09-26 11:27:16 +00:00
Taiga afec6296d5 [2026-09-26 11:27:07] taiga-vault: family/documents/vault-sync/2026-09-26-marker-check-false-positive.md 2026-09-26 11:27:07 +00:00
Alexey Martemyanov 9d5bcf71ba [2026-09-26] eagle: personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 17:24:04 +06:00
Alexey Martemyanov f498e7e452 [2026-09-26] eagle: personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 17:18:59 +06:00
Alexey Martemyanov df18b6dd71 Merge remote-tracking branch 'nas/main' 2026-09-26 17:13:57 +06:00
Alexey Martemyanov 04e848eef0 [2026-09-26] eagle: family/how-to/truenas-access.md personal/tech/music-tags-repair-truenas.md 2026-09-26 17:13:55 +06:00
Taiga 7750b7acb0 taiga-vault: vault-sync note — 2nd round of merge-conflict markers in 1-needs-decision.md (whale side kept, decisions verified in 2-medium/3-high) 2026-09-26 11:12:12 +00:00
Taiga 763179e398 taiga-vault: resolve merge conflict markers in personal/plans/music-tags-review/1-needs-decision.md (2nd round — whale side kept: all 4 items already applied into 2-medium/3-high, decisions preserved: i am instructor→Techno Beat, Kazantip 2008→Beat, Из чего же→Чичков, Нашествие deleted by user) 2026-09-26 11:11:53 +00:00
Alexey Martemyanov ee15738619 [2026-09-26] eagle: family/how-to/jellyfin-config.md personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 17:08:51 +06:00
Alexey Martemyanov cdbd3f65f4 [2026-09-26] eagle: merge conflict — review needed 2026-09-26 17:03:49 +06:00
Taiga 41778134ec [2026-09-26 11:02:37] syncthing: family/documents/vault-sync/2026-09-26-music-tags-merge-conflict.md 2026-09-26 11:02:37 +00:00
Taiga 335d144ca3 [2026-09-26 11:02:28] taiga-vault: family/documents/vault-sync/2026-09-26-music-tags-merge-conflict.md 2026-09-26 11:02:28 +00:00
Taiga 563a7fc233 taiga-vault: resolve merge conflict markers in personal/plans/music-tags-review/1-needs-decision.md (union: nas/phone side kept — Alexey's [x] decisions and pending !Детские item preserved, nothing deleted) 2026-09-26 11:02:15 +00:00
Alexey Martemyanov 1dd58ff83b [2026-09-26] whale: music-tags-review — все решения внесены, needs-decision пуст 2026-09-26 16:58:39 +06:00
Alexey Martemyanov dfa5240d75 [2026-09-26] eagle: merge conflict — review needed 2026-09-26 16:56:17 +06:00
Alexey Martemyanov aa0d26a21a [2026-09-26] whale: music-tags-review — Нашествие удалён, Чичков, Kazantip (1 needs-decision) 2026-09-26 16:56:14 +06:00
Taiga 50e81dccf4 [2026-09-26 10:55:50] syncthing-out: personal/tech/id3-tag-repair.md 2026-09-26 10:55:50 +00:00
Taiga bb17884b7f Merge remote-tracking branch 'origin/main' 2026-09-26 10:55:44 +00:00
Taiga 81d15fa678 [2026-09-26 10:55:44] syncthing: personal/plans/music-tags-review/1-needs-decision.md 2026-09-26 10:55:44 +00:00
Alexey Martemyanov 3f48512ff4 [2026-09-26] eagle: family/how-to/jellyfin-config.md personal/tech/id3-tag-repair.md personal/tech/music-tags-repair-truenas.md 2026-09-26 16:53:40 +06:00
Alexey Martemyanov 4464e648cf [2026-09-26] whale: music-tags-review — финальные списки (4 needs-decision, 5811 medium, 958 high) 2026-09-26 16:49:37 +06:00
Alexey Martemyanov 4d1e73f214 [2026-09-26] eagle: personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 16:48:36 +06:00
Alexey Martemyanov 680da87d49 [2026-09-26] eagle: personal/plans/music-tags-review/1-needs-decision.sync-conflict-20260926-150525-XJRJQB2.md personal/plans/music-tags-review/1-needs-decision.sync-conflict-20260926-165021-C6DYBCZ.md personal/tech/music-tags-repair-truenas.md 2026-09-26 16:43:32 +06:00
Alexey Martemyanov c001e3fec7 Merge remote-tracking branch 'nas/main' 2026-09-26 16:38:31 +06:00
Alexey Martemyanov 3ebaca6e74 [2026-09-26] eagle: family/documents/vault-sync/2026-09-26-syncthing-clone-root-objects-acl-confusion.md family/how-to/vault-git-sync.md personal/plans/music-tags-review/music-tags-review.md personal/tech/music-tags-repair-truenas.md 2026-09-26 16:38:29 +06:00
Taiga 174d3bc024 [2026-09-26 10:36:38] taiga-vault: family/documents/vault-sync/2026-09-26-syncthing-conflict-1-needs-decision.md 2026-09-26 10:36:39 +00:00
Taiga 77f9864ec1 [2026-09-26 10:35:40] syncthing: personal/plans/music-tags-review/1-needs-decision.md 2026-09-26 10:35:40 +00:00
Taiga 44d2c48574 [2026-09-26 10:30:40] syncthing: personal/plans/music-tags-review/1-needs-decision.md 2026-09-26 10:30:40 +00:00
Taiga fd6be4e160 [2026-09-26 10:10:36] syncthing: personal/plans/music-tags-review/1-needs-decision.md 2026-09-26 10:10:36 +00:00
Taiga eda2ed2636 [2026-09-26 10:00:34] syncthing: family/documents/vault-sync/2026-09-26-commit-skip-pipefail.md personal/plans/music-tags-review/1-needs-decision.md 2026-09-26 10:00:34 +00:00
Taiga 392499d19e Merge remote-tracking branch 'origin/main' 2026-09-26 09:55:33 +00:00
Taiga 0daf3ae630 [2026-09-26 09:55:33] taiga-vault: family/how-to/vault-git-sync.md family/documents/vault-sync/2026-09-26-commit-skip-pipefail.md 2026-09-26 09:55:33 +00:00
Taiga ce4a9c5062 [2026-09-26 09:55:33] syncthing: personal/plans/music-tags-review/1-needs-decision.md 2026-09-26 09:55:33 +00:00
Taiga 041885fac9 [2026-09-26 09:53:03] syncthing-out: family/documents/vault-sync/2026-09-26-syncthing-clone-root-objects-acl-confusion.md 2026-09-26 09:53:03 +00:00
Taiga 045a74ce67 Merge remote-tracking branch 'origin/main' 2026-09-26 09:52:59 +00:00
Taiga 12a7566e66 [2026-09-26 09:52:59] syncthing: .DS_Store .gitignore .obsidian/appearance.json .obsidian/core-plugins.json .obsidian/graph.json .obsidian/hotkeys.json .stfolder/syncthing-folder-940f59.txt Dev/apple-browsers/address-ios-onboarding-issues-merge-fix.md Modbus/RTU_Framing_Source_Analysis.md _index.md family/.DS_Store family/_index.md family/contacts/birthdays.md family/contacts/builders.md family/contacts/service-providers.md family/documents/altai-build-checklist.md family/documents/altai-electricity-meter.md family/documents/altai-house-inventory.md family/documents/bring-to-altai.md family/documents/bring-to-russia.md family/documents/bring-to-russia.sync-conflict-20260831-161030-C6DYBCZ.md family/documents/car-notes.md family/documents/debts-calculations.md family/documents/fasteners-nomenclature.md family/documents/fasteners-nomenclature.sync-conflict-20260716-164505-C6DYBCZ.md (... +467 more) 2026-09-26 09:52:59 +00:00
Alexey Martemyanov f482778257 [2026-09-26] eagle: family/documents/vault-sync/2026-09-26-syncthing-clone-root-objects-acl-confusion.md family/how-to/vault-git-sync.md personal/plans/balda-mm-phase4-agents.md personal/tech/docker_colima_setup.md personal/tech/macos-docker-virtiofs-mount-limits.md personal/tech/truenas-nfs4-acl-and-arrmultiuser.md 2026-09-26 15:52:55 +06:00
Taiga 8efe5c8970 [2026-09-26 09:44:37] taiga-vault: family/documents/vault-sync/2026-09-26-syncthing-clone-origin-url-flip.md family/how-to/vault-git-sync.md 2026-09-26 09:44:37 +00:00