admin/SergObsidian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sShemet
2025-07-22 17:23:14 +05:00
parent 01f93ea076 9851fd878b
commit 10a34b1a3e
89 changed files with 2159 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.obsidian/community-plugins.json vendored
View File

@@ -2,6 +2,5 @@
"obsidian-full-calendar",
"obsidian-icon-folder",
"obsidian-git",
"obsidian-smart-typography",
"copy-document-as-html"
"obsidian-smart-typography"
]

2
.obsidian/graph.json vendored
View File

@@ -17,6 +17,6 @@
"repelStrength": 10,
"linkStrength": 1,
"linkDistance": 250,
"scale": 1.1122355498645218,
"scale": 1.112235549864522,
"close": true
}

12
.obsidian/hotkeys.json vendored Normal file
View File

@@ -0,0 +1,12 @@
{
"obsidian-git:commit": [
{
"modifiers": [
"Alt",
"Mod",
"Shift"
],
"key": "C"
}
]
}

6
.obsidian/plugins/obsidian-git/data.json vendored
View File

@@ -1,5 +1,6 @@
{
"commitMessage": "vault backup: {{date}}",
"autoCommitMessage": "vault backup: {{date}}",
"commitDateFormat": "YYYY-MM-DD HH:mm:ss",
"autoSaveInterval": 10,
"autoPushInterval": 0,
@@ -8,6 +9,7 @@
"disablePush": false,
"pullBeforePush": true,
"disablePopups": false,
"showErrorNotices": true,
"disablePopupsForNoChanges": false,
"listChangedFilesInMessageBody": false,
"showStatusBar": true,
@@ -29,6 +31,7 @@
"showFileMenu": true,
"authorInHistoryView": "hide",
"dateInHistoryView": false,
"diffStyle": "split",
"lineAuthor": {
"show": false,
"followMovement": "inactive",
@@ -53,6 +56,5 @@
"gutterSpacingFallbackLength": 5,
"lastShownAuthorDisplay": "initials",
"lastShownDateTimeFormatOptions": "date"
},
"autoCommitMessage": "vault backup: {{date}}"
}
}

272
.obsidian/plugins/obsidian-git/main.js vendored
View File

File diff suppressed because one or more lines are too long

2
.obsidian/plugins/obsidian-git/manifest.json vendored
View File

@@ -6,5 +6,5 @@
"description": "Integrate Git version control with automatic backup and other advanced features.",
"isDesktopOnly": false,
"fundingUrl": "https://ko-fi.com/vinzent",
"version": "2.31.1"
"version": "2.33.0"
}

29
.obsidian/plugins/obsidian-git/styles.css vendored
View File

@@ -574,3 +574,32 @@
.git-split-diff-view .cm-insertedLine .cm-changedText {
background-color: #22bb2230;
}
/* Limits the scrollbar to the view body */
.git-view {
display: flex;
flex-direction: column;
position: relative;
height: 100%;
}
.git-obscure-prompt[git-is-obscured="true"] #git-show-password:after {
-webkit-mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="svg-icon lucide-eye"><path d="M2.062 12.348a1 1 0 0 1 0-.696 10.75 10.75 0 0 1 19.876 0 1 1 0 0 1 0 .696 10.75 10.75 0 0 1-19.876 0"></path><circle cx="12" cy="12" r="3"></circle></svg>');
}
.git-obscure-prompt[git-is-obscured="false"] #git-show-password:after {
-webkit-mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="svg-icon lucide-eye-off"><path d="M10.733 5.076a10.744 10.744 0 0 1 11.205 6.575 1 1 0 0 1 0 .696 10.747 10.747 0 0 1-1.444 2.49"></path><path d="M14.084 14.158a3 3 0 0 1-4.242-4.242"></path><path d="M17.479 17.499a10.75 10.75 0 0 1-15.417-5.151 1 1 0 0 1 0-.696 10.75 10.75 0 0 1 4.446-5.143"></path><path d="m2 2 20 20"></path></svg>');
}
/* Override styling of Codemirror merge view "collapsed lines" indicator */
.git-split-diff-view .ͼ2 .cm-collapsedLines {
background: var(--interactive-normal);
border-radius: var(--radius-m);
color: var(--text-accent);
font-size: var(--font-small);
padding: var(--size-4-1) var(--size-4-1);
}
.git-split-diff-view .ͼ2 .cm-collapsedLines:hover {
background: var(--interactive-hover);
color: var(--text-accent-hover);
}

81
.obsidian/workspace.json vendored
View File

