Commit Graph
416 Commits
Author SHA1 Message Date
Taiga 45ce1dce3a [2026-09-27 10:21:08] syncthing: family/documents/movies-watchlist.md 2026-09-27 10:21:09 +00:00
Hermes 72f2031b11 [2026-09-27] kraken: family/documents/movies-watchlist.md family/documents/movies-watchlist.md.bak-questions 2026-09-27 01:10:36 +06:00
Taiga ef0d21f271 [2026-09-26 16:05:40] syncthing: family/documents/movies-watchlist.md 2026-09-26 16:05:40 +00: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
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 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
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 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 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 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
Taiga 87cec237df [2026-09-26 09:12:32] taiga-vault: family/documents/vault-sync/2026-09-26-mode-flip-644-755.md 2026-09-26 09:12:32 +00:00
Taiga 12a4de221d [2026-09-26 09:06:12] taiga-vault: family/documents/vault-sync/2026-09-26-syncthing-conflict-1-needs-decision.md 2026-09-26 09:06:12 +00:00
Hermes 32945b5f01 [2026-09-26] kraken: family/documents/movies-watchlist.md family/documents/movies-watchlist.md.bak-questions 2026-09-26 01:06:39 +06:00
Taiga a0d298568c [2026-09-25 15:41:48] taiga-vault: family/documents/vault-sync/2026-09-25-http402-balance-outage.md 2026-09-25 15:41:48 +00:00
Hermes 4e73f5a16f [2026-09-25] kraken: family/documents/movies-watchlist.md.bak-questions 2026-09-25 01:02:25 +06:00
Hermes 70cdba545a [2026-09-24] kraken: family/documents/movies-watchlist.md family/documents/movies-watchlist.md.bak-questions 2026-09-24 18:23:00 +06:00
Hermes 0f697d7d71 [2026-09-24] kraken: family/documents/movies-watchlist.md family/documents/movies-watchlist.md.bak-questions 2026-09-24 18:19:49 +06:00
Hermes 474a85e202 [2026-09-24] kraken: family/documents/movies-watchlist.md family/documents/movies-watchlist.md.bak-questions 2026-09-24 03:00:03 +06:00
Hermes 7af79521ce [2026-09-24] kraken: family/documents/movies-watchlist.md 2026-09-24 01:02:09 +06:00
Alexey Martemyanov 34f4731e72 [2026-09-23] eagle: family/documents/movies-watchlist.md.bak-20260920-192909 family/documents/movies-watchlist.md.bak-questions family/how-to/red2tb-dataset-map.md family/how-to/truenas-infrastructure.md family/how-to/truenas-infrastructure.md.bak-before-cut-history family/how-to/truenas-infrastructure.md.bak-before-drop-changelog family/how-to/truenas-infrastructure.md.bak-before-merge-dup-header family/how-to/truenas-infrastructure.md.bak-per-user-20260902-1229 family/plans/t610-home-automation.md.bak-access-20260914-222938 personal/tech/truenas-local-tree-comparison.md 2026-09-23 14:47:28 +06:00
Hermes d8b7ab5108 [2026-09-23] kraken: family/documents/movies-watchlist.md family/documents/movies-watchlist.md.bak-questions 2026-09-23 03:00:04 +06:00
Hermes bb1538a7d8 [2026-09-23] kraken: family/documents/movies-watchlist.md 2026-09-23 01:02:27 +06:00
Alexey Martemyanov 536ab19dae [2026-09-22] eagle: family/documents/movies-watchlist.md 2026-09-22 21:07:02 +06:00
Alexey Martemyanov 190f56b40a [2026-09-22] eagle: family/documents/movies-watchlist.md 2026-09-22 20:56:55 +06:00
Alexey Martemyanov 3c784f6e6b [2026-09-22] eagle: family/documents/movies-watchlist.md 2026-09-22 20:51:52 +06:00
Alexey Martemyanov 159a805ce9 [2026-09-22] eagle: family/documents/movies-watchlist.md personal/plans/kraken-media-inventory-cleanup.md personal/tech/lampac-deployment.md 2026-09-22 20:46:48 +06:00
Alexey Martemyanov 5b0147f53d [2026-09-22] eagle: family/documents/movies-watchlist.md 2026-09-22 20:41:44 +06:00
Alexey Martemyanov afbf895e2e docs(vault-sync): acl fix closed 236/236 INHERIT+WRITE, watchdog cron, root cause hermes-taiga 2026-09-22 20:09:38 +06:00
Alexey Martemyanov 2ee754f1a9 [2026-09-22] eagle: family/documents/vault-sync/2026-09-21-bare-repo-push-permission-denied.md personal/tech/lampac-torrserver.md personal/tech/truenas-nfs4-acl-and-arrmultiuser.md 2026-09-22 19:40:24 +06:00
Taiga c835707a13 [2026-09-22 13:02:30] taiga-vault: family/documents/vault-sync/2026-09-22-watchlist-merge-conflict.md 2026-09-22 13:02:30 +00:00
Taiga 9a2220e84f [2026-09-22 13:01:52] taiga-vault: resolve merge conflict markers in movies-watchlist.md (kraken vs eagle ❓/year normalization — kept both: eagle titles + kraken ★ subentries) 2026-09-22 13:01:52 +00:00
Hermes d6d992d8b1 [2026-09-22] kraken: merge conflict — review needed 2026-09-22 19:00:08 +06:00
Hermes 51ca391dd1 [2026-09-22] kraken: family/documents/movies-watchlist.md family/documents/movies-watchlist.md.bak-questions 2026-09-22 19:00:02 +06:00
Alexey Martemyanov d10bc1a5d0 [2026-09-22] eagle: family/documents/movies-watchlist.md 2026-09-22 18:19:06 +06:00
Hermes 27091e9978 [2026-09-22] kraken: family/documents/movies-watchlist.md 2026-09-22 12:00:12 +06:00
Hermes d8d736e606 [2026-09-22] kraken: family/documents/movies-watchlist.md 2026-09-22 01:02:18 +06:00
Taiga 90c33859c2 [2026-09-21 15:02:05] taiga-vault: family/documents/vault-sync/2026-09-21-bare-repo-push-permission-denied.md 2026-09-21 15:02:05 +00:00
Alexey Martemyanov 8b0b614a76 [2026-09-21] eagle: family/documents/vault-sync/2026-09-21-bare-repo-push-permission-denied.md family/how-to/vault-git-sync.md personal/tech/truenas-nfs4-acl-and-arrmultiuser.md 2026-09-21 19:32:02 +06:00
hermes 7a8d0fdc42 watchlist: снять ⬇️ у Список Шиндлера и Неистового (remux удалены, monitored=false) 2026-09-21 15:41:23 +06:00
Taiga a921c95f6f [2026-09-21 04:26:21] taiga-vault: family/documents/vault-sync/2026-09-21-http402-balance-outage.md 2026-09-21 04:26:21 +00:00
Taiga 5e0242858d [2026-09-21 04:25:34] syncthing: family/documents/movies-watchlist.md personal/documents/fly-box.md 2026-09-21 04:25:36 +00:00
Taiga 6d83071a4c [2026-09-20 21:00:17] taiga-vault: family/documents/vault-sync/2026-09-20-morning-sync-outage.md 2026-09-20 21:00:17 +00:00