Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a859d40
Refactor how the stack nav history is maintained (in HomeScreen, not …
kevinaboos Mar 24, 2026
7725ac0
Merge pull request #778 from kevinaboos/refactor_stack_nav_history
kevinaboos Mar 24, 2026
af6bb5f
Adjust home icon to be a better fit for Robrix's style
kevinaboos Mar 24, 2026
4e13b31
Merge pull request #779 from kevinaboos/home_icon
kevinaboos Mar 24, 2026
4b1d79c
Fix TSP behavior and styling for 2.0, fix import icon
kevinaboos Mar 24, 2026
6968397
improve add_user icon
kevinaboos Mar 24, 2026
cae1387
Merge pull request #780 from kevinaboos/fix_tsp_and_icons
kevinaboos Mar 24, 2026
9db4f53
Update makepad to get our fixes for stack nav and Linux platform
kevinaboos Mar 24, 2026
ba1f400
update again
kevinaboos Mar 25, 2026
af3a7a0
update to our windows fix
kevinaboos Mar 25, 2026
51d2228
Merge pull request #781 from kevinaboos/update_makepad
kevinaboos Mar 25, 2026
6bda528
get our fixes to font parsing and text draw perf
kevinaboos Mar 25, 2026
be53e51
track `dev` again now that our fixes were upstreamed into makepad
kevinaboos Mar 25, 2026
d3a44f3
Merge branch 'main' into update_makepad
kevinaboos Mar 25, 2026
1a00e5c
perf(sliding_sync): fix N+1 query in typing notifications
google-labs-jules[bot] Mar 25, 2026
93eb83c
Merge pull request #782 from kevinaboos/update_makepad
kevinaboos Mar 25, 2026
e09e8d7
Delete src/sliding_sync.rs.orig
kevinaboos Mar 25, 2026
7847f25
Delete patch.diff
kevinaboos Mar 25, 2026
43cc02e
properly parallelize fetching the list of typing users' display names
kevinaboos Mar 25, 2026
6dfa43b
Merge branch 'main' into fix-n-plus-1-typing-members-1186567900503438…
kevinaboos Mar 26, 2026
7634f0c
Merge pull request #783 from project-robius/fix-n-plus-1-typing-membe…
kevinaboos Mar 26, 2026
ebbfcfc
attachment_upload_2.0
alanpoon Mar 26, 2026
e0ebd48
upload_progress
alanpoon Mar 26, 2026
528dd95
fix not auto close
alanpoon Mar 26, 2026
494512e
Merge branch 'main' into image_upload_2.0
alanpoon Mar 26, 2026
9f7a907
fix clippy
alanpoon Mar 26, 2026
ee234e5
Merge branch 'image_upload_2.0' of https://github.com/alanpoon/robrix…
alanpoon Mar 26, 2026
cb7d663
fix clippy
alanpoon Mar 27, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
743 changes: 649 additions & 94 deletions Cargo.lock

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ version = "0.0.1-pre-alpha-4"
metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="

[dependencies]
# makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] }
# makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" }

makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "stack_nav_improvements", features = ["serde"] }
makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "stack_nav_improvements" }
makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] }
makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" }


## Including this crate automatically configures all `robius-*` crates to work with Makepad.
Expand All @@ -44,6 +41,9 @@ hashbrown = { version = "0.16", features = ["raw-entry"] }
htmlize = "1.0.5"
indexmap = "2.6.0"
imghdr = "0.7.0"
image = { version = "0.25", default-features = false, features = ["jpeg", "png"] }
mime = "0.3"
mime_guess = "2.0"
linkify = "0.10.0"
matrix-sdk-base = { git = "https://github.com/matrix-org/matrix-rust-sdk", branch = "main" }
matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk", branch = "main", default-features = false, features = [
Expand Down Expand Up @@ -103,6 +103,10 @@ reqwest = { version = "0.12", default-features = false, features = [
"macos-system-configuration",
] }

# Desktop-only file dialog (doesn't work on iOS/Android)
[target.'cfg(not(any(target_os = "ios", target_os = "android")))'.dependencies]
rfd = "0.15"


[features]
default = []
Expand Down
5 changes: 0 additions & 5 deletions resources/icon_home.svg

This file was deleted.

3 changes: 3 additions & 0 deletions resources/icons/add_attachment.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions resources/icons/add_user.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions resources/icons/file.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 3 additions & 9 deletions resources/icons/home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions resources/icons/import.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions resources/icons/import2.svg

This file was deleted.

Loading