Commit Graph

5622 Commits (f318d4f2a4b45aaab234a124d4db2bee986ba911)
 

Author SHA1 Message Date
Daniel Wagner-Hall f318d4f2a4 Inline _do_join as it now only has one caller 9 years ago
Daniel Wagner-Hall e71095801f Merge implementation of /join by alias or ID 9 years ago
Daniel Wagner-Hall dbeed36dec Merge some room joining codepaths 9 years ago
Daniel Wagner-Hall 4de08a4672 Revert "Merge two of the room join codepaths" 9 years ago
Daniel Wagner-Hall d7aa103f00 Merge pull request #575 from matrix-org/daniel/roomcleanup 9 years ago
Daniel Wagner-Hall cf81375b94 Merge two of the room join codepaths 9 years ago
Mark Haines 66f9a49ce9 Merge pull request #574 from matrix-org/markjh/connection_closed 9 years ago
Mark Haines 58c9f20692 Catch the exceptions thrown by twisted when you write to a closed connection 9 years ago
Erik Johnston ec0f3836ff Merge branch 'master' of github.com:matrix-org/synapse into develop 9 years ago
Daniel Wagner-Hall ee4f332ec5 Merge pull request #572 from matrix-org/daniel/exclusivity 9 years ago
Daniel Wagner-Hall dc6da63e30 Enforce user_id exclusivity for AS registrations 9 years ago
Erik Johnston 7e0a1683e6 Merge branch 'release-v0.13.3' of github.com:matrix-org/synapse 9 years ago
Erik Johnston 2a24f906a9 Bump version and changelog 9 years ago
Erik Johnston a79af259e9 Merge branch 'master' of github.com:matrix-org/synapse into develop 9 years ago
Erik Johnston ce14c7a995 Fix SYN-627, events are in incorrect room in /sync 9 years ago
Erik Johnston 88a973cde5 Merge branch 'release-v0.13.2' of github.com:matrix-org/synapse 9 years ago
Erik Johnston 1a830b751d Bump version and changelog 9 years ago
Erik Johnston abc1b22193 Merge pull request #570 from matrix-org/erikj/events_fixes 9 years ago
Erik Johnston 0eff740523 Return events in correct order for /events 9 years ago
Erik Johnston a1b7902944 Add some paranoia logging 9 years ago
Erik Johnston 7718303e71 Merge branch 'master' of github.com:matrix-org/synapse into develop 9 years ago
Matthew Hodgson 103b432c84 0.13.1 9 years ago
Matthew Hodgson a45cc801d2 bump for 0.13.1 9 years ago
Matthew Hodgson 7634687057 Merge branch 'master' of git+ssh://github.com/matrix-org/synapse 9 years ago
Matthew Hodgson b3ecb96e36 try to bump syweb to 0.6.8 9 years ago
Erik Johnston 907c1faf1e Merge branch 'release-v0.13.0' of github.com:matrix-org/synapse 9 years ago
Erik Johnston 6c3126d950 Update CHANGES 9 years ago
Erik Johnston 6e89e69d08 Bump version and changelog 9 years ago
Erik Johnston e66d0bd03a Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0 9 years ago
Erik Johnston 4a2ace1857 Merge pull request #569 from matrix-org/erikj/initial_sync 9 years ago
Erik Johnston 5189bfdef4 Batch fetch _get_state_groups_from_groups 9 years ago
Erik Johnston 24f00a6c33 Use _simple_select_many for _get_state_group_for_events 9 years ago
Erik Johnston 8e49892b21 Only calculate initial sync for 10 rooms at a time 9 years ago
Erik Johnston e557dc80b8 Merge pull request #566 from matrix-org/erikj/logcontext 9 years ago
Erik Johnston 4eb8f9ca8a Remove comment 9 years ago
Erik Johnston f7ef5c1d57 Merge pull request #568 from matrix-org/erikj/unread_notif 9 years ago
Erik Johnston 00c9ad49df s/parent_context/previous_context/ 9 years ago
Erik Johnston 9777c5f49a Set parent context on instansiation 9 years ago
Erik Johnston 0214745239 Rename functions 9 years ago
Erik Johnston 46a02ff15b Merge pull request #532 from floviolleau/floviolleau/documentation 9 years ago
Erik Johnston 6ad9586c84 Merge pull request #565 from matrix-org/erikj/macaroon_config 9 years ago
Erik Johnston 78a5482267 Typo 9 years ago
Erik Johnston 7b0d846407 Atomically persit push actions when we persist the event 9 years ago
Erik Johnston f28cc45183 Pass in current state to push action handler 9 years ago
Erik Johnston e664e9737c Fix test 9 years ago
Erik Johnston 13ba8d878c Fix test 9 years ago
Erik Johnston 78d6c1b5be Change a log from debug to info 9 years ago
Erik Johnston feb294d552 Remove dead code 9 years ago
Erik Johnston 70a8608749 Invalidate get_last_receipt_event_id_for_user cache 9 years ago
Erik Johnston 7e3b586c1e Merge pull request #567 from matrix-org/erikj/sync_ephemeral 9 years ago