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

3ccbd020

Commit 3ccbd020 authored 4 years ago by Timo Kösters

Downloads
- Plain Diff

Merge pull request 'Long polling and more' (#162) from longpoll into master

Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/162

parents cc411c53 e0d0fb47

No related branches found

No related tags found

No related merge requests found

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Cargo.lock 48 additions, 47 deletions

Cargo.lock
Cargo.toml 6 additions, 2 deletions

Cargo.toml
src/client_server.rs 541 additions, 552 deletions

src/client_server.rs
src/database.rs 76 additions, 6 deletions

src/database.rs
src/database/account_data.rs 13 additions, 6 deletions

src/database/account_data.rs
src/database/global_edus.rs 0 additions, 62 deletions

src/database/global_edus.rs
src/database/rooms.rs 26 additions, 31 deletions

src/database/rooms.rs
src/database/rooms/edus.rs 190 additions, 2 deletions

src/database/rooms/edus.rs
src/database/users.rs 76 additions, 13 deletions

src/database/users.rs
src/main.rs 3 additions, 1 deletion

src/main.rs
src/pdu.rs 84 additions, 24 deletions

src/pdu.rs
src/ruma_wrapper.rs 3 additions, 3 deletions

src/ruma_wrapper.rs
sytest/sytest-whitelist 1 addition, 2 deletions

sytest/sytest-whitelist

with 1067 additions and 751 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