Merge branch 'origin/main' into main
Resolved conflicts in: - .claude/settings.json (kept local permissions) - .obsidian/community-plugins.json (merged both plugin lists) - .obsidian/plugins/obsidian-excalidraw-plugin/manifest.json (kept newer version 2.20.2) - .obsidian/plugins/claudian/main.js (used simpler dependency paths) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Vendored
+16
-19
@@ -1,28 +1,25 @@
|
||||
[
|
||||
"claudian",
|
||||
"obsidian-local-rest-api",
|
||||
"table-editor-obsidian",
|
||||
"obsidian-git",
|
||||
"cm-chs-patch",
|
||||
"templater-obsidian",
|
||||
"obsidian-tasks-plugin",
|
||||
"calendar",
|
||||
"obsidian-kanban",
|
||||
"obsidian-style-settings",
|
||||
"obsidian-icon-folder",
|
||||
"omnisearch",
|
||||
"copilot",
|
||||
"easy-typing-obsidian",
|
||||
"obsidian-advanced-uri",
|
||||
"advanced-canvas",
|
||||
"better-word-count",
|
||||
"dataview",
|
||||
"obsidian-excalidraw-plugin",
|
||||
"obsidian-mind-map",
|
||||
"cm-chs-patch",
|
||||
"quickadd",
|
||||
"any-block",
|
||||
"obsidian-opencode",
|
||||
"opencode-obsidian",
|
||||
"omnisearch",
|
||||
"obsidian-local-rest-api",
|
||||
"obsidian-kanban",
|
||||
"obsidian-icon-folder",
|
||||
"highlightr-plugin",
|
||||
"code-styler"
|
||||
]
|
||||
"obsidian-git",
|
||||
"obsidian-excalidraw-plugin",
|
||||
"code-styler",
|
||||
"note-buddy",
|
||||
"claudian",
|
||||
"calendar",
|
||||
"better-word-count",
|
||||
"table-editor-obsidian",
|
||||
"obsidian-advanced-uri",
|
||||
"advanced-canvas"
|
||||
]
|
||||
|
||||
Vendored
+2
-2
@@ -14,7 +14,7 @@
|
||||
"templates": true,
|
||||
"note-composer": true,
|
||||
"command-palette": true,
|
||||
"slash-command": false,
|
||||
"slash-command": true,
|
||||
"editor-status": true,
|
||||
"bookmarks": true,
|
||||
"markdown-importer": true,
|
||||
@@ -29,5 +29,5 @@
|
||||
"publish": false,
|
||||
"sync": false,
|
||||
"bases": true,
|
||||
"webviewer": false
|
||||
"webviewer": true
|
||||
}
|
||||
Vendored
+4
-4
@@ -2073,9 +2073,9 @@ var require_fast_deep_equal = __commonJS({
|
||||
}
|
||||
});
|
||||
|
||||
// node_modules/@modelcontextprotocol/sdk/node_modules/ajv/node_modules/json-schema-traverse/index.js
|
||||
// node_modules/@modelcontextprotocol/sdk/node_modules/json-schema-traverse/index.js
|
||||
var require_json_schema_traverse = __commonJS({
|
||||
"node_modules/@modelcontextprotocol/sdk/node_modules/ajv/node_modules/json-schema-traverse/index.js"(exports, module2) {
|
||||
"node_modules/@modelcontextprotocol/sdk/node_modules/json-schema-traverse/index.js"(exports, module2) {
|
||||
"use strict";
|
||||
var traverse = module2.exports = function(schema, opts, cb) {
|
||||
if (typeof opts == "function") {
|
||||
@@ -8684,9 +8684,9 @@ var require_subschema2 = __commonJS({
|
||||
}
|
||||
});
|
||||
|
||||
// node_modules/ajv-formats/node_modules/ajv/node_modules/json-schema-traverse/index.js
|
||||
// node_modules/ajv-formats/node_modules/json-schema-traverse/index.js
|
||||
var require_json_schema_traverse2 = __commonJS({
|
||||
"node_modules/ajv-formats/node_modules/ajv/node_modules/json-schema-traverse/index.js"(exports, module2) {
|
||||
"node_modules/ajv-formats/node_modules/json-schema-traverse/index.js"(exports, module2) {
|
||||
"use strict";
|
||||
var traverse = module2.exports = function(schema, opts, cb) {
|
||||
if (typeof opts == "function") {
|
||||
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"id": "claudian",
|
||||
"name": "Claudian",
|
||||
"version": "1.3.16",
|
||||
"minAppVersion": "1.0.0",
|
||||
"description": "Embed Claude AI as a sidebar chat with full agentic capabilities for file operations and bash commands.",
|
||||
"version": "1.3.55",
|
||||
"minAppVersion": "1.4.5",
|
||||
"description": "Embeds Claude Code as an AI collaborator in your vault. Your vault becomes Claude's working directory, giving it full agentic capabilities: file read/write, search, bash commands, and multi-step workflows.",
|
||||
"author": "Yishen Tu",
|
||||
"authorUrl": "https://github.com/YishenTu",
|
||||
"isDesktopOnly": true
|
||||
|
||||
+12
-12
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"id": "obsidian-excalidraw-plugin",
|
||||
"name": "Excalidraw",
|
||||
"version": "2.20.2",
|
||||
"minAppVersion": "1.5.7",
|
||||
"description": "Sketch Your Mind. An Obsidian plugin to edit and view Excalidraw drawings. Enter the world of 4D Visual PKM.",
|
||||
"author": "Zsolt Viczian",
|
||||
"authorUrl": "https://excalidraw-obsidian.online",
|
||||
"fundingUrl": "https://ko-fi.com/zsolt",
|
||||
"helpUrl": "https://github.com/zsviczian/obsidian-excalidraw-plugin#readme",
|
||||
"isDesktopOnly": false
|
||||
}
|
||||
{
|
||||
"id": "obsidian-excalidraw-plugin",
|
||||
"name": "Excalidraw",
|
||||
"version": "2.20.2",
|
||||
"minAppVersion": "1.5.7",
|
||||
"description": "Sketch Your Mind. An Obsidian plugin to edit and view Excalidraw drawings. Enter the world of 4D Visual PKM.",
|
||||
"author": "Zsolt Viczian",
|
||||
"authorUrl": "https://excalidraw-obsidian.online",
|
||||
"fundingUrl": "https://ko-fi.com/zsolt",
|
||||
"helpUrl": "https://github.com/zsviczian/obsidian-excalidraw-plugin#readme",
|
||||
"isDesktopOnly": false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user