Skip to content

Commit 9df0aac

Browse files
committed
Merge branch 'main' into support_link_preview_in_markdown
2 parents 3503ef4 + 864d03b commit 9df0aac

File tree

140 files changed

+4641
-2439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+4641
-2439
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ collab-plugins/.env.test
1717

1818
**/temp/**
1919

20-
**/.DS_Store
20+
**/.DS_Store
21+
.claude
22+

Cargo.lock

Lines changed: 76 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ collab-entity = { path = "collab-entity" }
2020
collab-document = { path = "collab-document" }
2121
collab-folder = { path = "collab-folder" }
2222
collab-importer = { path = "collab-importer" }
23-
yrs = { version = "0.23.5", features = ["sync"] }
23+
yrs = { version = "0.24", features = ["sync"] }
2424
anyhow = "1.0.94"
2525
thiserror = "1.0.39"
2626
serde = { version = "1.0.157", features = ["derive"] }
@@ -31,6 +31,8 @@ tracing = "0.1.22"
3131
chrono = { version = "0.4.38", default-features = false, features = ["clock"] }
3232
async-trait = "0.1"
3333
arc-swap = { version = "1.7" }
34+
uuid = { version = "1.17.0", features = ["v4", "v5", "v7", "serde"] }
35+
futures-lite = { version = "2.6.0", features = ["futures-io"] }
3436

3537
[patch.crates-io]
3638
# We're using a specific commit here because rust-rocksdb doesn't publish the latest version that includes the memory alignment fix.

collab-database/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ nanoid = "0.4.0"
2121
chrono.workspace = true
2222
lazy_static = "1.4.0"
2323
async-trait.workspace = true
24-
uuid = { version = "1.3.3", features = ["v4", "v5"] }
24+
uuid.workspace = true
2525
tokio-stream = { version = "0.1.14", features = ["sync"] }
2626
strum = "0.25"
2727
strum_macros = "0.25"

0 commit comments

Comments
 (0)