Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Add GET method to admin API /users/@user:dom/admin | Olivier Wilkinson (reivilibre) | 2019-08-27 | 3 | -9/+42 | |
* | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | reivilibre | 2019-08-28 | 3 | -16/+95 | |
|\ \ \ \ | ||||||
| * | | | | Use MSC2197 on stable prefix as it has almost finished FCP | Olivier Wilkinson (reivilibre) | 2019-08-20 | 2 | -26/+4 | |
| * | | | | Add support for inbound MSC2197 requests on unstable Federation API | Olivier Wilkinson (reivilibre) | 2019-08-15 | 1 | -1/+59 | |
| * | | | | Support MSC2197 outbound with unstable prefix | Olivier Wilkinson (reivilibre) | 2019-08-15 | 2 | -16/+59 | |
* | | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookups | Erik Johnston | 2019-08-27 | 2 | -208/+217 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix off by one error in SRV result shuffling | Erik Johnston | 2019-08-27 | 1 | -8/+13 | |
| * | | | | | Fixup comments | Erik Johnston | 2019-08-23 | 1 | -1/+9 | |
| * | | | | | Fix logcontexts | Erik Johnston | 2019-08-23 | 1 | -4/+8 | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reliable_l... | Erik Johnston | 2019-08-22 | 29 | -243/+742 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Remove now unused pick_server_from_list | Erik Johnston | 2019-08-20 | 1 | -30/+0 | |
| * | | | | | | Fixup _sort_server_list to be slightly more efficient | Erik Johnston | 2019-08-20 | 1 | -2/+11 | |
| * | | | | | | Refactor MatrixFederationAgent to retry SRV. | Erik Johnston | 2019-08-15 | 2 | -189/+202 | |
* | | | | | | | Allow schema deltas to be engine-specific (#5911) | reivilibre | 2019-08-27 | 1 | -5/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Code style (Black) | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -3/+1 | |
| * | | | | | | | Allow schema deltas to be engine-specific | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -5/+21 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limit | Richard van der Hoff | 2019-08-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Increase max display name limit | Neil Johnson | 2019-08-24 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #5895 from matrix-org/erikj/notary_key | Erik Johnston | 2019-08-27 | 3 | -26/+47 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't implicitly include server signing key | Erik Johnston | 2019-08-23 | 1 | -7/+6 | |
| * | | | | | | | Fixup review comments | Erik Johnston | 2019-08-23 | 2 | -4/+4 | |
| * | | | | | | | Only sign when we respond to remote key requests | Erik Johnston | 2019-08-21 | 2 | -23/+16 | |
| * | | | | | | | Add config option for keys to use to sign keys | Erik Johnston | 2019-08-21 | 2 | -9/+38 | |
* | | | | | | | | Merge pull request #5909 from aaronraimist/public_base_url | Richard van der Hoff | 2019-08-27 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | public_base_url is actually public_baseurl | Aaron Raimist | 2019-08-26 | 2 | -2/+2 | |
| | |/ / / / / | |/| | | | | | ||||||
* / | | | | | | Add Admin API capability to set adminship of a user (#5878) | reivilibre | 2019-08-27 | 4 | -0/+111 | |
|/ / / / / / | ||||||
* | | | | | | Propagate opentracing contexts through EDUs (#5852) | Jorik Schellekens | 2019-08-22 | 7 | -92/+208 | |
* | | | | | | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis... | Richard van der Hoff | 2019-08-22 | 1 | -53/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove shared secret registration from client/r0/register endpoint | Manuel Stahl | 2019-08-22 | 1 | -53/+4 | |
* | | | | | | | Opentracing across workers (#5771) | Jorik Schellekens | 2019-08-22 | 4 | -83/+122 | |
* | | | | | | | Revert "Do not send consent notices if "no-consent-required" is set" | Brendan Abolivier | 2019-08-22 | 1 | -4/+0 | |
* | | | | | | | Revert "Add "require_consent" parameter for registration" | Brendan Abolivier | 2019-08-22 | 3 | -18/+3 | |
* | | | | | | | Do not send consent notices if "no-consent-required" is set | Half-Shot | 2019-08-22 | 1 | -0/+4 | |
* | | | | | | | Add "require_consent" parameter for registration | Half-Shot | 2019-08-22 | 3 | -3/+18 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail | Erik Johnston | 2019-08-22 | 2 | -37/+115 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Change jitter to be a factor rather than absolute value | Erik Johnston | 2019-08-20 | 1 | -11/+12 | |
| * | | | | | | Fixup changelog and remove debug logging | Erik Johnston | 2019-08-16 | 1 | -4/+1 | |
| * | | | | | | Retry well known on fail. | Erik Johnston | 2019-08-15 | 2 | -34/+114 | |
* | | | | | | | Opentrace e2e keys (#5855) | Jorik Schellekens | 2019-08-22 | 6 | -7/+141 | |
* | | | | | | | Add missing index on users_in_public_rooms. (#5894) | Richard van der Hoff | 2019-08-22 | 1 | -0/+17 | |
* | | | | | | | Servlet to purge old rooms (#5845) | Richard van der Hoff | 2019-08-22 | 4 | -0/+213 | |
* | | | | | | | Improve error msg when key-fetch fails (#5896) | Richard van der Hoff | 2019-08-22 | 1 | -5/+7 | |
* | | | | | | | Drop some unused tables. (#5893) | Richard van der Hoff | 2019-08-21 | 3 | -47/+22 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Refactor the Appservice scheduler code (#5886) | Richard van der Hoff | 2019-08-20 | 1 | -45/+65 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Refactor the Appservice scheduler code | Richard van der Hoff | 2019-08-20 | 1 | -45/+65 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Avoid deep recursion in appservice recovery (#5885) | Richard van der Hoff | 2019-08-20 | 1 | -18/+25 | |
* | | | | | | Opentracing doc update (#5776) | Jorik Schellekens | 2019-08-20 | 1 | -27/+40 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_comments | Erik Johnston | 2019-08-19 | 1 | -17/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove logging for #5407 and update comments | Erik Johnston | 2019-08-15 | 1 | -17/+5 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-08-17 | 4 | -13/+39 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | 1.3.1 v1.3.1 github/release-v1.3.1 release-v1.3.1 | Richard van der Hoff | 2019-08-17 | 1 | -1/+1 | |
| * | | | | Drop dependency on sdnotify (#5871) | Richard van der Hoff | 2019-08-17 | 2 | -11/+37 | |
| * | | | | Fix issue with Synapse not starting up. Fixes #5866. | Chris Moos | 2019-08-16 | 1 | -1/+1 | |
* | | | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_index | Hubert Chathi | 2019-08-16 | 2 | -1/+19 | |
|\ \ \ \ \ | ||||||
| * | | | | | update set_e2e_room_key to agree with fixed index | Hubert Chathi | 2019-08-14 | 1 | -1/+1 | |
| * | | | | | add the version field to the index for e2e_room_keys | Hubert Chathi | 2019-08-14 | 1 | -0/+18 | |
* | | | | | | Opentracing misc (#5856) | Jorik Schellekens | 2019-08-16 | 3 | -16/+24 | |
* | | | | | | Fix up password reset template config names (#5863) | Andrew Morgan | 2019-08-15 | 2 | -10/+10 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-08-15 | 2 | -3/+9 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | 1.3.0 v1.3.0 github/release-v1.3.0 release-v1.3.0 | Brendan Abolivier | 2019-08-15 | 1 | -1/+1 | |
| * | | | | Wrap `get_local_public_room_list` call in `maybeDeferred` because it | Olivier Wilkinson (reivilibre) | 2019-08-14 | 1 | -2/+8 | |
| | |_|/ | |/| | | ||||||
* | | | | Don't create broken room when power_level_content_override.users does not con... | Michael Telatynski | 2019-08-15 | 1 | -1/+13 | |
| |_|/ |/| | | ||||||
* | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookup | Erik Johnston | 2019-08-14 | 2 | -25/+65 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Retry well-known lookup before expiry. | Erik Johnston | 2019-08-13 | 2 | -25/+65 | |
* | | | 1.3.0rc1 v1.3.0rc1 | Brendan Abolivier | 2019-08-13 | 1 | -1/+1 | |
* | | | fix config being a dict, actually | Amber H. Brown | 2019-08-14 | 1 | -1/+1 | |
* | | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stop | Erik Johnston | 2019-08-13 | 3 | -21/+54 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Remove redundant return | Erik Johnston | 2019-08-13 | 1 | -1/+0 | |
| * | | Clarify docstring | Erik Johnston | 2019-08-13 | 1 | -1/+1 | |
| * | | Handle pusher being deleted during processing. | Erik Johnston | 2019-08-01 | 3 | -21/+55 | |
* | | | Don't load the media repo when configured to use an external media repo (#5754) | Amber Brown | 2019-08-13 | 6 | -91/+172 | |
* | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known | Erik Johnston | 2019-08-13 | 2 | -149/+200 | |
|\ \ \ | ||||||
| * | | | Make default well known cache global again. | Erik Johnston | 2019-08-13 | 1 | -1/+4 | |
| * | | | Move well known lookup into a separate clas | Erik Johnston | 2019-08-07 | 2 | -153/+197 | |
| * | | | Add a lower bound for TTL on well known results. | Erik Johnston | 2019-08-06 | 1 | -0/+4 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pauses | Erik Johnston | 2019-08-13 | 1 | -128/+142 | |
|\ \ \ | ||||||
| * | | | Don't unnecessarily block notifying of new events. | Erik Johnston | 2019-08-06 | 1 | -128/+142 | |
* | | | | Merge pull request #5788 from matrix-org/rav/metaredactions | Richard van der Hoff | 2019-08-12 | 1 | -101/+112 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Handle loops in redaction events | Richard van der Hoff | 2019-07-30 | 1 | -60/+36 | |
| * | | | recursively fetch redactions | Richard van der Hoff | 2019-07-30 | 1 | -32/+36 | |
| * | | | split _get_events_from_db out of _enqueue_events | Richard van der Hoff | 2019-07-29 | 1 | -32/+51 | |
| * | | | Return dicts from _fetch_event_list | Richard van der Hoff | 2019-07-29 | 1 | -15/+27 | |
* | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_sync | Erik Johnston | 2019-08-06 | 1 | -6/+37 | |
|\ \ \ \ | ||||||
| * | | | | Handle TimelineBatch being limited and empty. | Erik Johnston | 2019-08-06 | 1 | -6/+37 | |
| | |/ / | |/| | | ||||||
* / | | | Return 404 instead of 403 when retrieving an event without perms (#5798) | Andrew Morgan | 2019-08-06 | 1 | -3/+11 | |
|/ / / | ||||||
* | | | Account validity: allow defining HTML templates to serve the us… (#5807) | Brendan Abolivier | 2019-08-01 | 5 | -11/+71 | |
|\ \ \ | ||||||
| * | | | Lint | Brendan Abolivier | 2019-08-01 | 2 | -16/+9 | |
| * | | | Allow defining HTML templates to serve the user on account renewal | Brendan Abolivier | 2019-08-01 | 5 | -9/+76 | |
* | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachable | Erik Johnston | 2019-08-01 | 1 | -4/+3 | |
|\ \ \ \ | ||||||
| * | | | | Return 502 not 500 when failing to reach any remote server. | Erik Johnston | 2019-08-01 | 1 | -4/+3 | |
* | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806) | Andrew Morgan | 2019-08-01 | 1 | -21/+21 | |
* | | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_error | Erik Johnston | 2019-08-01 | 1 | -1/+6 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Handle incorrectly encoded query params correctly | Erik Johnston | 2019-08-01 | 1 | -1/+6 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #5805 from matrix-org/erikj/validate_state | Erik Johnston | 2019-08-01 | 1 | -2/+9 | |
|\ \ \ \ | ||||||
| * | | | | Validate well-known state events are state events. | Erik Johnston | 2019-07-31 | 1 | -2/+9 | |
* | | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstone | Erik Johnston | 2019-08-01 | 1 | -0/+9 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Fix spelling. | Erik Johnston | 2019-08-01 | 1 | -1/+3 | |
| |/ / / | ||||||
| * | | | Don't allow clients to send tombstones that reference the same room | Erik Johnston | 2019-07-31 | 1 | -0/+7 | |
* | | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_room | Erik Johnston | 2019-08-01 | 1 | -1/+3 | |
|\ \ \ \ | ||||||
| * | | | | Deny redaction of events in a different room. | Erik Johnston | 2019-07-31 | 1 | -1/+3 | |
| |/ / / | ||||||
* | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errors | Erik Johnston | 2019-08-01 | 2 | -32/+60 | |
|\ \ \ \ | ||||||
| * | | | | Don't log as exception when failing durig backfill | Erik Johnston | 2019-07-30 | 1 | -0/+3 | |
| * | | | | Correctly handle errors doing requests to group servers | Erik Johnston | 2019-07-29 | 1 | -32/+57 | |
* | | | | | Explicitly check that tombstone is a state event before notifying. | Erik Johnston | 2019-07-31 | 1 | -1/+7 | |
| |/ / / |/| | | | ||||||
* | | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686) | Andrew Morgan | 2019-07-31 | 1 | -1/+2 | |
* | | | | Remove duplicate return statement | Andrew Morgan | 2019-07-31 | 1 | -1/+0 | |
* | | | | Share SSL options for well-known requests | Erik Johnston | 2019-07-31 | 2 | -11/+13 | |
* | | | | Don't recreate column | Erik Johnston | 2019-07-30 | 2 | -1/+22 | |
| |/ / |/| | | ||||||
* | | | Fix current_state_events membership background update. | Erik Johnston | 2019-07-30 | 2 | -1/+1 | |
* | | | Unwrap error | Erik Johnston | 2019-07-30 | 1 | -1/+2 | |
* | | | Fix error handling when fetching remote device keys | Erik Johnston | 2019-07-30 | 1 | -3/+1 | |
* | | | Remove non-functional 'expire_access_token' setting (#5782) | Richard van der Hoff | 2019-07-30 | 3 | -30/+6 | |
| |/ |/| | ||||||
* | | Room Complexity Client Implementation (#5783) | Amber Brown | 2019-07-30 | 5 | -11/+206 | |
|/ | ||||||
* | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membership | Erik Johnston | 2019-07-29 | 1 | -0/+6 | |
|\ | ||||||
| * | Fix room summary when rejected events are in state | Erik Johnston | 2019-07-26 | 1 | -0/+6 | |
* | | Merge pull request #5752 from matrix-org/erikj/forgotten_user | Erik Johnston | 2019-07-29 | 2 | -35/+123 | |
|\ \ | ||||||
| * | | Expand comment | Erik Johnston | 2019-07-29 | 1 | -0/+5 | |
| * | | Remove lost comment | Erik Johnston | 2019-07-29 | 1 | -7/+0 | |
| |/ | ||||||
| * | Remove join when calculating room summaries. | Erik Johnston | 2019-07-24 | 1 | -13/+21 | |
| * | Remove join on room_memberships when fetching rooms for user. | Erik Johnston | 2019-07-24 | 1 | -22/+36 | |
| * | Add function to get all forgotten rooms for user | Erik Johnston | 2019-07-24 | 2 | -0/+68 | |
* | | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqlite | Erik Johnston | 2019-07-29 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | Fix current_state bg update to work on old SQLite | Erik Johnston | 2019-07-29 | 1 | -2/+2 | |
* | | | Move some timeout checking logs to DEBUG #5785 | Amber Brown | 2019-07-30 | 2 | -2/+2 | |
* | | | Update the device list cache when keys/query is called (#5693) | Jorik Schellekens | 2019-07-29 | 2 | -74/+136 | |
|/ / | ||||||
* | | Add kwargs and doc | Brendan Abolivier | 2019-07-29 | 1 | -2/+4 | |
* | | Add ability to pass arguments to looping calls | Brendan Abolivier | 2019-07-29 | 1 | -2/+2 | |
* | | Merge branch 'master' into develop | Richard van der Hoff | 2019-07-26 | 2 | -1/+5 | |
|\ \ | ||||||
| * | | 1.2.1 | Richard van der Hoff | 2019-07-26 | 1 | -1/+1 | |
| * | | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1 | Richard van der Hoff | 2019-07-26 | 2 | -4/+37 | |
| |\ \ | ||||||
| * | | | Log when we receive receipt from a different origin | Erik Johnston | 2019-07-26 | 1 | -13/+22 | |
| * | | | Fix DoS when there is a cycle in redaction events | Richard van der Hoff | 2019-07-26 | 1 | -0/+4 | |
* | | | | Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatch | Richard van der Hoff | 2019-07-26 | 2 | -4/+37 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Log when we receive a /make_* request from a different origin | Richard van der Hoff | 2019-07-26 | 2 | -4/+37 | |
* | | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_id | Richard van der Hoff | 2019-07-25 | 1 | -0/+27 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | log when a redaction attempts to redact an event in a different room | Richard van der Hoff | 2019-07-25 | 1 | -0/+27 | |
* | | | | Fix some error cases in the caching layer. (#5749) | Richard van der Hoff | 2019-07-25 | 1 | -32/+42 | |
* | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-07-25 | 1 | -1/+1 | |
|\| | | | ||||||
| * | | | 1.2.0 v1.2.0 github/release-v1.2.0 release-v1.2.0 | Andrew Morgan | 2019-07-25 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge tag 'v1.2.0rc2' into develop | Andrew Morgan | 2019-07-24 | 8 | -26/+75 | |
|\| | | ||||||
| * | | 1.2.0rc2 v1.2.0rc2 | Andrew Morgan | 2019-07-24 | 1 | -1/+1 | |
| * | | Fix servlet metric names (#5734) | Jorik Schellekens | 2019-07-24 | 7 | -25/+74 | |
* | | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch | Erik Johnston | 2019-07-24 | 1 | -13/+22 | |
|\ \ \ | ||||||
| * | | | Log when we receive receipt from a different origin | Erik Johnston | 2019-07-23 | 1 | -13/+22 | |
* | | | | Stop trying to fetch events with event_id=None. (#5753) | Richard van der Hoff | 2019-07-24 | 3 | -11/+22 | |
* | | | | Add a prometheus metric for active cache lookups. (#5750) | Richard van der Hoff | 2019-07-24 | 2 | -2/+33 | |
* | | | | Make Jaeger fully configurable (#5694) | Jorik Schellekens | 2019-07-23 | 2 | -4/+29 | |
* | | | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 162 | -1488/+1333 | |
| |_|/ |/| | | ||||||
* | | | Opentracing Utils (#5722) | Jorik Schellekens | 2019-07-23 | 2 | -101/+356 | |
* | | | Merge pull request #5732 from matrix-org/erikj/sdnotify | Erik Johnston | 2019-07-23 | 13 | -11/+59 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Call startup commands as system triggers. | Erik Johnston | 2019-07-22 | 11 | -11/+29 | |
| * | | Add process hooks to tell systemd our state. | Erik Johnston | 2019-07-22 | 2 | -0/+30 | |
* | | | Speed up current state background update. | Erik Johnston | 2019-07-23 | 1 | -18/+30 | |
* | | | Fix logging in workers (#5729) | Amber Brown | 2019-07-22 | 1 | -0/+1 | |
* | | | Merge pull request #5730 from matrix-org/erikj/cache_versions | Erik Johnston | 2019-07-22 | 1 | -2/+21 | |
|\ \ \ | ||||||
| * | | | Cache get_version_string. | Erik Johnston | 2019-07-22 | 1 | -2/+21 | |
| |/ / | ||||||
* | | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-type | Jason Robinson | 2019-07-22 | 1 | -3/+3 | |
|\ \ \ | ||||||
| * | | | Add `user_type` to returned fields in admin API user list endpoints | Jason Robinson | 2019-07-22 | 1 | -3/+3 | |
| |/ / | ||||||
* | | | Fix stack overflow in Keyring (#5724) | Richard van der Hoff | 2019-07-22 | 1 | -51/+41 | |
|\ \ \ | ||||||
| * | | | Add a delay to key lookup lock release to fix stack overflow | Richard van der Hoff | 2019-07-19 | 1 | -2/+8 | |
| * | | | Refactor Keyring._start_key_lookups | Richard van der Hoff | 2019-07-19 | 1 | -51/+35 | |
* | | | | Merge tag 'v1.2.0rc1' into develop | Andrew Morgan | 2019-07-22 | 1 | -1/+1 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | ||||||
| * | | 1.2.0rc1 | Andrew Morgan | 2019-07-22 | 1 | -1/+1 | |
* | | | Merge branch 'release-v1.2.0' into develop | Jorik Schellekens | 2019-07-22 | 2 | -12/+127 | |
|\| | | ||||||
| * | | Opentracing Documentation (#5703) | Jorik Schellekens | 2019-07-22 | 2 | -12/+127 | |
* | | | Merge pull request #5720 from matrix-org/erikj/transactions_upsert | Erik Johnston | 2019-07-19 | 1 | -0/+20 | |
|\ \ \ | ||||||
| * | | | Use upsert when updating destination retry interval | Erik Johnston | 2019-07-19 | 1 | -0/+20 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_state | Erik Johnston | 2019-07-19 | 1 | -2/+6 | |
|\ \ \ | ||||||
| * | | | Delegate to cached version when using get_filtered_current_state_ids | Erik Johnston | 2019-07-18 | 1 | -2/+6 | |
* | | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_state | Erik Johnston | 2019-07-19 | 7 | -41/+194 | |
|\ \ \ \ | ||||||
| * | | | | LoggingTransaction accepts None for callback lists. | Erik Johnston | 2019-07-19 | 3 | -6/+16 | |
| * | | | | Update comment for new column | Erik Johnston | 2019-07-19 | 1 | -0/+3 | |
| * | | | | Use the current_state_events.membership column | Erik Johnston | 2019-07-18 | 1 | -17/+37 | |
| * | | | | Track if current_state_events.membership is up to date | Erik Johnston | 2019-07-18 | 1 | -0/+45 | |
| * | | | | Add background update for current_state_events.membership column | Erik Johnston | 2019-07-18 | 2 | -0/+54 | |
| * | | | | Add membership column to current_state_events table. | Erik Johnston | 2019-07-18 | 5 | -20/+41 | |
* | | | | | Don't accept opentracing data from clients. (#5715) | Jorik Schellekens | 2019-07-19 | 1 | -2/+1 | |
* | | | | | Add 'rel' attribute to default welcome page. (#5695) | Neil Johnson | 2019-07-19 | 1 | -2/+2 | |
| |_|/ / |/| | | | ||||||
* | | | | Remove non-dedicated logging options and command line arguments (#5678) | Amber Brown | 2019-07-19 | 2 | -75/+12 | |
| |_|/ |/| | | ||||||
* | | | enable aggregations support by default | Neil Johnson | 2019-07-18 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | Clean up opentracing configuration options (#5712) | Richard van der Hoff | 2019-07-18 | 3 | -48/+61 | |
* | | Support Prometheus_client 0.4.0+ (#5636) | Amber Brown | 2019-07-18 | 16 | -47/+288 | |
* | | Remove the ability to query relations when the original event was redacted. (... | Andrew Morgan | 2019-07-18 | 3 | -36/+66 | |
* | | Convert synapse.federation.transport.server to async (#5689) | Richard van der Hoff | 2019-07-18 | 1 | -242/+188 | |
* | | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 3 | -24/+36 | |
* | | More refactoring in `get_events_as_list` (#5707) | Richard van der Hoff | 2019-07-17 | 1 | -27/+37 | |
* | | Fix redaction authentication (#5700) | Richard van der Hoff | 2019-07-17 | 1 | -85/+129 | |
* | | Refactor `get_events_as_list` (#5699) | Richard van der Hoff | 2019-07-17 | 1 | -48/+74 | |
|/ | ||||||
* | Remove pointless description | Erik Johnston | 2019-07-16 | 1 | -1/+0 | |
* | Clean up arg name and remove lying comment | Erik Johnston | 2019-07-16 | 1 | -7/+5 | |
* | Fix typo in synapse/app/admin_cmd.py | Erik Johnston | 2019-07-16 | 1 | -1/+1 | |
* | Fix invoking add_argument from homeserver.py | Erik Johnston | 2019-07-15 | 1 | -1/+1 | |
* | s/exfiltrate_user_data/export_user_data/ | Erik Johnston | 2019-07-15 | 1 | -1/+1 | |
* | Add FileExfiltrationWriter | Erik Johnston | 2019-07-15 | 1 | -1/+69 | |
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmd | Erik Johnston | 2019-07-15 | 111 | -1621/+2238 | |
|\ | ||||||
| * | Return a different error from Invalid Password when a user is deactivated (#5... | Andrew Morgan | 2019-07-15 | 2 | -0/+25 | |
| * | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Erik Johnston | 2019-07-15 | 3 | -6/+211 | |
| |\ | ||||||
| | * | Fixup docstrings | Erik Johnston | 2019-07-12 | 1 | -7/+5 | |
| | * | pep8 | Erik Johnston | 2019-07-05 | 1 | -4/+0 | |
| | * | Remove FileExfiltrationWriter | Erik Johnston | 2019-07-05 | 1 | -63/+0 | |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi... | Erik Johnston | 2019-07-05 | 84 | -1027/+1237 | |
| | |\ | ||||||
| | * | | Assume key existence. Update docstrings | Erik Johnston | 2019-07-05 | 2 | -9/+11 | |
| | * | | Fixup from review comments. | Erik Johnston | 2019-07-04 | 1 | -17/+22 | |
| | * | | Apply comment fixups from code review | Erik Johnston | 2019-07-03 | 1 | -6/+6 | |
| * | | | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 7 | -20/+105 | |
| * | | | fix typo: backgroud -> background | Andrew Morgan | 2019-07-12 | 2 | -5/+5 | |
| * | | | small typo fix (#5655) | Andrew Morgan | 2019-07-11 | 1 | -1/+1 | |
| * | | | Clean up exception handling for access_tokens (#5656) | Richard van der Hoff | 2019-07-11 | 4 | -93/+86 | |
| * | | | Add basic opentracing support (#5544) | Jorik Schellekens | 2019-07-11 | 10 | -12/+615 | |
| * | | | Inline issue_access_token (#5659) | Richard van der Hoff | 2019-07-11 | 1 | -7/+3 | |
| * | | | Merge pull request #5658 from matrix-org/babolivier/is-json | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | Typo | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 | |
| | * | | | Send 3PID bind requests as JSON data | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 | |
| * | | | | Remove access-token support from RegistrationStore.register (#5642) | Richard van der Hoff | 2019-07-10 | 2 | -21/+5 | |
| |/ / / | ||||||
| * | | | Don't bundle aggregations when retrieving the original event (#5654) | Andrew Morgan | 2019-07-10 | 1 | -2/+12 | |
| * | | | Merge pull request #5638 from matrix-org/babolivier/invite-json | Brendan Abolivier | 2019-07-09 | 1 | -4/+18 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'develop' into babolivier/invite-json | Brendan Abolivier | 2019-07-08 | 105 | -1513/+1630 | |
| | |\ \ \ | ||||||
| | * | | | | Lint | Brendan Abolivier | 2019-07-08 | 1 | -1/+2 | |
| | * | | | | Use application/json when querying the IS's /store-invite endpoint | Brendan Abolivier | 2019-07-08 | 1 | -4/+17 | |
| * | | | | | remove unused and unnecessary check for FederationDeniedError (#5645) | Hubert Chathi | 2019-07-09 | 1 | -4/+1 | |
| * | | | | | Include the original event in /relations (#5626) | Andrew Morgan | 2019-07-09 | 2 | -4/+6 | |
| * | | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-self | Brendan Abolivier | 2019-07-09 | 1 | -0/+4 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Allow newly-registered users to lookup their own profiles | Brendan Abolivier | 2019-07-08 | 1 | -0/+4 | |
| | | |/ / / | | |/| | | | ||||||
| * | | | | | Remove access-token support from RegistrationHandler.register (#5641) | Richard van der Hoff | 2019-07-08 | 6 | -56/+15 | |
| * | | | | | Better logging for auto-join. (#5643) | Richard van der Hoff | 2019-07-08 | 1 | -0/+7 | |
| |/ / / / | ||||||
| * | | | | Update ModuleApi to avoid register(generate_token=True) (#5640) | Richard van der Hoff | 2019-07-08 | 1 | -8/+56 | |
| * | | | | Factor out some redundant code in the login impl (#5639) | Richard van der Hoff | 2019-07-08 | 1 | -39/+10 | |
| * | | | | Move get_or_create_user to test code (#5628) | Richard van der Hoff | 2019-07-08 | 1 | -51/+0 | |
| * | | | | Add default push rule to ignore reactions (#5623) | J. Ryan Stinnett | 2019-07-05 | 1 | -0/+13 | |
| * | | | | Add origin_server_ts and sender fields to m.replace (#5613) | Andrew Morgan | 2019-07-05 | 1 | -1/+5 | |
| * | | | | Remove support for invite_3pid_guest. (#5625) | Richard van der Hoff | 2019-07-05 | 6 | -196/+2 | |
| | |_|/ | |/| | | ||||||
| * | | | remove dead transaction persist code (#5622) | Richard van der Hoff | 2019-07-05 | 3 | -69/+0 | |
| * | | | Fixes to the federation rate limiter (#5621) | Richard van der Hoff | 2019-07-05 | 2 | -10/+10 | |
| * | | | Make errors about email password resets much clearer (#5616) | Andrew Morgan | 2019-07-05 | 1 | -11/+8 | |
| * | | | Improve the backwards compatibility re-exports of synapse.logging.context (#5... | Amber Brown | 2019-07-05 | 3 | -5/+61 | |
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-07-04 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | 1.1.0 | Erik Johnston | 2019-07-04 | 1 | -1/+1 | |
| * | | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 71 | -141/+153 | |
| * | | | | Fix 'utime went backwards' errors on daemonization. (#5609) | Richard van der Hoff | 2019-07-03 | 2 | -31/+43 | |
| |/ / / | ||||||
| * | | | 1.1.0rc2 v1.1.0rc2 | Richard van der Hoff | 2019-07-03 | 1 | -1/+1 | |
| * | | | Fix a number of "Starting txn from sentinel context" warnings (#5605) | Richard van der Hoff | 2019-07-03 | 4 | -6/+34 | |
| * | | | Fix media repo breaking (#5593) | Amber Brown | 2019-07-02 | 3 | -12/+24 | |
| * | | | prepare v1.1.0rc1 | Richard van der Hoff | 2019-07-02 | 1 | -1/+1 | |
| * | | | Complete the SAML2 implementation (#5422) | Richard van der Hoff | 2019-07-02 | 5 | -44/+209 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-07-01 | 22 | -205/+303 | |
| | |\ \ \ | ||||||
| | * | | | | Address review comments | Richard van der Hoff | 2019-07-01 | 1 | -5/+7 | |
| | * | | | | rename BaseSSORedirectServlet for consistency | Richard van der Hoff | 2019-06-27 | 1 | -3/+3 | |
| | * | | | | cleanups | Richard van der Hoff | 2019-06-27 | 3 | -11/+18 | |
| | * | | | | Add support for tracking SAML2 sessions. | Richard van der Hoff | 2019-06-26 | 2 | -3/+56 | |
| | * | | | | Move all the saml stuff out to a centralised handler | Richard van der Hoff | 2019-06-26 | 4 | -50/+96 |