Commit Graph
182 Commits
Author SHA1 Message Date
Alexey Martemyanov b822a3ab19 [2026-06-03] sort: resolved 2 syncthing conflicts (deferred-tasks, movies-watchlist) 2026-06-03 01:01:29 +06:00
Alexey Martemyanov 0280f518d8 [2026-06-02] eagle: family/documents/gift-ideas.md work/briefs/inbox/2026-06-02.md 2026-06-02 17:45:35 +06:00
Alexey Martemyanov 03dc6d3faa [2026-06-02] shopping-order, inbox triage update 2026-06-02 14:01:31 +06:00
Syncthing 234f1a41f6 syncthing-1780369402 2026-06-02 03:03:22 +00:00
Syncthing 2f9b09e350 Merge remote-tracking branch 'origin/main' 2026-06-02 02:06:53 +00:00
Syncthing ab549a92ad syncthing-1780366009 2026-06-02 02:06:49 +00:00
Тайга 450c9c1334 [2026-06-02] taiga sync: family/documents/altai-house-inventory.md family/documents/car-notes.md family/documents/gift-ideas.md family/documents/holiday-food.md family/documents/home-access-codes.md 2026-06-02 01:07:23 +00:00
Syncthing 6e2b2e0e8b Merge remote-tracking branch 'origin/main' 2026-06-02 01:07:18 +00:00
Syncthing c3960d13fa syncthing-1780362436 2026-06-02 01:07:16 +00:00
Alexey Martemyanov 4a057350d3 Merge remote-tracking branch 'nas/main' 2026-06-02 07:01:04 +06:00
Alexey Martemyanov 4db1aedad6 [2026-06-02] sort: processed 10, deleted 10 2026-06-02 06:03:20 +06:00
Тайга 6349a70c0c [2026-06-02] taiga sync: family/documents/altai-build-checklist.md family/documents/debts-calculations.md 2026-06-02 00:00:41 +00:00
Alexey Martemyanov a1ce113e5b [2026-06-02] sort: processed 10, deleted 10 2026-06-02 05:04:03 +06:00
Alexey Martemyanov 34a2210f0f Merge remote-tracking branch 'nas/main' 2026-06-02 05:01:21 +06:00
Тайга f52f37b155 [2026-06-01] taiga sync: family/documents/medical-notes.md family/sort-queue.md 2026-06-01 23:01:13 +00:00
Alexey Martemyanov 0bb9549b4d [2026-06-02] sort: processed 10, deleted 10 2026-06-02 04:03:25 +06:00
Alexey Martemyanov 79c109edf6 Merge remote-tracking branch 'nas/main' 2026-06-02 04:00:56 +06:00
Syncthing 9e8ff6c894 syncthing-1780347799 2026-06-01 21:03:19 +00:00
Alexey Martemyanov 223554fbfe [2026-06-02] sort: processed 10, deleted 10 (5 already in vault, 4 obsolete, 1 → medical-notes) 2026-06-02 03:03:09 +06:00
Тайга 080060db37 [2026-06-01] taiga sync: family/documents/movies-watchlist.md 2026-06-01 19:03:33 +00:00
Kraken da3dcc2c5f Merge remote-tracking branch 'origin/main' 2026-06-02 01:03:12 +06:00
Kraken 7c6a954878 [2026-06-02] vault sync: family/documents/movies-watchlist.md 2026-06-02 01:03:06 +06:00
Syncthing 3cc848930d Merge remote-tracking branch 'origin/main' 2026-06-01 18:01:08 +00:00
Syncthing 33d876b6cd syncthing-1780336867 2026-06-01 18:01:07 +00:00
Тайга fc10084fad [2026-06-01] taiga sync: family/documents/vault-sync/2026-06-01.md 2026-06-01 17:00:48 +00:00
Тайга 8dec68071e [2026-06-01] taiga sync: .stversions/Untitled.canvas family/documents/movies-watchlist.md 2026-06-01 15:00:52 +00:00
Kraken fe24900d7b Merge remote-tracking branch 'origin/main' 2026-06-01 21:00:24 +06:00
Тайга bff47637c7 [2026-06-01] taiga sync: .stignore family/documents/vault-sync-2026-05-13-08-01.md family/documents/vault-sync-2026-05-20.md family/documents/vault-sync-2026-05-21.md family/documents/vault-sync/2026-05-13-sync.md 2026-06-01 10:03:33 +00:00
Тайга 069febed60 [2026-06-01] taiga sync: .DS_Store .stfolder/syncthing-folder-940f59.txt .stversions/.obsidian/workspace-mobile.json .stversions/personal/projects/personal-os/wiki-curation-runs/2026-05-15.md .stversions/personal/projects/personal-os/wiki-curation-runs/2026-05-16.md 2026-06-01 09:00:57 +00:00
Syncthing 8c6181b9fb syncthing-1780300872 2026-06-01 08:01:12 +00:00
Alexey Martemyanov 01e5f7ca2c [2026-06-01] daily brief, weekly plan, sport equipment fix, aphorisms cleanup 2026-06-01 12:01:29 +06:00
Тайга 881dd9def0 [2026-06-01] taiga sync: .stfolder/syncthing-folder-940f59.txt personal/gift-ideas.md work/briefs/daily/2026-06-01.md work/briefs/inbox/2026-06-01.md 2026-06-01 05:00:45 +00:00
Alexey Martemyanov 834d3c5369 [2026-06-01] sort: processed 10, deleted 10 2026-06-01 06:01:53 +06:00
Alexey Martemyanov a21139a325 [2026-06-01] sort: processed 10, deleted 10 2026-06-01 04:03:31 +06:00
Alexey Martemyanov ba46e88202 [2026-06-01] sort: processed 10, deleted 10 2026-06-01 03:04:10 +06:00
Kraken c9a04ad3ae [2026-06-01] vault sync: family/documents/movies-watchlist.md 2026-06-01 02:27:36 +06:00
Kraken db33901cde [2026-06-01] vault sync: family/documents/movies-watchlist.md 2026-06-01 02:02:19 +06:00
Тайга 48f6d0886d [2026-05-31] taiga sync: .stfolder/syncthing-folder-940f59.txt family/documents/shopping-lists.md personal/documents/deferred-tasks.md work/briefs/inbox/2026-05-31.md 2026-05-31 14:00:34 +00:00
Alexey Martemyanov 2ae94fb6fa [2026-05-31] sort: processed 10, deleted 10 2026-05-31 11:16:40 +06:00
Kraken 46abd3f67f [2026-05-31] vault sync: family/documents/movies-watchlist.md 2026-05-31 01:02:47 +06:00
Syncthing 2ae24a4889 syncthing-1780135410 2026-05-30 10:03:30 +00:00
Тайга 969bdb42c0 taiga-local-1780131662 2026-05-30 09:01:02 +00:00
Syncthing f3f4f22d4c syncthing-1780128220 2026-05-30 08:03:40 +00:00
Тайга 546b122e3e taiga-local-1780124590 2026-05-30 07:03:10 +00:00
Alexey Martemyanov 927cfbcf85 [2026-05-30] sync: merge conflicts present — manual review needed 2026-05-30 13:01:29 +06:00
Alexey Martemyanov 8a4663f1b2 [2026-05-30] inbox sort: processed 16 notes from family/sort/
New files:
- personal/ideas/life-product-ideas.md (feedback-идеи)

Merged into existing files:
- family/documents/kids-songs.md — added Barto poems list
- family/contacts/service-providers.md — added Айдар + Сергей contacts
- family/documents/recipes-wishlist.md — added настойки section

Deleted (already in vault):
- 10 keep-import files (altai-shopping, altai-house-inventory, car-notes,
  gift-ideas, books-reading-list already had the content)
- кофр-размер, лизе-на-день-рождения, лыжи-размеры, настойки-рецепты
2026-05-30 12:54:20 +06:00
Syncthing c46fa9a29d syncthing-1780121038 2026-05-30 06:03:58 +00:00
Тайга 23d293ae15 taiga-local-1780117413 2026-05-30 05:03:33 +00:00
Syncthing 3f812d45ed syncthing-1780113789 2026-05-30 04:03:09 +00:00
Тайга ec85e9fb3c taiga-local-1780110219 2026-05-30 03:03:39 +00:00