Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | improve auto room join logic, comments and tests | Neil Johnson | 2018-10-12 | 2 | -4/+18 |
* | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 17 | -130/+240 |
|\ | |||||
| * | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers | Richard van der Hoff | 2018-10-04 | 1 | -33/+69 |
| |\ | |||||
| | * | actually exclude outliers | Richard van der Hoff | 2018-10-03 | 1 | -1/+2 |
| | * | remove debugging | Richard van der Hoff | 2018-10-02 | 1 | -10/+0 |
| | * | Fix bug in forward_extremity update logic | Richard van der Hoff | 2018-10-02 | 1 | -33/+78 |
| * | | Merge branch 'master' into develop | Amber Brown | 2018-10-04 | 2 | -2/+5 |
| |\ \ | |||||
| | * | | full version | Amber Brown | 2018-10-04 | 1 | -1/+1 |
| | * | | Pin to prometheus_client<0.4 to avoid renaming all of our metrics | Richard van der Hoff | 2018-10-03 | 1 | -1/+4 |
| | * | | version | Amber Brown | 2018-10-03 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion | Erik Johnston | 2018-10-03 | 1 | -5/+2 |
| |\ \ | |||||
| | * | | Sanitise error messages when user doesn't have permission to invite | Erik Johnston | 2018-10-03 | 1 | -5/+2 |
| | * | | Fix handling of rejected threepid invites | Erik Johnston | 2018-10-03 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration | Erik Johnston | 2018-10-03 | 1 | -2/+6 |
| |\ \ | |||||
| | * | | Fix exception in background metrics collection | Erik Johnston | 2018-10-03 | 1 | -2/+6 |
| | |/ | |||||
| * / | Fix exception handling in fetching remote profiles | Erik Johnston | 2018-10-03 | 1 | -6/+2 |
| |/ | |||||
| * | Fix bug when invalidating destination retry timings | Erik Johnston | 2018-10-02 | 1 | -1/+1 |
| * | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-02 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch 'develop' into rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-01 | 30 | -142/+299 |
| | |\ | |||||
| | * | | Fix error handling for missing auth_event | Richard van der Hoff | 2018-09-26 | 1 | -2/+2 |
| * | | | Disable frozen dicts by default (#3987) | Amber Brown | 2018-10-02 | 1 | -3/+10 |
| * | | | Fix error when logging incomplete requests | Erik Johnston | 2018-10-02 | 1 | -6/+21 |
| * | | | Merge pull request #3989 from matrix-org/rav/better_stacktraces | Richard van der Hoff | 2018-10-02 | 2 | -22/+23 |
| |\ \ \ | |||||
| | * | | | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 2 | -22/+23 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state | Erik Johnston | 2018-10-02 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Fix lazy loaded sync with rejected state events | Erik Johnston | 2018-10-01 | 1 | -2/+2 |
| * | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 1 | -12/+46 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 20 | -36/+60 |
| | |\ \ \ | |||||
| | * | | | | Include event when resolving state for missing prevs | Richard van der Hoff | 2018-09-27 | 1 | -2/+16 |
| | * | | | | Include state from remote servers in pdu handling | Richard van der Hoff | 2018-09-27 | 1 | -4/+19 |
| | * | | | | Fix "unhashable type: 'list'" exception in federation handling | Richard van der Hoff | 2018-09-27 | 1 | -7/+12 |
| * | | | | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cache | Erik Johnston | 2018-10-01 | 2 | -3/+44 |
| |\ \ \ \ | |||||
| | * | | | | Correctly match 'dict.pop' api | Erik Johnston | 2018-10-01 | 1 | -3/+11 |
| | * | | | | Don't update eviction metrics on explicit removal | Erik Johnston | 2018-10-01 | 1 | -5/+0 |
| | * | | | | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-28 | 27 | -403/+248 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-26 | 1 | -10/+17 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-25 | 5 | -21/+48 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fix ExpiringCache.__len__ to be accurate | Erik Johnston | 2018-09-21 | 1 | -12/+9 |
| | * | | | | | | Add a five minute cache to get_destination_retry_timings | Erik Johnston | 2018-09-21 | 2 | -1/+35 |
| | * | | | | | | Make ExpiringCache slightly more performant | Erik Johnston | 2018-09-21 | 1 | -1/+5 |
| * | | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checks | Richard van der Hoff | 2018-09-28 | 2 | -30/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix complete fail to do the right thing | Richard van der Hoff | 2018-09-28 | 2 | -1/+3 |
| | * | | | | | | | remove spurious federation checks on localhost | Richard van der Hoff | 2018-09-26 | 1 | -31/+6 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Remove redundant call to start_get_pdu_cache | Richard van der Hoff | 2018-09-28 | 1 | -1/+0 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | move logic into register, fix room alias localpart bug, tests | Neil Johnson | 2018-10-04 | 1 | -27/+18 |
* | | | | | | | emit room aliases event | Matthew Hodgson | 2018-09-29 | 1 | -3/+8 |
* | | | | | | | fix thinkos | Matthew Hodgson | 2018-09-29 | 2 | -7/+7 |
* | | | | | | | fix UTs | Matthew Hodgson | 2018-09-28 | 2 | -5/+10 |
* | | | | | | | untested stab at autocreating autojoin rooms | Matthew Hodgson | 2018-09-28 | 2 | -0/+22 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typing | Richard van der Hoff | 2018-09-27 | 1 | -3/+19 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing | Erik Johnston | 2018-09-19 | 68 | -689/+1415 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Improve performance of getting typing updates for replication | Erik Johnston | 2018-09-05 | 1 | -3/+19 |
* | | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups | Richard van der Hoff | 2018-09-27 | 2 | -4/+10 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | more comments | Richard van der Hoff | 2018-09-27 | 2 | -6/+3 |
| * | | | | | | | Clarifications in FederationHandler | Richard van der Hoff | 2018-09-27 | 1 | -2/+11 |
* | | | | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process | Amber Brown | 2018-09-27 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Run notify_app_services as a bg process | Richard van der Hoff | 2018-09-26 | 1 | -2/+6 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 16 | -17/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 16 | -17/+17 |
* | | | | | | | | | Run our oldest supported configuration in CI (#3952) | Amber Brown | 2018-09-27 | 1 | -13/+14 |
* | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts | Richard van der Hoff | 2018-09-27 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | fix #3854 | Neil Johnson | 2018-09-26 | 1 | -1/+4 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2 | Richard van der Hoff | 2018-09-27 | 2 | -2/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Logging improvements | Richard van der Hoff | 2018-09-26 | 2 | -2/+16 |
| |/ / / / / / / | |||||
* | | | | | | | | Include eventid in log lines when processing incoming federation transactions... | Richard van der Hoff | 2018-09-27 | 3 | -45/+93 |
* | | | | | | | | docstrings and unittests for storage.state (#3958) | Richard van der Hoff | 2018-09-27 | 1 | -8/+22 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | fix docstring for FederationClient.get_state_for_room | Richard van der Hoff | 2018-09-26 | 1 | -4/+4 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len | Richard van der Hoff | 2018-09-26 | 2 | -20/+24 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Log which cache is throwing exceptions | Richard van der Hoff | 2018-09-26 | 1 | -10/+17 |
| * | | | | | Fix ExpiringCache.__len__ to be accurate | Erik Johnston | 2018-09-26 | 1 | -10/+7 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctl | Amber Brown | 2018-09-26 | 1 | -284/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Move synctl into top dir to avoid a symlink | Richard van der Hoff | 2018-09-25 | 1 | -284/+0 |
* | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu | Amber Brown | 2018-09-26 | 2 | -24/+47 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Comments and interface cleanup for on_receive_pdu | Richard van der Hoff | 2018-09-20 | 2 | -24/+47 |
* | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 15 | -38/+12 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Fix some instances of ExpiringCache not expiring cache items | Erik Johnston | 2018-09-21 | 15 | -38/+12 |
* | | | | | | added "media-src: 'self'" to CSP for resources (#3578) | Jérémy Farnaud | 2018-09-25 | 1 | -0/+1 |
* | | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered | Richard van der Hoff | 2018-09-25 | 1 | -14/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix spurious exceptions when client closes conncetion | Erik Johnston | 2018-09-20 | 1 | -14/+35 |
* | | | | | | | We require attrs 16.0.0 | Richard van der Hoff | 2018-09-25 | 1 | -1/+3 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Only lazy load self-members on initial sync | Matthew Hodgson | 2018-09-25 | 1 | -5/+8 |
* | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | bump version | Amber Brown | 2018-09-25 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-24 | 1 | -1/+1 |
|\| | | | | | | |_|/ / / / |/| | | | | | |||||
| * | | | | | update version | Amber Brown | 2018-09-24 | 1 | -1/+1 |
| * | | | | | version | Amber Brown | 2018-09-17 | 1 | -1/+1 |
* | | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errors | Erik Johnston | 2018-09-21 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add missing logger | Erik Johnston | 2018-09-20 | 1 | -0/+4 |
| * | | | | | | Handle exceptions thrown by background tasks | Erik Johnston | 2018-09-20 | 1 | -0/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916) | Matthew Hodgson | 2018-09-20 | 1 | -0/+4 |
* | | | | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links | Neil Johnson | 2018-09-20 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail... | Richard van der Hoff | 2018-09-18 | 13 | -39/+247 |
| |\ \ \ \ \ | |||||
| * | | | | | | fix link for case that config.email_riot_base_url is set | Neil Johnson | 2018-09-13 | 1 | -1/+1 |
* | | | | | | | Fix client IPs being broken on Python 3 (#3908) | Amber Brown | 2018-09-20 | 2 | -16/+20 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cache | Erik Johnston | 2018-09-20 | 1 | -8/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix up changelog and remove spurious comment | Erik Johnston | 2018-09-19 | 1 | -2/+0 |
| * | | | | | | pep8 | Erik Johnston | 2018-09-19 | 1 | -1/+0 |
| * | | | | | | Remove get_destination_retry_timings cache | Erik Johnston | 2018-09-19 | 1 | -5/+0 |
* | | | | | | | Add a regression test for logging on failed connections (#3912) | Amber Brown | 2018-09-20 | 1 | -2/+2 |
* | | | | | | | Improve the logging when handling a federation transaction (#3904) | Richard van der Hoff | 2018-09-19 | 2 | -56/+110 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Fixup | Erik Johnston | 2018-09-19 | 1 | -4/+1 |
* | | | | | | Replace custom DeferredTimeoutError with defer.TimeoutError | Erik Johnston | 2018-09-19 | 2 | -12/+5 |
* | | | | | | Run canceller first to allow it to generate correct error | Erik Johnston | 2018-09-19 | 1 | -2/+5 |
* | | | | | | Update to use new timeout function everywhere. | Erik Johnston | 2018-09-19 | 4 | -72/+43 |
|/ / / / / | |||||
* | | | | | Merge pull request #3909 from turt2live/travis/fix-logging-1 | Amber Brown | 2018-09-19 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Destination is a string | Travis Ralston | 2018-09-18 | 1 | -4/+4 |
* | | | | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_name | Amber Brown | 2018-09-19 | 1 | -3/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Set SNI to the server_name, not whatever was in the SRV record | Richard van der Hoff | 2018-09-18 | 1 | -3/+10 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout | Amber Brown | 2018-09-19 | 1 | -1/+30 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Bump timeout on get_missing_events request | Richard van der Hoff | 2018-09-18 | 1 | -1/+30 |
| |/ / / / | |||||
* | | | | | Use directory server for room joins (#3899) | Richard van der Hoff | 2018-09-18 | 1 | -0/+5 |
* | | | | | Refactor matrixfederationclient to fix logging (#3906) | Richard van der Hoff | 2018-09-18 | 1 | -149/+236 |
* | | | | | Merge pull request #3894 from matrix-org/hs/phone_home_py_version | Amber Brown | 2018-09-19 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | typo | Will Hunt | 2018-09-17 | 1 | -1/+1 |
| * | | | | make pip happy? | Will Hunt | 2018-09-17 | 1 | -2/+4 |
| * | | | | Use a string for versions | Will Hunt | 2018-09-17 | 1 | -1/+1 |
| * | | | | Add python_version phone home stat | Will Hunt | 2018-09-17 | 1 | -0/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoin | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | don't ratelimit autojoins | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_alias | Richard van der Hoff | 2018-09-18 | 2 | -4/+16 |
|\ \ \ \ | |||||
| * | | | | Reinstate missing null check | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
| * | | | | Return a 404 when deleting unknown room alias | Richard van der Hoff | 2018-09-17 | 2 | -4/+16 |
| |/ / / | |||||
* | | | | Fix more b'abcd' noise in metrics | Richard van der Hoff | 2018-09-17 | 2 | -12/+12 |
* | | | | Fix some b'abcd' noise in logs and metrics | Richard van der Hoff | 2018-09-17 | 2 | -5/+8 |
|/ / / | |||||
* | | | Fix timeout function | Erik Johnston | 2018-09-15 | 1 | -1/+2 |
* | | | Add an awful secondary timeout to fix wedged requests | Erik Johnston | 2018-09-14 | 2 | -0/+62 |
* | | | don't filter membership events based on history visibility (#3874) | Matthew Hodgson | 2018-09-14 | 1 | -8/+1 |
* | | | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2 | Erik Johnston | 2018-09-14 | 4 | -7/+12 |
|\ \ \ | |||||
| * | | | fix | Amber Brown | 2018-09-15 | 1 | -3/+3 |
| * | | | fix | Amber Brown | 2018-09-14 | 1 | -1/+4 |
| * | | | fix | Amber Brown | 2018-09-14 | 1 | -1/+1 |
| * | | | redact better | Amber Brown | 2018-09-14 | 1 | -2/+2 |
| * | | | we do that higher up | Amber Brown | 2018-09-14 | 1 | -0/+1 |
| * | | | Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2 | Amber Brown | 2018-09-14 | 4 | -15/+36 |
| |\| | | |||||
| * | | | buffer? | Amber Brown | 2018-09-14 | 1 | -1/+2 |
* | | | | Remove spurious comment | Erik Johnston | 2018-09-14 | 1 | -2/+0 |
* | | | | Measure outbound requests | Erik Johnston | 2018-09-14 | 1 | -3/+6 |
* | | | | Add in flight real time metrics for Measure blocks | Erik Johnston | 2018-09-14 | 2 | -1/+131 |
* | | | | Fix minor typo in exception | Travis Ralston | 2018-09-13 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | merge (#3576) | Amber Brown | 2018-09-14 | 4 | -15/+36 |
|/ / | |||||
* | | Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8 | Erik Johnston | 2018-09-13 | 1 | -16/+28 |
|\ \ | |||||
| * | | comment | Erik Johnston | 2018-09-13 | 1 | -0/+2 |
| * | | pep8 | Erik Johnston | 2018-09-13 | 1 | -1/+0 |
| * | | Create indices after insertion | Erik Johnston | 2018-09-13 | 1 | -14/+18 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_p... | Erik Johnston | 2018-09-13 | 2 | -1/+26 |
| |\ \ | |||||
| * | | | Make purge history slightly faster | Erik Johnston | 2018-09-13 | 1 | -2/+9 |
* | | | | Fix handling of redacted events from federation | Erik Johnston | 2018-09-13 | 2 | -1/+6 |
* | | | | Attempt to figure out what's going on with timeouts (#3857) | Amber Brown | 2018-09-14 | 1 | -56/+42 |
| |/ / |/| | | |||||
* | | | Remove some superfluous logging (#3855) | Amber Brown | 2018-09-13 | 2 | -1/+26 |
|/ / | |||||
* | | Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7 | Neil Johnson | 2018-09-12 | 2 | -3/+28 |
|\ \ | |||||
| * | | improve naming | Neil Johnson | 2018-09-12 | 2 | -6/+10 |
| * | | expose number of real reserved users | Neil Johnson | 2018-09-12 | 2 | -3/+24 |
* | | | show heroes if a room has a 'deleted' name/canonical_alias (#3851) | Matthew Hodgson | 2018-09-12 | 1 | -2/+15 |
* | | | Merge pull request #3853 from matrix-org/erikj/log_outbound_each_time | Erik Johnston | 2018-09-12 | 1 | -75/+74 |
|\ \ \ | |||||
| * | | | Log outbound requests when we retry | Erik Johnston | 2018-09-12 | 1 | -75/+74 |
* | | | | argh pep8 | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | | correctly log gappy sync metrics | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | | fix logline | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | | Merge pull request #3841 from matrix-org/erikj/manhole_key_length | Erik Johnston | 2018-09-12 | 1 | -13/+31 |
|\ \ \ \ | |||||
| * | | | | Change the manhole SSH key to have more bits | Erik Johnston | 2018-09-11 | 1 | -13/+31 |
* | | | | | Port federation/ to py3 (#3847) | Amber Brown | 2018-09-12 | 3 | -19/+18 |
* | | | | | Merge pull request #3835 from krombel/fix_3821 | Amber Brown | 2018-09-12 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | fix VOIP crashes under Python 3 (#3821) | Krombel | 2018-09-10 | 1 | -1/+5 |
| |/ / / / | |||||
* | | | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyring | Amber Brown | 2018-09-12 | 3 | -13/+46 |
|\ \ \ \ \ | |||||
| * | | | | | clearer logging when things fail, too | Richard van der Hoff | 2018-09-06 | 2 | -7/+28 |
| * | | | | | add some logging for the keyring queue | Richard van der Hoff | 2018-09-06 | 1 | -6/+18 |
* | | | | | | Merge pull request #3824 from matrix-org/rav/fix_jwt_import | Amber Brown | 2018-09-12 | 2 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix jwt import check | Richard van der Hoff | 2018-09-07 | 2 | -1/+1 |
* | | | | | | | Port rest/ to Python 3 (#3823) | Amber Brown | 2018-09-12 | 17 | -100/+112 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Port crypto/ to Python 3 (#3822) | Amber Brown | 2018-09-12 | 3 | -6/+13 |
* | | | | | | Timeout reading body for outbound HTTP requests | Erik Johnston | 2018-09-12 | 1 | -7/+45 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Speed up lazy loading (#3827) | Matthew Hodgson | 2018-09-12 | 3 | -30/+157 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_join | Amber Brown | 2018-09-07 | 1 | -0/+13 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Don't send empty tags list down sync | Erik Johnston | 2018-09-06 | 1 | -0/+5 |
| * | | | Send existing room tags down sync on join | Erik Johnston | 2018-09-06 | 1 | -0/+8 |
* | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-07 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | version | Amber Brown | 2018-09-07 | 1 | -1/+1 |
| * | | | | Bump version and changelog | Erik Johnston | 2018-09-06 | 1 | -1/+1 |
| * | | | | Merge tag 'v0.33.3.1' into release-v0.33.4 | Erik Johnston | 2018-09-06 | 4 | -31/+125 |
| |\ \ \ \ | |||||
| * | | | | | version and towncrier v0.33.4rc1 | Amber Brown | 2018-09-04 | 1 | -1/+1 |
* | | | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6 | Neil Johnson | 2018-09-06 | 1 | -1/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | ensure guests never enter mau list | Neil Johnson | 2018-09-06 | 1 | -4/+3 |
| * | | | | | guest users should not be part of mau total | Neil Johnson | 2018-09-05 | 1 | -1/+6 |
* | | | | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edus | Amber Brown | 2018-09-07 | 1 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Limit the number of PDUs/EDUs per fedreation transaction | Erik Johnston | 2018-09-06 | 1 | -0/+12 |
* | | | | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_id | Amber Brown | 2018-09-07 | 1 | -12/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove conn_id | Erik Johnston | 2018-09-04 | 1 | -2/+2 |
| * | | | | | | | Remove conn_id from repl prometheus metrics | Erik Johnston | 2018-09-03 | 1 | -10/+10 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_state | Amber Brown | 2018-09-07 | 1 | -8/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | User iter* during sync state calculations | Erik Johnston | 2018-09-05 | 1 | -8/+8 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_dep | Amber Brown | 2018-09-07 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | bump dep on pyopenssl to 16.x | Richard van der Hoff | 2018-09-06 | 1 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Port handlers/ to Python 3 (#3803) | Amber Brown | 2018-09-07 | 6 | -19/+22 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-09-06 | 5 | -32/+126 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | prepare v0.33.3.1 v0.33.3.1 github/release-v0.33.3.1 release-v0.33.3.1 | Richard van der Hoff | 2018-09-06 | 1 | -1/+1 |
| * | | | Fix origin handling for pushed transactions | Richard van der Hoff | 2018-09-05 | 3 | -15/+15 |
| * | | | Check that signatures on events are valid | Richard van der Hoff | 2018-09-05 | 1 | -16/+110 |
* | | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter | Richard van der Hoff | 2018-09-05 | 2 | -13/+39 |
|\ \ \ \ | |||||
| * | | | | Implement 'event_format' filter param in /sync | Richard van der Hoff | 2018-09-04 | 2 | -13/+39 |
| | |_|/ | |/| | | |||||
* | | | | Port http/ to Python 3 (#3771) | Amber Brown | 2018-09-06 | 6 | -184/+130 |
| |_|/ |/| | | |||||
* | | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5 | Neil Johnson | 2018-09-04 | 2 | -7/+21 |
|\ \ \ | |/ / |/| | | |||||
| * | | improve human readable error message | Neil Johnson | 2018-09-04 | 1 | -1/+2 |
| * | | improve human readable error messages | Neil Johnson | 2018-09-04 | 2 | -7/+20 |
* | | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func | Erik Johnston | 2018-09-03 | 3 | -57/+7 |
|\ \ \ | |/ / |/| | | |||||
| * | | Remove unnecessary resolve_events_with_state_map | Erik Johnston | 2018-08-22 | 3 | -57/+7 |
* | | | assert rather than warn hhs-4 | Neil Johnson | 2018-08-31 | 1 | -3/+2 |
* | | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 5 | -21/+35 |
* | | | fix reference to is_threepid_reserved | Neil Johnson | 2018-08-31 | 1 | -1/+1 |
* | | | ensure post registration auth checks do not fail erroneously | Neil Johnson | 2018-08-31 | 4 | -6/+24 |
* | | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 4 | -3/+21 |
* | | | Port storage/ to Python 3 (#3725) | Amber Brown | 2018-08-31 | 11 | -31/+77 |
* | | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_init | Richard van der Hoff | 2018-08-30 | 12 | -48/+30 |
|\ \ \ | |||||
| * | | | use abc.abstractproperty | Richard van der Hoff | 2018-08-28 | 1 | -5/+4 |
| * | | | Make sure that we close db connections opened during init | Richard van der Hoff | 2018-08-28 | 12 | -48/+31 |
* | | | | fix #3445 | Krombel | 2018-08-29 | 1 | -2/+2 |
* | | | | don't return non-LL-member state in incremental sync state blocks (#3760) | Matthew Hodgson | 2018-08-28 | 1 | -1/+8 |
|/ / / | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact | Erik Johnston | 2018-08-24 | 1 | -4/+3 |
|\ \ \ | |||||
| * | | | Fix checking if service notice room is already tagged | Erik Johnston | 2018-08-24 | 1 | -4/+3 |
* | | | | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 4 | -8/+8 |
|/ / / | |||||
* | | | Ensure we wake up /sync when we add tag to notice room | Erik Johnston | 2018-08-24 | 2 | -2/+13 |
* | | | Make content of tag an empty object rather than null | Erik Johnston | 2018-08-24 | 2 | -2/+2 |
* | | | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1 | Erik Johnston | 2018-08-24 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix bug when federation_domain_whitelist is an emtpy list | Erik Johnston | 2018-08-24 | 1 | -1/+1 |
* | | | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticse | Erik Johnston | 2018-08-24 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Fix bug where we broke sync when using limit_usage_by_mau | Erik Johnston | 2018-08-24 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge pull request #3751 from matrix-org/rav/twisted_17 | Richard van der Hoff | 2018-08-24 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Pin to twisted 17.1 or later | Richard van der Hoff | 2018-08-24 | 1 | -1/+1 |
* | | | | Implement trail users | Erik Johnston | 2018-08-23 | 4 | -2/+43 |
|/ / / | |||||
* | | | Fix bug where we resent "limit exceeded" server notices | Erik Johnston | 2018-08-23 | 1 | -1/+5 |
* | | | Add missing yield | Erik Johnston | 2018-08-23 | 1 | -1/+2 |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Erik Johnston | 2018-08-22 | 55 | -603/+1130 |
|\| | | |||||
| * | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-22 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Use recaptcha_ajax.js directly from Google | Richard van der Hoff | 2018-08-22 | 2 | -196/+1 |
| | * | | Merge tag 'v0.33.3' | Richard van der Hoff | 2018-08-22 | 103 | -916/+2769 |
| | |\| | |||||
| | | * | bump version to 0.33.3 | Richard van der Hoff | 2018-08-22 | 1 | -1/+1 |
| | * | | Revert "Use recaptcha_ajax.js directly from Google" | Richard van der Hoff | 2018-08-13 | 2 | -1/+196 |
| * | | | Merge pull request #3724 from Half-Shot/hs/guest-fetch-event | Erik Johnston | 2018-08-22 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Allow guests to access /rooms/:roomId/event/:eventId | Will Hunt | 2018-08-20 | 1 | -1/+1 |
| * | | | | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 6 | -42/+74 |
| |\ \ \ \ | |||||
| | * | | | | Rename WorkerProfileHandler to BaseProfileHandler | Erik Johnston | 2018-08-22 | 2 | -5/+12 |
| | * | | | | Add assert to ensure handler is only run on master | Erik Johnston | 2018-08-22 | 1 | -0/+2 |
| | * | | | | Remove redundant vars | Erik Johnston | 2018-08-22 | 1 | -3/+0 |
| | * | | | | Add some fixmes | Erik Johnston | 2018-08-17 | 2 | -0/+6 |
| | * | | | | Call UserDirectoryHandler methods directly | Erik Johnston | 2018-08-17 | 4 | -104/+8 |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-17 | 68 | -538/+1330 |
| | |\ \ \ \ | |||||
| | * | | | | | Split ProfileHandler into master and worker | Erik Johnston | 2018-08-17 | 2 | -9/+19 |
| | * | | | | | Remote profile cache should remain in master worker | Erik Johnston | 2018-08-17 | 1 | -4/+2 |
| | * | | | | | Docstrings | Erik Johnston | 2018-08-09 | 1 | -1/+11 |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-09 | 30 | -126/+667 |
| | |\ \ \ \ \ |