Commit Graph
798 Commits
Author SHA1 Message Date
Alexey Martemyanov b937fc172d [2026-05-30] sync: merge conflicts present — manual review needed 2026-05-30 15:01:38 +06:00
Syncthing 63560db12f Merge remote-tracking branch 'origin/main' 2026-05-30 09:01:04 +00:00
Syncthing 902b577066 syncthing-1780131664 2026-05-30 09:01:04 +00:00
Тайга 969bdb42c0 taiga-local-1780131662 2026-05-30 09:01:02 +00:00
Alexey Martemyanov e5bd816971 [2026-05-30] Discworld (ScummVM) — статус изменён на , документированы все 3 причины поломки 2026-05-30 14:44:44 +06:00
Alexey Martemyanov 60c0ea26fe [2026-05-30] merge noir+discworld into main proton doc, remove separate doc 2026-05-30 14:32:14 +06:00
Alexey Martemyanov f5a14fdfe0 [2026-05-30] update discworld noir doc: fstab fix, problems and solutions 2026-05-30 14:22:58 +06:00
Alexey Martemyanov 801b6070f3 [2026-05-30] add steam stop/start commands to htpc-system.md 2026-05-30 14:22:36 +06:00
Syncthing 6759ac1534 Merge remote-tracking branch 'origin/main' 2026-05-30 08:03:41 +00:00
Syncthing f3f4f22d4c syncthing-1780128220 2026-05-30 08:03:40 +00:00
Тайга 8a30fb26e8 taiga-local-1780128218 2026-05-30 08:03:38 +00:00
Alexey Martemyanov 40c33a6484 [2026-05-30] sync: merge conflicts present — manual review needed 2026-05-30 14:01:09 +06:00
Alexey Martemyanov 009c61d1d7 [2026-05-30] add Data disk NTFS config to htpc-system.md 2026-05-30 13:12:03 +06:00
Syncthing 70205779ee Merge remote-tracking branch 'origin/main' 2026-05-30 07:03:14 +00:00
Syncthing b9042a200b syncthing-1780124591 2026-05-30 07:03:12 +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 adcb1501cd Merge remote-tracking branch 'origin/main' 2026-05-30 06:03:59 +00:00
Syncthing c46fa9a29d syncthing-1780121038 2026-05-30 06:03:58 +00:00
Тайга 8d6f8b008b taiga-local-1780121037 2026-05-30 06:03:57 +00:00
Alexey Martemyanov fa39c07b7a [2026-05-30] inbox triage update — no new activity 2026-05-30 12:01:47 +06:00
Syncthing 49fe6bb96d Merge remote-tracking branch 'origin/main' 2026-05-30 05:03:34 +00:00
Syncthing a4486ef9eb syncthing-1780117413 2026-05-30 05:03:33 +00:00
Тайга 23d293ae15 taiga-local-1780117413 2026-05-30 05:03:33 +00:00
Alexey Martemyanov 40f4a6b839 [2026-05-30] добавил daily/inbox brief и weekly plan на 2026-06-01 2026-05-30 11:03:04 +06:00
Alexey Martemyanov d149c39de1 Merge remote-tracking branch 'nas/main' 2026-05-30 11:02:43 +06:00
Alexey Martemyanov 5540f946c4 [2026-05-30] создал гайд по отчётности ИП (патент/УСН, сравнение регионов, календарь) 2026-05-30 10:30:35 +06:00
Alexey Martemyanov b09c37f52e [2026-05-30] добавил нюанс сканирования загранпаспорта в ip-registration-guide 2026-05-30 10:14:56 +06:00
Syncthing 45f74e3ebf Merge remote-tracking branch 'origin/main' 2026-05-30 04:03:10 +00:00
Syncthing 3f812d45ed syncthing-1780113789 2026-05-30 04:03:09 +00:00
Тайга c741a6b3ee taiga-local-1780113788 2026-05-30 04:03:08 +00:00
Alexey Martemyanov 1ce92ac57f [2026-05-30] inbox triage 09:58 — quiet window 2026-05-30 10:02:56 +06:00
Syncthing 1683ebe6fc Merge remote-tracking branch 'origin/main' 2026-05-30 03:03:41 +00:00
Syncthing b2fa92dc4f syncthing-1780110220 2026-05-30 03:03:40 +00:00
Тайга ec85e9fb3c taiga-local-1780110219 2026-05-30 03:03:39 +00:00
Alexey Martemyanov a12ca94198 [2026-05-30] daily brief, weekly plan for Jun 1-5 2026-05-30 08:02:39 +06:00
Syncthing 654bd3d3d9 Merge remote-tracking branch 'origin/main' 2026-05-30 02:00:19 +00:00
Syncthing 7114071fed syncthing-1780106418 2026-05-30 02:00:18 +00:00
Тайга b2f125dea4 taiga-local-1780106416 2026-05-30 02:00:16 +00:00
Syncthing c92b813d4f Merge remote-tracking branch 'origin/main' 2026-05-30 01:03:41 +00:00
Syncthing f612648b88 syncthing-1780103021 2026-05-30 01:03:41 +00:00
Тайга 0a0207c86c taiga-local-1780103019 2026-05-30 01:03:39 +00:00
Syncthing aecad3e0a3 Merge remote-tracking branch 'origin/main' 2026-05-30 00:04:08 +00:00
Syncthing 8b6363e2ff syncthing-1780099447 2026-05-30 00:04:07 +00:00
Тайга 88260bbcaf taiga-local-1780099445 2026-05-30 00:04:05 +00:00
Syncthing b946eecd24 Merge remote-tracking branch 'origin/main' 2026-05-29 23:00:59 +00:00
Syncthing 9d9cde2419 syncthing-1780095658 2026-05-29 23:00:58 +00:00
Тайга f7fac5ebab taiga-local-1780095657 2026-05-29 23:00:57 +00:00
Syncthing 8d32a9a7ec Merge remote-tracking branch 'origin/main' 2026-05-29 22:00:36 +00:00