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

3bfdae79

Commit 3bfdae79 authored 1 year ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'sliding' into 'next'

Sliding sync improvements and redaction fixes

See merge request famedly/conduit!549

parents 094cb888 75c80df2

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Cargo.lock 128 additions, 160 deletions

Cargo.lock
Cargo.toml 1 addition, 1 deletion

Cargo.toml
src/api/client_server/keys.rs 50 additions, 8 deletions

src/api/client_server/keys.rs
src/api/client_server/redact.rs 1 addition, 0 deletions

src/api/client_server/redact.rs
src/api/client_server/room.rs 2 additions, 1 deletion

src/api/client_server/room.rs
src/api/client_server/sync.rs 48 additions, 39 deletions

src/api/client_server/sync.rs
src/database/key_value/rooms/timeline.rs 0 additions, 2 deletions

src/database/key_value/rooms/timeline.rs
src/service/admin/mod.rs 1 addition, 1 deletion

src/service/admin/mod.rs
src/service/globals/mod.rs 2 additions, 0 deletions

src/service/globals/mod.rs
src/service/rooms/event_handler/mod.rs 16 additions, 1 deletion

src/service/rooms/event_handler/mod.rs
src/service/users/mod.rs 20 additions, 5 deletions

src/service/users/mod.rs

with 269 additions and 218 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