@@ -173,56 +173,57 @@
},
"active": "80dbf49c3b165c4e",
"lastOpenFiles": [
"WORK & PROJECTS/Mol/Планы и диаграммы/Статусы/Структура статусов.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Статусы",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Расчёт тарифов и списаний.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Tariffs.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Products.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Modules.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Billing_add_types.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Billing.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации",
"WORK & PROJECTS/Mol/Планы и диаграммы/Нумератор/Нумератор_общая_схема.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Нумератор/numerator_counter_types.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Нумератор/numerator_counter_history.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Нумератор/numerator_counters.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Нумератор",
"WORK & PROJECTS/Mol/Серверы/Supervisor/job_worker.md",
"WORK & PROJECTS/Mol/Серверы/Supervisor",
"WORK & PROJECTS/Mol/Серверы/PROXY_PASS/Traefik config.md",
"WORK & PROJECTS/Mol/Серверы/PROXY_PASS",
"WORK & PROJECTS/Mol/Серверы/Mol Public Prod.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/ТЗ динамических полей и ФИЗов.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/Схема образца испытаний и заявки.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/Структура таблиц. Основа + заказы.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/samplings table.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/pgo_to_groups.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/modules_to_dyn_controls.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/dynamic_controls_table.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы",
"WORK & PROJECTS/Mol/Планы и диаграммы/notifies.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Alfa Cloud/Websockets scheme.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Alfa Cloud/Alfa PROD NODE script.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Описание первой версии.md",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/Формы импорта оборудования.zip",
"WORK & PROJECTS/Mol/Документы ООО Моль-софт/Счета оплаты серверов/Operation_Check_PJSC_Sberbank_17072025.pdf",
"WORK & PROJECTS/Mol/Документы ООО Моль-софт/Счета оплаты серверов/Operation_Check_PJSC_Sberbank_09062025.pdf",
"WORK & PROJECTS/Mol/Документы ООО Моль-софт/Счета оплаты серверов/Operation_Check_PJSC_Sberbank_06052025.pdf",
"SKILLS DOCS/JAPANESE частицы.md",
"SKILLS DOCS/DOCS/Load Balancer 2.md",
"SKILLS DOCS/DOCS/Load Balancer.md",
"My/Июль.md",
"2025-07-18.md",
"WORK & PROJECTS/Mol/Code Chunks/Tiptap resizeTableColumnWidth.md",
"PERSONAL PROJECTS/P2EP/cdRead.canvas",
"PERSONAL PROJECTS/P2EP/pseudoCode/MakeSmallChar.md",
"PERSONAL PROJECTS/P2EP/pseudoCode/FUN_80015674 Update Entity Stats.md",
"PERSONAL PROJECTS/P2EP/pseudoCode/FUN_800453e0 SystemEventManager.md",
"PERSONAL PROJECTS/P2EP/pseudoCode/FUN_80012df4 RenderInterface.md",
"PERSONAL PROJECTS/P2EP/pseudoCode/FUN_80011f2c InitInterfaceManager.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code - Texture show from file.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code - modules load and exec.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code - Load texture from SECTOR!.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code texture load unpack show and fade.md",
"PERSONAL PROJECTS/Persona 1/Script Format.md",
"My/Diet 2.md",
"WORK & PROJECTS/Mol/Серверы/git.moldev.ru.md",
"PERSONAL PROJECTS/PS1 DOCS/CD_Execute_Reading.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code logo show.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code Gamepad code.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Разработка - ЭПИКИ.md",
"WORK & PROJECTS/Mol/Code Chunks/TipTap Plugin.md",
"WORK & PROJECTS/Mol/Code Chunks",
"PERSONAL PROJECTS/PS1 DOCS/PSX code IRQ handling.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code inline asm.md",
"PERSONAL PROJECTS/PS1 DOCS/PS1 Vblank.md",
"PERSONAL PROJECTS/PS1 DOCS/PS1 Ordering table.md",
"PERSONAL PROJECTS/PS1 DOCS/PS1 IRQ.md",
"PERSONAL PROJECTS/PS1 DOCS/PS1 MDEC.md",
"PERSONAL PROJECTS/PS1 DOCS/PS1 Gpu-DMA.md",
"PERSONAL PROJECTS/PS1 DOCS",
"PERSONAL PROJECTS/P2EP/pseudoCode",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/СМК/КУ_Чек_лист_10_ошибок_УД_скачивание.pdf",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/СМК",
"WORK & PROJECTS/Mol/Планы и диаграммы/Схема связей юрлиц и адресов.canvas",
"My",
"WORK & PROJECTS/Mol/Планы и диаграммы/Alfa Cloud",
"Структура объектов испытаний.png",
"Схема связей юрлиц и адресов.png",
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Архитектура редактора и генератора (Alfa + Mol).canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Таблицы нумератора и документов.canvas",
"Структура объектов испытаний.png.0.pdnSave",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/АФ-01 Альбом форм.pdf",
"WORK & PROJECTS/Mol/Серверы/Схема инфраструктуры.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Быстрый старт/Быстрый старт.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Alfa Cloud/Alfa cloud prod.canvas",
"WORK & PROJECTS/Ulab/Автобан/щебень 5-20.xlsx",
"WORK & PROJECTS/Mol/Серверы/Alfa cloud prod.canvas",
"P2EP/cdRead.canvas",
"WORK & PROJECTS/img/Pasted image 20241212175419.png",
"WORK & PROJECTS/img/Pasted image 20241212175847.png",
"WORK & PROJECTS/img/Pasted image 20241212175929.png",
"WORK & PROJECTS/img/Pasted image 20241212175851.png",
"Без названия 2.canvas"
"WORK & PROJECTS/img/Pasted image 20241212175851.png"
]
}