Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

conduwuit
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ad06d475

Commit ad06d475 authored 1 year ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'sliding' into 'next'

Very basic Element X support and fixes

See merge request famedly/conduit!501

parents eab5dac6 0b4e3de9

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Cargo.lock 40 additions, 23 deletions

Cargo.lock
Cargo.toml 3 additions, 3 deletions

Cargo.toml
README.md 1 addition, 1 deletion

README.md
src/api/client_server/directory.rs 1 addition, 11 deletions

src/api/client_server/directory.rs
src/api/client_server/sync.rs 240 additions, 40 deletions

src/api/client_server/sync.rs
src/api/client_server/unversioned.rs 18 additions, 2 deletions

src/api/client_server/unversioned.rs
src/api/server_server.rs 6 additions, 0 deletions

src/api/server_server.rs
src/config/mod.rs 1 addition, 0 deletions

src/config/mod.rs
src/database/key_value/globals.rs 18 additions, 9 deletions

src/database/key_value/globals.rs
src/main.rs 1 addition, 0 deletions

src/main.rs
src/service/globals/mod.rs 4 additions, 0 deletions

src/service/globals/mod.rs
src/service/pusher/mod.rs 1 addition, 15 deletions

src/service/pusher/mod.rs
src/service/rooms/spaces/mod.rs 75 additions, 60 deletions

src/service/rooms/spaces/mod.rs
src/service/rooms/state_accessor/mod.rs 13 additions, 0 deletions

src/service/rooms/state_accessor/mod.rs

with 422 additions and 164 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment