summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Don't create broken room when power_level_content_override.users does not con...Andrew Morgan2020-02-201-1/+13
|\
| * Don't create broken room when power_level_content_override.users does not con...Michael Telatynski2019-08-151-1/+13
* | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupAndrew Morgan2020-02-202-25/+65
|\|
| * Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-142-25/+65
| |\
| | * Retry well-known lookup before expiry.Erik Johnston2019-08-132-25/+65
* | | 1.3.0rc1Andrew Morgan2020-02-201-1/+1
|\| |
| * | 1.3.0rc1 v1.3.0rc1Brendan Abolivier2019-08-131-1/+1
* | | Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startupAndrew Morgan2020-02-201-1/+1
|\| |
| * | fix config being a dict, actuallyAmber H. Brown2019-08-141-1/+1
* | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopAndrew Morgan2020-02-203-21/+54
|\| |
| * | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopErik Johnston2019-08-133-21/+54
| |\ \ | | |/ | |/|
| | * Remove redundant returnErik Johnston2019-08-131-1/+0
| | * Clarify docstringErik Johnston2019-08-131-1/+1
| | * Handle pusher being deleted during processing.Erik Johnston2019-08-013-21/+55
* | | Don't load the media repo when configured to use an external media repo (#5754)Andrew Morgan2020-02-206-91/+172
|\| |
| * | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-136-91/+172
* | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownAndrew Morgan2020-02-202-149/+200
|\| |
| * | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-132-149/+200
| |\ \
| | * | Make default well known cache global again.Erik Johnston2019-08-131-1/+4
| | * | Move well known lookup into a separate clasErik Johnston2019-08-072-153/+197
| | * | Add a lower bound for TTL on well known results.Erik Johnston2019-08-061-0/+4
* | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesAndrew Morgan2020-02-201-128/+142
|\| | |
| * | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesErik Johnston2019-08-131-128/+142
| |\ \ \
| | * | | Don't unnecessarily block notifying of new events.Erik Johnston2019-08-061-128/+142
* | | | | Cross-signing [1/4] -- hidden devices (#5759)Andrew Morgan2020-02-203-10/+48
|\ \ \ \ \
| * | | | | Cross-signing [1/4] -- hidden devices (#5759)Hubert Chathi2019-08-123-10/+48
| | |_|/ / | |/| | |
* | | | | Merge pull request #5788 from matrix-org/rav/metaredactionsAndrew Morgan2020-02-201-101/+112
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-121-101/+112
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Handle loops in redaction eventsRichard van der Hoff2019-07-301-60/+36
| | * | | recursively fetch redactionsRichard van der Hoff2019-07-301-32/+36
| | * | | split _get_events_from_db out of _enqueue_eventsRichard van der Hoff2019-07-291-32/+51
| | * | | Return dicts from _fetch_event_listRichard van der Hoff2019-07-291-15/+27
* | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncAndrew Morgan2020-02-201-6/+37
|\| | | |
| * | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncErik Johnston2019-08-061-6/+37
| |\ \ \ \
| | * | | | Handle TimelineBatch being limited and empty.Erik Johnston2019-08-061-6/+37
| | | |/ / | | |/| |
* | | | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2020-02-201-3/+11
|\| | | |
| * | | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-3/+11
| |/ / /
* | | | Account validity: allow defining HTML templates to serve the us… (#5807)Andrew Morgan2020-02-201-3/+3
|\| | |
| * | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-015-11/+71
| |\ \ \
| | * | | LintBrendan Abolivier2019-08-012-16/+9
| | * | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-015-9/+76
* | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableAndrew Morgan2020-02-201-4/+3
|\| | | |
| * | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableErik Johnston2019-08-011-4/+3
| |\ \ \ \
| | * | | | Return 502 not 500 when failing to reach any remote server.Erik Johnston2019-08-011-4/+3
* | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2020-02-201-21/+21
|\| | | | |
| * | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2019-08-011-21/+21
* | | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorAndrew Morgan2020-02-201-1/+6
|\| | | | |
| * | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorErik Johnston2019-08-011-1/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Handle incorrectly encoded query params correctlyErik Johnston2019-08-011-1/+6
| | | |_|/ | | |/| |
* | | | | Merge pull request #5805 from matrix-org/erikj/validate_stateAndrew Morgan2020-02-201-2/+9
|\| | | |
| * | | | Merge pull request #5805 from matrix-org/erikj/validate_stateErik Johnston2019-08-011-2/+9
| |\ \ \ \
| | * | | | Validate well-known state events are state events.Erik Johnston2019-07-311-2/+9
* | | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneAndrew Morgan2020-02-201-0/+9
|\| | | | |
| * | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneErik Johnston2019-08-011-0/+9
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix spelling.Erik Johnston2019-08-011-1/+3
| | |/ / /
| | * | | Don't allow clients to send tombstones that reference the same roomErik Johnston2019-07-311-0/+7
* | | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomAndrew Morgan2020-02-201-1/+3
|\| | | |
| * | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-011-1/+3
| |\ \ \ \
| | * | | | Deny redaction of events in a different room.Erik Johnston2019-07-311-1/+3
| | |/ / /
* | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsAndrew Morgan2020-02-202-32/+60
|\| | | |
| * | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-012-32/+60
| |\ \ \ \
| | * | | | Don't log as exception when failing durig backfillErik Johnston2019-07-301-0/+3
| | * | | | Correctly handle errors doing requests to group serversErik Johnston2019-07-291-32/+57
* | | | | | Merge pull request #5804 from matrix-org/erikj/match_against_state_keyAndrew Morgan2020-02-201-1/+7
|\| | | | |
| * | | | | Explicitly check that tombstone is a state event before notifying.Erik Johnston2019-07-311-1/+7
| | |/ / / | |/| | |
* | | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2020-02-202-2/+2
|\| | | |
| * | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2019-07-311-1/+2
| * | | | Remove duplicate return statementAndrew Morgan2019-07-311-1/+0
* | | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownAndrew Morgan2020-02-202-11/+13
|\| | | |
| * | | | Share SSL options for well-known requestsErik Johnston2019-07-312-11/+13
* | | | | Merge pull request #5793 from matrix-org/erikj/fix_bg_updateAndrew Morgan2020-02-202-1/+22
|\| | | |
| * | | | Don't recreate columnErik Johnston2019-07-302-1/+22
| | |/ / | |/| |
* | | | Merge pull request #5792 from matrix-org/erikj/fix_bg_updateAndrew Morgan2020-02-202-1/+1
|\| | |
| * | | Fix current_state_events membership background update.Erik Johnston2019-07-302-1/+1
* | | | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keysAndrew Morgan2020-02-201-4/+3
|\| | |
| * | | Unwrap errorErik Johnston2019-07-301-1/+2
| * | | Fix error handling when fetching remote device keysErik Johnston2019-07-301-3/+1
* | | | Remove non-functional 'expire_access_token' setting (#5782)Andrew Morgan2020-02-203-30/+6
|\| | |
| * | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-303-30/+6
| | |/ | |/|
* | | Room Complexity Client Implementation (#5783)Andrew Morgan2020-02-205-11/+206
|\| |
| * | Room Complexity Client Implementation (#5783)Amber Brown2019-07-305-11/+206
| |/
* | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipAndrew Morgan2020-02-201-0/+6
|\|
| * Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipErik Johnston2019-07-291-0/+6
| |\
| | * Fix room summary when rejected events are in stateErik Johnston2019-07-261-0/+6
* | | Merge pull request #5752 from matrix-org/erikj/forgotten_userAndrew Morgan2020-02-202-35/+123
|\| |
| * | Merge pull request #5752 from matrix-org/erikj/forgotten_userErik Johnston2019-07-292-35/+123
| |\ \
| | * | Expand commentErik Johnston2019-07-291-0/+5
| | * | Remove lost commentErik Johnston2019-07-291-7/+0
| | |/
| | * Remove join when calculating room summaries.Erik Johnston2019-07-241-13/+21
| | * Remove join on room_memberships when fetching rooms for user.Erik Johnston2019-07-241-22/+36
| | * Add function to get all forgotten rooms for userErik Johnston2019-07-242-0/+68
* | | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteAndrew Morgan2020-02-203-4/+4
|\| |
| * | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteErik Johnston2019-07-291-2/+2
| |\ \
| | * | Fix current_state bg update to work on old SQLiteErik Johnston2019-07-291-2/+2
| * | | Move some timeout checking logs to DEBUG #5785 Amber Brown2019-07-302-2/+2
* | | | Update the device list cache when keys/query is called (#5693)Andrew Morgan2020-02-202-82/+136
|\| | |
| * | | Update the device list cache when keys/query is called (#5693)Jorik Schellekens2019-07-292-74/+136
| |/ /
| * | Add kwargs and docBrendan Abolivier2019-07-291-2/+4
| * | Add ability to pass arguments to looping callsBrendan Abolivier2019-07-291-2/+2
| * | Merge branch 'master' into developRichard van der Hoff2019-07-262-1/+5
| |\ \
| * \ \ Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-262-4/+37
| |\ \ \
* | \ \ \ 1.2.1Andrew Morgan2020-02-191-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 1.2.1Richard van der Hoff2019-07-261-1/+1
* | | | | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Andrew Morgan2020-02-193-4/+41
|\| | | |
| * | | | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-262-4/+37
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-262-4/+37
| * | | | Log when we receive receipt from a different originErik Johnston2019-07-261-13/+22
| * | | | Fix DoS when there is a cycle in redaction eventsRichard van der Hoff2019-07-261-0/+4
* | | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_idAndrew Morgan2020-02-191-0/+27
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_idRichard van der Hoff2019-07-251-0/+27
| |\| | |
| | * | | log when a redaction attempts to redact an event in a different roomRichard van der Hoff2019-07-251-0/+27
* | | | | Fix some error cases in the caching layer. (#5749)Andrew Morgan2020-02-191-32/+42
|\| | | |
| * | | | Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-251-32/+42
| * | | | Merge branch 'master' into developAndrew Morgan2019-07-251-1/+1
| |\| | |
| * | | | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-248-26/+75
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | 1.2.0Andrew Morgan2020-02-191-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 1.2.0 v1.2.0 github/release-v1.2.0 release-v1.2.0Andrew Morgan2019-07-251-1/+1
| | |/ / | |/| |
* | | | 1.2.0rc2Andrew Morgan2020-02-191-1/+1
|\| | |
| * | | 1.2.0rc2 v1.2.0rc2Andrew Morgan2019-07-241-1/+1
* | | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchAndrew Morgan2020-02-191-13/+22
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchErik Johnston2019-07-241-13/+22
| |\ \ \
| | * | | Log when we receive receipt from a different originErik Johnston2019-07-231-13/+22
* | | | | Stop trying to fetch events with event_id=None. (#5753)Andrew Morgan2020-02-193-11/+22
|\| | | |
| * | | | Stop trying to fetch events with event_id=None. (#5753)Richard van der Hoff2019-07-243-11/+22
* | | | | Fix servlet metric names (#5734)Andrew Morgan2020-02-197-25/+74
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix servlet metric names (#5734)Jorik Schellekens2019-07-247-25/+74
* | | | | Add a prometheus metric for active cache lookups. (#5750)Andrew Morgan2020-02-192-2/+33
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add a prometheus metric for active cache lookups. (#5750)Richard van der Hoff2019-07-242-2/+33
* | | | | Make Jaeger fully configurable (#5694)Andrew Morgan2020-02-192-4/+29
|\| | | |
| * | | | Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-232-4/+29
* | | | | Replace returnValue with return (#5736)Andrew Morgan2020-02-19162-1483/+1328
|\| | | |
| * | | | Replace returnValue with return (#5736)Amber Brown2019-07-23162-1488/+1333
| | |_|/ | |/| |
* | | | Opentracing Utils (#5722)Andrew Morgan2020-02-192-101/+356
|\| | |
| * | | Opentracing Utils (#5722)Jorik Schellekens2019-07-232-101/+356
* | | | Merge pull request #5732 from matrix-org/erikj/sdnotifyAndrew Morgan2020-02-1913-11/+59
|\| | |
| * | | Merge pull request #5732 from matrix-org/erikj/sdnotifyErik Johnston2019-07-2313-11/+59
| |\ \ \ | | |_|/ | |/| |
| | * | Call startup commands as system triggers.Erik Johnston2019-07-2211-11/+29
| | * | Add process hooks to tell systemd our state.Erik Johnston2019-07-222-0/+30
* | | | Merge pull request #5738 from matrix-org/erikj/faster_updateAndrew Morgan2020-02-191-18/+30
|\| | |
| * | | Speed up current state background update.Erik Johnston2019-07-231-18/+30
* | | | Fix logging in workers (#5729)Andrew Morgan2020-02-191-0/+1
|\| | |
| * | | Fix logging in workers (#5729)Amber Brown2019-07-221-0/+1
| * | | Merge pull request #5730 from matrix-org/erikj/cache_versionsErik Johnston2019-07-221-2/+21
| |\ \ \
* | | | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-typeAndrew Morgan2020-02-191-3/+3
|\| | | |
| * | | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-typeJason Robinson2019-07-221-3/+3
| |\ \ \ \
| | * | | | Add `user_type` to returned fields in admin API user list endpointsJason Robinson2019-07-221-3/+3
| | | |/ / | | |/| |
* | | | | Fix stack overflow in Keyring (#5724)Andrew Morgan2020-02-191-51/+41
|\| | | |
| * | | | Fix stack overflow in Keyring (#5724)Richard van der Hoff2019-07-221-51/+41
| |\ \ \ \
| | * | | | Add a delay to key lookup lock release to fix stack overflowRichard van der Hoff2019-07-191-2/+8
| | * | | | Refactor Keyring._start_key_lookupsRichard van der Hoff2019-07-191-51/+35
| * | | | | Merge tag 'v1.2.0rc1' into developAndrew Morgan2019-07-221-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
* | | | | Cache get_version_string.Andrew Morgan2020-02-191-2/+21
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Cache get_version_string.Erik Johnston2019-07-221-2/+21
| |/ / /
| * | | Merge branch 'release-v1.2.0' into developJorik Schellekens2019-07-222-12/+127
| |\ \ \
* | \ \ \ 1.2.0rc1Andrew Morgan2020-02-191-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 1.2.0rc1Andrew Morgan2019-07-221-1/+1
| | |/ / | |/| |
* | | | Opentracing Documentation (#5703)Andrew Morgan2020-02-192-12/+127
|\| | |
| * | | Opentracing Documentation (#5703)Jorik Schellekens2019-07-222-12/+127
* | | | Merge pull request #5720 from matrix-org/erikj/transactions_upsertAndrew Morgan2020-02-191-0/+20
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #5720 from matrix-org/erikj/transactions_upsertErik Johnston2019-07-191-0/+20
| |\ \ \
| | * | | Use upsert when updating destination retry intervalErik Johnston2019-07-191-0/+20
| | | |/ | | |/|
* | | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_stateAndrew Morgan2020-02-191-2/+6
|\| | |
| * | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_stateErik Johnston2019-07-191-2/+6
| |\ \ \
| | * | | Delegate to cached version when using get_filtered_current_state_idsErik Johnston2019-07-181-2/+6
* | | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_stateAndrew Morgan2020-02-194-21/+99
|\| | | |
| * | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_stateErik Johnston2019-07-197-41/+194
| |\ \ \ \
| | * | | | LoggingTransaction accepts None for callback lists.Erik Johnston2019-07-193-6/+16
| | * | | | Update comment for new columnErik Johnston2019-07-191-0/+3
| | * | | | Use the current_state_events.membership columnErik Johnston2019-07-181-17/+37
| | * | | | Track if current_state_events.membership is up to dateErik Johnston2019-07-181-0/+45
* | | | | | Don't accept opentracing data from clients. (#5715)Andrew Morgan2020-02-191-2/+1
|\| | | | |
| * | | | | Don't accept opentracing data from clients. (#5715)Jorik Schellekens2019-07-191-2/+1
* | | | | | Add 'rel' attribute to default welcome page. (#5695)Andrew Morgan2020-02-191-2/+2
|\| | | | |
| * | | | | Add 'rel' attribute to default welcome page. (#5695)Neil Johnson2019-07-191-2/+2
| | |_|/ / | |/| | |
* | | | | Remove non-dedicated logging options and command line arguments (#5678)Andrew Morgan2020-02-193-76/+13
|\| | | |
| * | | | Remove non-dedicated logging options and command line arguments (#5678)Amber Brown2019-07-192-75/+12
| | |_|/ | |/| |
| * | | enable aggregations support by defaultNeil Johnson2019-07-181-1/+1
| | |/ | |/|
* | | Clean up opentracing configuration options (#5712)Andrew Morgan2020-02-193-48/+61
|\| |
| * | Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-183-48/+61
* | | Support Prometheus_client 0.4.0+ (#5636)Andrew Morgan2020-02-1916-47/+288
|\| |
| * | Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-1816-47/+288
* | | Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2020-02-193-36/+66
|\| |
| * | Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-183-36/+66
* | | Add background update for current_state_events.membership columnAndrew Morgan2020-02-192-0/+54
|\ \ \ | | |/ | |/|
| * | Add background update for current_state_events.membership columnErik Johnston2019-07-182-0/+54
* | | Add membership column to current_state_events table.Andrew Morgan2020-02-195-20/+41
|\| |
| * | Add membership column to current_state_events table.Erik Johnston2019-07-185-20/+41
* | | Convert synapse.federation.transport.server to async (#5689)Andrew Morgan2020-02-191-242/+188
|\ \ \ | | |/ | |/|
| * | Convert synapse.federation.transport.server to async (#5689)Richard van der Hoff2019-07-181-242/+188
* | | Ignore redactions of m.room.create events (#5701)Andrew Morgan2020-02-193-24/+36
|\| |
| * | Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-173-24/+36
* | | More refactoring in `get_events_as_list` (#5707)Andrew Morgan2020-02-191-36/+36
|\| |
| * | More refactoring in `get_events_as_list` (#5707)Richard van der Hoff2019-07-171-27/+37
* | | Fix redaction authentication (#5700)Andrew Morgan2020-02-191-94/+138
|\| |
| * | Fix redaction authentication (#5700)Richard van der Hoff2019-07-171-85/+129
* | | Refactor `get_events_as_list` (#5699)Andrew Morgan2020-02-171-44/+67
|\| |
| * | Refactor `get_events_as_list` (#5699)Richard van der Hoff2019-07-171-48/+74
| |/
* | Merge pull request #5597 from matrix-org/erikj/admin_api_cmdAndrew Morgan2020-02-177-13/+356
|\|
| * Remove pointless descriptionErik Johnston2019-07-161-1/+0
| * Clean up arg name and remove lying commentErik Johnston2019-07-161-7/+5
| * Fix typo in synapse/app/admin_cmd.pyErik Johnston2019-07-161-1/+1
| * Fix invoking add_argument from homeserver.pyErik Johnston2019-07-151-1/+1
| * s/exfiltrate_user_data/export_user_data/Erik Johnston2019-07-151-1/+1
| * Add FileExfiltrationWriterErik Johnston2019-07-151-1/+69
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmdErik Johnston2019-07-15111-1621/+2238
| |\
| * | Use set_defaults(func=) styleErik Johnston2019-07-151-11/+8
| * | Move creation of ArgumentParser to callerErik Johnston2019-07-152-11/+8
| * | Fix up commentsErik Johnston2019-07-152-3/+3
| * | Change add_arguments to be a static methodErik Johnston2019-07-155-5/+39
| * | Add basic admin cmd appErik Johnston2019-07-023-6/+257
* | | Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2020-02-172-0/+25
|\ \ \ | | |/ | |/|
| * | Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2019-07-152-0/+25
* | | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataAndrew Morgan2020-02-173-6/+211
|\| |
| * | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-153-6/+211
| |\ \
| | * | Fixup docstringsErik Johnston2019-07-121-7/+5
| | * | pep8Erik Johnston2019-07-051-4/+0
| | * | Remove FileExfiltrationWriterErik Johnston2019-07-051-63/+0
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi...Erik Johnston2019-07-0584-1027/+1237
| | |\ \
| | * | | Assume key existence. Update docstringsErik Johnston2019-07-052-9/+11
| | * | | Fixup from review comments.Erik Johnston2019-07-041-17/+22
| | * | | Apply comment fixups from code reviewErik Johnston2019-07-031-6/+6
| | | |/ | | |/|
| | * | Add basic function to get all data for a user out of synapseErik Johnston2019-07-022-0/+267
* | | | Implement access token expiry (#5660)Andrew Morgan2020-02-178-25/+110
|\| | |
| * | | Implement access token expiry (#5660)Richard van der Hoff2019-07-127-20/+105
| * | | fix typo: backgroud -> backgroundAndrew Morgan2019-07-122-5/+5
* | | | small typo fix (#5655)Andrew Morgan2020-02-171-1/+1
|\| | |
| * | | small typo fix (#5655)Andrew Morgan2019-07-111-1/+1
* | | | Clean up exception handling for access_tokens (#5656)Andrew Morgan2020-02-174-86/+86
|\| | |
| * | | Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-114-93/+86
* | | | Add basic opentracing support (#5544)Andrew Morgan2020-02-1710-12/+615
|\| | |
| * | | Add basic opentracing support (#5544)Jorik Schellekens2019-07-1110-12/+615
* | | | Inline issue_access_token (#5659)Andrew Morgan2020-02-171-7/+3
|\| | |
| * | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-111-7/+3
* | | | Merge pull request #5658 from matrix-org/babolivier/is-jsonAndrew Morgan2020-02-171-1/+1
|\| | |
| * | | Merge pull request #5658 from matrix-org/babolivier/is-jsonBrendan Abolivier2019-07-101-1/+1
| |\ \ \
| | * | | TypoBrendan Abolivier2019-07-101-1/+1
| | * | | Send 3PID bind requests as JSON dataBrendan Abolivier2019-07-101-1/+1
* | | | | Remove access-token support from RegistrationStore.register (#5642)Andrew Morgan2020-02-172-21/+5
|\| | | |
| * | | | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-102-21/+5
| |/ / /
* | | | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2020-02-171-2/+12
|\| | |
| * | | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
* | | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonAndrew Morgan2020-02-171-4/+24
|\| | |
| * | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonBrendan Abolivier2019-07-091-4/+18
| |\ \ \
| | * \ \ Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-08105-1513/+1630
| | |\ \ \
| | * | | | LintBrendan Abolivier2019-07-081-1/+2
| | * | | | Use application/json when querying the IS's /store-invite endpointBrendan Abolivier2019-07-081-4/+17
* | | | | | remove unused and unnecessary check for FederationDeniedError (#5645)Andrew Morgan2020-02-171-4/+1
|\| | | | |
| * | | | | remove unused and unnecessary check for FederationDeniedError (#5645)Hubert Chathi2019-07-091-4/+1
* | | | | | Include the original event in /relations (#5626)Andrew Morgan2020-02-172-4/+6
|\| | | | |
| * | | | | Include the original event in /relations (#5626)Andrew Morgan2019-07-092-4/+6