summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Allow moving group read APIs to workers (#6866)Erik Johnston2020-02-071-131/+139
* Admin api to add an email address (#6789)Dirk Klimpel2020-02-072-0/+10
* Limit the number of events that can be requested when backfilling events (#6864)Patrick Cloke2020-02-061-0/+4
* pass room version into FederationClient.send_join (#6854)Richard van der Hoff2020-02-061-2/+1
* Third party event rules Update (#6781)PeerD2020-02-061-1/+5
* Reduce amount of logging at INFO level. (#6862)Erik Johnston2020-02-064-11/+11
* Merge pull request #6823 from matrix-org/rav/redact_changes/5Richard van der Hoff2020-02-061-6/+2
|\
| * Pass room version object into `FederationClient.get_pdu`Richard van der Hoff2020-02-051-6/+2
* | Merge tag 'v1.10.0rc2' into developErik Johnston2020-02-064-17/+69
|\ \ | |/ |/|
| * Check sender_key matches on inbound encrypted events. (#6850)Erik Johnston2020-02-052-14/+66
| * Fix detecting unknown devices from remote encrypted events. (#6848)Erik Johnston2020-02-043-3/+3
* | Merge pull request #6837 from matrix-org/rav/federation_asyncRichard van der Hoff2020-02-043-235/+211
|\ \
| * | make FederationHandler.send_invite asyncRichard van der Hoff2020-02-032-6/+4
| * | make FederationHandler.on_get_missing_events asyncRichard van der Hoff2020-02-031-5/+4
| * | make FederationHandler.user_joined_room asyncRichard van der Hoff2020-02-031-3/+3
| * | make FederationHandler._clean_room_for_join asyncRichard van der Hoff2020-02-031-4/+4
| * | make FederationHandler._notify_persisted_event asyncRichard van der Hoff2020-02-031-4/+6
| * | make FederationHandler.persist_events_and_notify asyncRichard van der Hoff2020-02-031-10/+10
| * | make FederationHandler._make_and_verify_event asyncRichard van der Hoff2020-02-031-5/+10
| * | make FederationHandler.do_remotely_reject_invite asyncRichard van der Hoff2020-02-032-8/+11
| * | make FederationHandler._check_for_soft_fail asyncRichard van der Hoff2020-02-031-13/+9
| * | make FederationHandler._persist_auth_tree asyncRichard van der Hoff2020-02-031-11/+7
| * | make FederationHandler.do_invite_join asyncRichard van der Hoff2020-02-032-18/+18
| * | make FederationHandler.on_event_auth asyncRichard van der Hoff2020-02-031-5/+4
| * | make FederationHandler.on_exchange_third_party_invite_request asyncRichard van der Hoff2020-02-031-14/+12
| * | make FederationHandler.construct_auth_difference asyncRichard van der Hoff2020-02-031-3/+4
| * | make FederationHandler._update_context_for_auth_events asyncRichard van der Hoff2020-02-031-10/+10
| * | make FederationHandler._update_auth_events_and_context_for_auth asyncRichard van der Hoff2020-02-031-20/+21
| * | make FederationHandler.do_auth asyncRichard van der Hoff2020-02-031-10/+14
| * | make FederationHandler._prep_event asyncRichard van der Hoff2020-02-031-23/+10
| * | make FederationHandler._handle_new_event asyncRichard van der Hoff2020-02-031-6/+7
| * | make FederationHandler._handle_new_events asyncRichard van der Hoff2020-02-031-8/+6
| * | make FederationHandler.on_make_leave_request asyncRichard van der Hoff2020-02-031-13/+10
| * | make FederationHandler.on_send_leave_request asyncRichard van der Hoff2020-02-031-5/+3
| * | make FederationHandler.on_make_join_request asyncRichard van der Hoff2020-02-031-13/+10
| * | make FederationHandler.on_invite_request asyncRichard van der Hoff2020-02-031-5/+4
| * | make FederationHandler.on_send_join_request asyncRichard van der Hoff2020-02-031-9/+7
| * | make FederationHandler.on_query_auth asyncRichard van der Hoff2020-02-031-7/+6
| |/
* / Add typing to SyncHandler (#6821)Erik Johnston2020-02-031-341/+364
|/
* pass room_version into compute_event_signature (#6807)Richard van der Hoff2020-01-311-1/+4
* Merge pull request #6820 from matrix-org/rav/get_room_version_idRichard van der Hoff2020-01-314-14/+16
|\
| * s/get_room_version/get_room_version_id/Richard van der Hoff2020-01-314-14/+16
* | Fix bug with getting missing auth event during join 500'ed (#6810)Erik Johnston2020-01-311-1/+5
|/
* pass room version into FederationHandler.on_invite_request (#6805)Richard van der Hoff2020-01-301-3/+3
* Resync remote device list when detected as stale. (#6786)Erik Johnston2020-01-302-4/+24
* Make /directory/room/<alias> handle restrictive power levelsRichard van der Hoff2020-01-291-1/+6
* Set the PL for aliases events to 0.Richard van der Hoff2020-01-291-2/+15
* Factor out a `copy_power_levels_contents` methodRichard van der Hoff2020-01-291-12/+11
* Fix bug when querying remote user keys that require a resync. (#6796)Erik Johnston2020-01-291-1/+2
* Detect unknown remote devices and mark cache as stale (#6776)Erik Johnston2020-01-282-2/+75
* Pass room version object into event_auth.check and check_redaction (#6788)Richard van der Hoff2020-01-282-9/+17
* Add `rooms.room_version` column (#6729)Erik Johnston2020-01-272-35/+82
* Validate client_secret parameter (#6767)Andrew Morgan2020-01-241-1/+3
* Remove unnecessary abstractions in admin handler (#6751)Andrew Morgan2020-01-221-62/+0
* Add more logging around message retention policies support (#6717)Brendan Abolivier2020-01-171-0/+13
* Merge pull request #6714 from matrix-org/babolivier/retention_select_eventBrendan Abolivier2020-01-171-1/+1
|\
| * Fix instantiation of message retention purge jobsBrendan Abolivier2020-01-151-1/+1
* | Merge pull request #6724 from matrix-org/rav/log_saml_attributesRichard van der Hoff2020-01-171-1/+12
|\ \
| * | Log saml assertions rather than the whole responseRichard van der Hoff2020-01-161-1/+12
* | | Delegate remote_user_id mapping to the saml mapping provider (#6723)Richard van der Hoff2020-01-171-6/+21
|/ /
* | Add StateMap type alias (#6715)Erik Johnston2020-01-163-28/+31
* | Port synapse.replication.tcp to async/await (#6666)Erik Johnston2020-01-161-1/+1
* | Add `local_current_membership` table (#6655)Erik Johnston2020-01-156-6/+6
|/
* Kill off RegistrationError (#6691)Richard van der Hoff2020-01-131-9/+3
* Don't assign numeric IDs for empty usernames (#6690)Richard van der Hoff2020-01-131-1/+1
* Pass client redirect URL into SAML mapping providersRichard van der Hoff2020-01-121-4/+11
* Pass the module_api into the SamlMappingProviderRichard van der Hoff2020-01-121-2/+5
* Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-091-0/+9
* Correctly proxy remote group HTTP errors. (#6654)Erik Johnston2020-01-071-0/+16
* Merge pull request #6652 from matrix-org/babolivier/depth_missing_eventsBrendan Abolivier2020-01-071-2/+2
|\
| * Fix conditions failing if min_depth = 0Brendan Abolivier2020-01-071-2/+2
* | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesRichard van der Hoff2020-01-062-34/+20
|\ \
| * | Remove unused hashes and depths from _update_membership paramsRichard van der Hoff2020-01-061-13/+4
| * | Remove unused hashes and depths from create_event paramsRichard van der Hoff2020-01-062-17/+12
| * | Remove unused hashes and depths from create_new_client_event paramsRichard van der Hoff2020-01-061-12/+14
| * | replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in ...Richard van der Hoff2020-01-061-9/+3
| * | rename get_prev_events_for_room to get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-062-3/+7
* | | Fix some test failures when frozen_dicts are enabled (#6642)Richard van der Hoff2020-01-062-6/+11
* | | Fix an error which was thrown by the PresenceHandler _on_shutdown handler. (#...Richard van der Hoff2020-01-061-7/+2
|/ /
* / Fix power levels being incorrectly set in old and new rooms after a room upgr...Andrew Morgan2020-01-061-7/+10
|/
* Merge branch 'master' into developRichard van der Hoff2019-12-201-1/+4
|\
| * Fix exceptions when attempting to backfill (#6576)Richard van der Hoff2019-12-201-1/+4
* | Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-205-16/+16
* | Port some admin handlers to async/await (#6559)Erik Johnston2019-12-192-54/+41
* | Add database config class (#6513)Erik Johnston2019-12-181-1/+1
* | Merge release-v1.7.1 into developRichard van der Hoff2019-12-182-2/+6
|\|
| * Merge pull request #6553 from matrix-org/babolivier/fix-context-filterBrendan Abolivier2019-12-161-2/+5
| |\
| | * Incorporate reviewBrendan Abolivier2019-12-161-1/+1
| | * Use the filtered version of an event when responding to /context requests for...Brendan Abolivier2019-12-161-1/+4
| * | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-1/+1
| * | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-161-163/+80
| * | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-161-0/+1
| * | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-161-24/+54
| * | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-161-18/+21
| * | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-161-6/+95
| |/
* | Remove unused `get_pagination_rows` methods. (#6557)Erik Johnston2019-12-173-18/+0
* | Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-161-1/+5
* | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-1/+1
* | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-161-167/+80
* | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-131-0/+1
* | Merge pull request #6496 from matrix-org/erikj/initial_sync_asnycErik Johnston2019-12-131-52/+44
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sy...Erik Johnston2019-12-118-236/+452
| |\ \
| * | | Port synapse.handlers.initial_sync to async/awaitErik Johnston2019-12-091-52/+44
* | | | look up cross-signing keys from the DB in bulk (#6486)Hubert Chathi2019-12-121-8/+27
* | | | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-121-23/+51
| |/ / |/| |
* | | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-111-22/+28
* | | Merge pull request #6517 from matrix-org/rav/event_auth/13Richard van der Hoff2019-12-112-98/+88
|\ \ \
| * | | convert to async: FederationHandler._process_received_pduRichard van der Hoff2019-12-111-11/+10
| * | | convert to async: FederationHandler._get_state_for_roomRichard van der Hoff2019-12-111-21/+21
| * | | convert to async: FederationHandler.on_receive_pduRichard van der Hoff2019-12-111-27/+22
| * | | Convert federation backfill to asyncRichard van der Hoff2019-12-112-39/+35
* | | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_awaitErik Johnston2019-12-112-55/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Port handlers.account_validity to async/await.Erik Johnston2019-12-102-47/+41
| * | | Port handlers.account_data to async/await.Erik Johnston2019-12-101-9/+5
| | |/ | |/|
* | | Clean up some logging (#6515)Richard van der Hoff2019-12-111-18/+19
* | | Prevent redacted events from appearing in message search (#6377)Andrew Morgan2019-12-112-4/+8
* | | Prevent message search in upgraded rooms we're not in (#6385)Andrew Morgan2019-12-112-11/+27
* | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-101-6/+95
* | | Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-101-28/+170
* | | Merge pull request #6506 from matrix-org/erikj/remove_snapshot_cacheErik Johnston2019-12-101-11/+8
|\ \ \ | |/ / |/| / | |/
| * Remove SnapshotCache in favour of ResponseCacheErik Johnston2019-12-091-11/+8
* | Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Neil Johnson2019-12-091-30/+8
|/
* Merge pull request #6493 from matrix-org/erikj/invite_state_configErik Johnston2019-12-091-1/+3
|\
| * Pull out room_invite_state_types config option once.Erik Johnston2019-12-091-1/+3
* | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-093-152/+131
|\ \ | |/ |/|
| * Fixup functions to consistently return deferredsErik Johnston2019-12-062-4/+4
| * Port SyncHandler to async/awaitErik Johnston2019-12-052-151/+130
* | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-051-9/+12
|/
* Stronger typing in the federation handler (#6480)Richard van der Hoff2019-12-051-24/+57
* Sanity-check the rooms of auth events before pulling them in. (#6472)Richard van der Hoff2019-12-051-9/+25
* get rid of (most of) have_events from _update_auth_events_and_context_for_aut...Richard van der Hoff2019-12-041-38/+24
* Merge pull request #6441 from syamgk/fix-parameter-mismatchErik Johnston2019-12-041-1/+1
|\
| * Issue #6406 Fix parameter mismatchSyam G Krishnan2019-12-041-1/+1
* | Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-041-2/+12
|\ \
| * \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0414-192/+395
| |\ \
| * | | Incorporate reviewBrendan Abolivier2019-12-041-2/+1
| * | | Also filter state eventsBrendan Abolivier2019-11-061-1/+7
| * | | Only filter if a filter was providedBrendan Abolivier2019-11-051-4/+6
| * | | Update copyrightBrendan Abolivier2019-11-051-1/+2
| * | | Filter events_before and events_after in /context requestsBrendan Abolivier2019-11-051-2/+4
* | | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-032-1/+130
| |/ / |/| |
* | | Transfer power level state events on room upgrade (#6237)Andrew Morgan2019-12-021-5/+31
| |/ |/|
* | Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasonsErik Johnston2019-11-293-7/+15
|\ \
| * | Propagate reason in remotely rejected invitesErik Johnston2019-11-283-7/+15
* | | Discard retention policies when retrieving stateBrendan Abolivier2019-11-281-1/+1
|/ /
* | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-281-0/+3
* | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-50/+80
* | Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-273-4/+110
|\ \
| * \ Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-269-88/+111
| |\ \
| * | | Fix 3PID invite exchangeBrendan Abolivier2019-11-191-1/+1
| * | | LintBrendan Abolivier2019-11-191-11/+6
| * | | Implement per-room message retention policiesBrendan Abolivier2019-11-043-3/+114
| | |/ | |/|
* | | Merge pull request #6343 from matrix-org/rav/event_auth/4Richard van der Hoff2019-11-261-37/+44
|\ \ \ | |_|/ |/| |
| * | remove confusing fixmeRichard van der Hoff2019-11-261-6/+0
| * | Merge remote-tracking branch 'origin/develop' into rav/event_auth/4Richard van der Hoff2019-11-186-11/+11
| |\ \
| * | | Use get_events_as_list rather than lots of calls to get_eventRichard van der Hoff2019-11-081-16/+8
| * | | Update some docstrings and commentsRichard van der Hoff2019-11-081-8/+31
| * | | Simplify _update_auth_events_and_context_for_authRichard van der Hoff2019-11-081-11/+9
* | | | Merge pull request #6332 from matrix-org/erikj/query_devices_fixErik Johnston2019-11-261-3/+16
|\ \ \ \
| * | | | Fix caching devices for remote servers in worker.Erik Johnston2019-11-051-3/+16
| | |_|/ | |/| |
* | | | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-211-1/+1
* | | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanupsBrendan Abolivier2019-11-201-53/+31
|\ \ \ \ | |_|_|/ |/| | |
| * | | Apply suggestions from code reviewErik Johnston2019-11-181-2/+2
| * | | Add failed auth ratelimiting to UIAErik Johnston2019-11-061-1/+32
| * | | Only do `rc_login` ratelimiting on succesful login.Erik Johnston2019-11-061-54/+1
| |/ /
* | / Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-126-11/+11
| |/ |/|
* | Merge pull request #6295 from matrix-org/erikj/split_purge_historyErik Johnston2019-11-081-2/+4
|\ \
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-0416-144/+357
| |\|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-10-3115-69/+95
| |\ \
| * | | Split purge API into events vs stateErik Johnston2019-10-301-2/+5
* | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groupsAndrew Morgan2019-11-071-0/+9
|\ \ \ \
| * | | | Re-add docstring, with caveats detailedAndrew Morgan2019-11-041-1/+1
| * | | | Transfer upgraded rooms on groupsAndrew Morgan2019-11-041-0/+9
| | |_|/ | |/| |
* | | | raise exception after multiple failuresAndrew Morgan2019-11-061-3/+10
* | | | Address review commentsAndrew Morgan2019-11-061-12/+12
* | | | Don't forget to ratelimit calls outside of RegistrationHandlerAndrew Morgan2019-11-061-2/+2
* | | | Numeric ID checker now checks @0, don't ratelimit on checkingAndrew Morgan2019-11-061-16/+25
* | | | Fix bug which caused rejected events to be stored with the wrong room state ...Richard van der Hoff2019-11-061-0/+1
* | | | Add some checks that we aren't using state from rejected events (#6330)Richard van der Hoff2019-11-051-1/+5
|/ / /
* | | Factor out an _AsyncEventContextImpl (#6298)Richard van der Hoff2019-11-011-19/+19
* | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-011-1/+1
* | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2019-11-011-1/+1
* | | Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-013-29/+90
* | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3121-153/+202
|\ \ \
| * | | Update black to 19.10b0 (#6304)Amber Brown2019-11-0113-84/+106
| | |/ | |/|
| * | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-3110-40/+63
| |\ \
| | * | Port to use state storageErik Johnston2019-10-3010-40/+63
| | |/
| * / Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-319-29/+33
| |/
* | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-305-39/+43
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-304-37/+39
| |\
| | * Fix log line that was printing undefined value (#6278)Andrew Morgan2019-10-301-1/+1
| | * Port receipt and read markers to async/waitErik Johnston2019-10-292-33/+17
| | * Improve signature checking on some federation APIs (#6262)Richard van der Hoff2019-10-281-2/+18
| | * Remove repeated calls to config.stats_enabled.Erik Johnston2019-10-251-1/+3
| * | Use new EventPersistenceStoreErik Johnston2019-10-232-2/+4
| |/
* | blackHubert Chathi2019-10-301-1/+3
* | apply changes as a result of PR reviewHubert Chathi2019-10-301-12/+10
* | don't error if federation query doesn't have cross-signing keysHubert Chathi2019-10-241-7/+9
* | blackHubert Chathi2019-10-221-1/+2
* | vendor-prefix the EDU name until MSC1756 is merged into the specHubert Chathi2019-10-221-1/+2
* | update to work with newer code, and fix formattingHubert Chathi2019-10-222-5/+6
* | add missing paramHubert Chathi2019-10-221-1/+1
* | make black happyHubert Chathi2019-10-221-5/+7
* | implement federation parts of cross-signingHubert Chathi2019-10-222-3/+126
|/
* Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Hubert Chathi2019-10-221-1/+390
|\
| * Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-1818-851/+1390
| |\
| * | fix doc stringsHubert Chathi2019-10-181-9/+13
| * | make isort happyHubert Chathi2019-09-241-1/+0
| * | add some commentsHubert Chathi2019-09-241-2/+10
| * | drop some logger lines to debugHubert Chathi2019-09-241-3/+3
| * | make changes based on PR feedbackHubert Chathi2019-09-241-107/+159
| * | add function docsHubert Chathi2019-09-071-2/+24
| * | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-075-114/+280
| |\ \
| * | | run blackHubert Chathi2019-09-061-24/+10
| * | | split out signature processing into separate functionsHubert Chathi2019-09-061-195/+204
| * | | avoid modifying input parameterHubert Chathi2019-09-051-7/+7
| * | | update with newer coding styleHubert Chathi2019-09-041-1/+1
| * | | make black happyHubert Chathi2019-09-041-78/+69
| * | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-82/+150
| * | | implement device signature uploading/fetchingHubert Chathi2019-09-041-0/+250
* | | | Remove Auth.check method (#6217)Richard van der Hoff2019-10-181-3/+4
| |_|/ |/| |
* | | Merge branch 'uhoreg/e2e_cross-signing_merged' into developHubert Chathi2019-10-183-6/+216
|\ \ \
| * \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-1818-746/+1387
| |\ \ \
| * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-075-114/+280
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0417-485/+228
| |\ \ \
| * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2816-65/+412
| |\ \ \ \
| * | | | | blackHubert Chathi2019-08-281-3/+1
| * | | | | use stream ID generator instead of timestampHubert Chathi2019-08-281-4/+3
| * | | | | make isort happyHubert Chathi2019-08-211-1/+0
| * | | | | apply PR review suggestionsHubert Chathi2019-08-211-42/+34
| * | | | | make changes from PR reviewHubert Chathi2019-08-011-6/+18
| * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0132-462/+638
| |\ \ \ \ \
| * | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-253-6/+216
* | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-181-4/+9
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-181-4/+9
* | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-182-10/+4
|\| | | | | |
| * | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-111-8/+2
| |\ \ \ \ \ \
| | * | | | | | make sure we actually return somethingHubert Chathi2019-10-101-0/+5
| | * | | | | | make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-101-11/+0
| * | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-091-2/+2
| | |/ / / / / /
* | / / / / / / rip out some unreachable codeRichard van der Hoff2019-10-171-102/+0
|/ / / / / / /
* | | | | | | Add domain validation when creating room with list of invitees (#6121)werner2912019-10-101-1/+3
* | | | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-103-14/+31
* | | | | | | Move tag/push rules room upgrade checking ealier (#6155)Andrew Morgan2019-10-101-18/+44
|/ / / / / /
* | | | | | Remove unused public room list timeout param (#6179)Andrew Morgan2019-10-081-12/+1
* | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failureErik Johnston2019-10-071-6/+4
|\ \ \ \ \ \
| * | | | | | Remove unused variableErik Johnston2019-10-031-2/+0
| * | | | | | Don't regenerate numeric user ID if registration fails.Erik Johnston2019-10-031-4/+4
* | | | | | | add some logging to the rooms stats updates, to try to track down a flaky tes...Richard van der Hoff2019-10-071-0/+1