Skip to content

Commit

Permalink
Merge branch 'master' into integrate-sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
kernelkind committed May 27, 2024
2 parents 1b0de88 + 5630f93 commit 5e82f5d
Show file tree
Hide file tree
Showing 12 changed files with 701 additions and 185 deletions.
15 changes: 8 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ eframe = { version = "0.27.2", default-features = false, features = [ "glow", "w
#eframe = "0.22.0"
egui_extras = { version = "0.27.2", features = ["all_loaders"] }
ehttp = "0.2.0"
egui-tabs = { git = "https://github.com/damus-io/egui-tabs", rev = "ed97a57fc66b3781bc10ab644f9e1ed125d7377a" }
egui-tabs = { git = "https://github.com/damus-io/egui-tabs", rev = "75f47141aebcf876986fad00dd83a69a7bb04840" }
reqwest = { version = "0.12.4", default-features = false, features = [ "rustls-tls-native-roots" ] }
image = { version = "0.24", features = ["jpeg", "png", "webp"] }
log = "0.4.17"
Expand All @@ -33,7 +33,7 @@ serde_json = "1.0.89"
env_logger = "0.10.0"
puffin_egui = { version = "0.27.0", optional = true }
puffin = { version = "0.19.0", optional = true }
nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "99d8296fcba5957245ed883e2f3b1c0d1cb16397" }
nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "5733ece62b8495db8624a21637bacd12ebb22b2c" }
#nostrdb = "0.3.3"
hex = "0.4.3"
base32 = "0.4.0"
Expand All @@ -42,6 +42,9 @@ strum_macros = "0.26"
bitflags = "2.5.0"
egui_virtual_list = "0.3.0"

[target.'cfg(target_os = "macos")'.dependencies]
security-framework = "2.11.0"


[features]
default = []
Expand Down
2 changes: 1 addition & 1 deletion queries/notifications.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"limit": 100, "kinds":[1], "#p": ["32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"]}]
[{"limit": 500, "kinds":[1], "#p": ["32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"]}]
Loading

0 comments on commit 5e82f5d

Please sign in to comment.