Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-06-26 | 304 | -9516/+9216 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge tag 'v1.0.0rc3' into rav/saml2_client | Richard van der Hoff | 2019-06-11 | 4 | -2/+7 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | Code cleanups and simplifications. | Richard van der Hoff | 2019-06-11 | 6 | -50/+53 | |
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_client | Richard van der Hoff | 2019-06-10 | 85 | -861/+4648 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | SAML2 Improvements and redirect stuff | Alexander Trost | 2019-06-02 | 5 | -2/+55 | |
| * | | | | | | | | Fix JWT login with new users (#5586) | PauRE | 2019-07-02 | 1 | -6/+3 | |
* | | | | | | | | | Use set_defaults(func=) style | Erik Johnston | 2019-07-15 | 1 | -11/+8 | |
* | | | | | | | | | Move creation of ArgumentParser to caller | Erik Johnston | 2019-07-15 | 2 | -11/+8 | |
* | | | | | | | | | Fix up comments | Erik Johnston | 2019-07-15 | 2 | -3/+3 | |
* | | | | | | | | | Change add_arguments to be a static method | Erik Johnston | 2019-07-15 | 5 | -5/+39 | |
* | | | | | | | | | Add basic admin cmd app | Erik Johnston | 2019-07-02 | 3 | -6/+257 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | Add basic function to get all data for a user out of synapse | Erik Johnston | 2019-07-02 | 2 | -0/+267 | |
|/ / / / / / / | ||||||
* | | | | | | | fix async/await consentresource (#5585) | Amber Brown | 2019-07-01 | 1 | -1/+3 | |
* | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop | Erik Johnston | 2019-07-01 | 1 | -2/+19 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Fixup comment | Erik Johnston | 2019-07-01 | 1 | -6/+13 | |
| * | | | | | | Fix sync tightloop bug. | Erik Johnston | 2019-06-21 | 1 | -2/+12 | |
* | | | | | | | Make the http server handle coroutine-making REST servlets (#5475) | Amber Brown | 2019-06-29 | 9 | -156/+114 | |
* | | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit | Brendan Abolivier | 2019-06-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Only ratelimit when sending the email | Brendan Abolivier | 2019-06-28 | 1 | -1/+2 | |
| * | | | | | | | Don't update the ratelimiter before sending a 3PID invite | Brendan Abolivier | 2019-06-28 | 1 | -1/+1 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Don't log GC 0s at INFO (#5557) | Amber Brown | 2019-06-28 | 1 | -1/+4 | |
* | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ... | Amber Brown | 2019-06-28 | 2 | -7/+64 | |
* | | | | | | | Added possibilty to disable local password authentication (#5092) | Daniel Hoffend | 2019-06-27 | 3 | -1/+11 | |
* | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543) | Andrew Morgan | 2019-06-27 | 1 | -1/+9 | |
* | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices | Erik Johnston | 2019-06-27 | 3 | -37/+97 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Review comments | Erik Johnston | 2019-06-27 | 2 | -7/+5 | |
| * | | | | | | Refactor and comment sync device list code | Erik Johnston | 2019-06-26 | 1 | -17/+53 | |
| * | | | | | | Use batch_iter and correct docstring | Erik Johnston | 2019-06-26 | 1 | -15/+12 | |
| * | | | | | | Rename get_users_whose_devices_changed | Erik Johnston | 2019-06-26 | 3 | -5/+5 | |
| * | | | | | | Refactor get_user_ids_changed to pull less from DB | Erik Johnston | 2019-06-26 | 3 | -28/+57 | |
| | |_|_|_|/ | |/| | | | | ||||||
* / | | | | | Fix JWT login (#5555) | PauRE | 2019-06-27 | 2 | -1/+2 | |
|/ / / / / | ||||||
* | | | | | Prevent multiple upgrades on the same room at once (#5051) | Andrew Morgan | 2019-06-25 | 2 | -52/+90 | |
* | | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_options | Richard van der Hoff | 2019-06-24 | 2 | -5/+41 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add "--open-private-ports" cmdline option | Richard van der Hoff | 2019-06-24 | 2 | -5/+26 | |
| * | | | | | Add --data-directory commandline argument | Richard van der Hoff | 2019-06-24 | 1 | -0/+15 | |
* | | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaults | Richard van der Hoff | 2019-06-24 | 29 | -107/+87 | |
|\| | | | | | ||||||
| * | | | | | Don't load the generated config as the default. | Richard van der Hoff | 2019-06-24 | 29 | -94/+60 | |
| * | | | | | Ensure that all config options have sensible defaults | Richard van der Hoff | 2019-06-24 | 4 | -13/+27 | |
* | | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metrics | Richard van der Hoff | 2019-06-24 | 2 | -29/+52 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | black | Richard van der Hoff | 2019-06-24 | 1 | -6/+2 | |
| * | | | | | | Avoid raising exceptions in metrics | Richard van der Hoff | 2019-06-24 | 1 | -8/+14 | |
| * | | | | | | Merge branch 'develop' into rav/cleanup_metrics | Richard van der Hoff | 2019-06-24 | 291 | -9106/+8018 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Sanity-checking for metrics updates | Richard van der Hoff | 2019-06-19 | 1 | -7/+33 | |
| * | | | | | | | Simplify PerformanceCounters.update interface | Richard van der Hoff | 2019-06-19 | 1 | -11/+12 | |
| * | | | | | | | Remove unused _get_event_counters | Richard van der Hoff | 2019-06-19 | 1 | -7/+1 | |
* | | | | | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicrooms | Brendan Abolivier | 2019-06-24 | 3 | -15/+39 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 3 | -15/+39 | |
* | | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_token | Erik Johnston | 2019-06-24 | 2 | -17/+19 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix /messages on workers when no from param specified. | Erik Johnston | 2019-06-24 | 2 | -17/+19 | |
* | | | | | | | | | Remove unused Config.config_dir_path attribute | Richard van der Hoff | 2019-06-24 | 1 | -3/+0 | |
* | | | | | | | | | Allow configuration of the path used for ACME account keys. | Richard van der Hoff | 2019-06-24 | 3 | -7/+52 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522) | Richard van der Hoff | 2019-06-24 | 30 | -63/+99 | |
* | | | | | | | | Factor acme bits out to a separate file (#5521) | Richard van der Hoff | 2019-06-24 | 2 | -53/+93 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversal | Richard van der Hoff | 2019-06-24 | 1 | -6/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use monotonic clock where possible for metrics | Richard van der Hoff | 2019-06-19 | 1 | -6/+14 | |
* | | | | | | | | Drop support for cpu_affinity (#5525) | Richard van der Hoff | 2019-06-22 | 4 | -51/+1 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Improve help and cmdline option names for --generate-config options (#5512) | Richard van der Hoff | 2019-06-21 | 1 | -22/+28 | |
* | | | | | | | Refactor Config parser and add some comments. (#5511) | Richard van der Hoff | 2019-06-21 | 1 | -14/+35 | |
* | | | | | | | Improve logging when generating config files (#5510) | Richard van der Hoff | 2019-06-21 | 3 | -1/+7 | |
* | | | | | | | Only import jinja2 when needed (#5514) | Andrew Morgan | 2019-06-21 | 1 | -1/+2 | |
* | | | | | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509) | Richard van der Hoff | 2019-06-21 | 1 | -1/+1 | |
* | | | | | | | Fix logging error when a tampered event is detected. (#5500) | Richard van der Hoff | 2019-06-21 | 1 | -1/+0 | |
* | | | | | | | Fix /messages on worker when no token supplied | Erik Johnston | 2019-06-21 | 1 | -0/+2 | |
* | | | | | | | Support pagination API in client_reader worker | Erik Johnston | 2019-06-21 | 1 | -0/+2 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremities | Erik Johnston | 2019-06-21 | 2 | -1/+36 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Black | Erik Johnston | 2019-06-20 | 1 | -2/+2 | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_... | Erik Johnston | 2019-06-20 | 292 | -9079/+7986 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Add descriptions and remove redundant set(..) | Erik Johnston | 2019-06-19 | 2 | -4/+7 | |
| * | | | | | | | Only count non-cache state resolution | Erik Johnston | 2019-06-18 | 1 | -3/+3 | |
| * | | | | | | | Use consistent buckets | Erik Johnston | 2019-06-18 | 1 | -1/+1 | |
| * | | | | | | | Add metric fo number of state groups in resolution | Erik Johnston | 2019-06-17 | 1 | -0/+10 | |
| * | | | | | | | Add metrics for len of new extremities persisted. | Erik Johnston | 2019-06-17 | 1 | -1/+23 | |
* | | | | | | | | Improve email notification logging (#5502) | Neil Johnson | 2019-06-20 | 1 | -1/+1 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Run Black. (#5482) | Amber Brown | 2019-06-20 | 291 | -9076/+7753 | |
* | | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error | Erik Johnston | 2019-06-19 | 1 | -9/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix logline | Erik Johnston | 2019-06-18 | 1 | -1/+1 | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi... | Erik Johnston | 2019-06-18 | 171 | -2326/+11195 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| * | | | | | | | Handle the case of `get_missing_events` failing | Erik Johnston | 2019-04-10 | 1 | -9/+20 | |
* | | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events | Erik Johnston | 2019-06-19 | 5 | -1/+124 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Run as background process and fix comments | Erik Johnston | 2019-06-19 | 2 | -3/+6 | |
| * | | | | | | | | Add experimental option to reduce extremities. | Erik Johnston | 2019-06-18 | 5 | -1/+121 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Fix typo in deactivation background job | Brendan Abolivier | 2019-06-19 | 1 | -1/+1 | |
* | | | | | | | | Add some logging to 3pid invite sig verification (#5015) | David Baker | 2019-06-18 | 1 | -8/+38 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid | Brendan Abolivier | 2019-06-17 | 2 | -1/+42 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make check_threepid_can_be_invited async | Brendan Abolivier | 2019-06-17 | 1 | -0/+1 | |
| * | | | | | | | Add third party rules hook for 3PID invites | Brendan Abolivier | 2019-06-17 | 2 | -1/+41 | |
* | | | | | | | | Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_develop | Erik Johnston | 2019-06-17 | 2 | -4/+48 | |
|\| | | | | | | | ||||||
| * | | | | | | | Add third party rules hook into create room | Erik Johnston | 2019-06-17 | 2 | -4/+48 | |
| |/ / / / / / | ||||||
* / / / / / / | Remove Postgres 9.4 support (#5448) | Amber Brown | 2019-06-18 | 2 | -24/+6 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions | Erik Johnston | 2019-06-17 | 4 | -19/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Handle failing to talk to master over replication | Erik Johnston | 2019-06-07 | 1 | -1/+9 | |
| * | | | | | | Handle HttpResponseException when using federation client. | Erik Johnston | 2019-06-07 | 3 | -18/+19 | |
* | | | | | | | Merge pull request #5388 from matrix-org/erikj/fix_email_push | Erik Johnston | 2019-06-17 | 3 | -7/+53 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add test | Erik Johnston | 2019-06-07 | 2 | -7/+42 | |
| * | | | | | | | Fix email notifications for large unnamed rooms. | Erik Johnston | 2019-06-07 | 1 | -0/+11 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_master | Erik Johnston | 2019-06-17 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Only start background group attestation renewals on master | Erik Johnston | 2019-06-07 | 1 | -3/+4 | |
* | | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state | Erik Johnston | 2019-06-17 | 1 | -6/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix 3PID invite room state over federation. | Erik Johnston | 2019-06-14 | 1 | -6/+0 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules | Brendan Abolivier | 2019-06-14 | 6 | -4/+191 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 6 | -4/+191 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive | Erik Johnston | 2019-06-14 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Prometheus histograms are cumalative | Erik Johnston | 2019-06-14 | 2 | -2/+2 | |
* | | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_job | Brendan Abolivier | 2019-06-14 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix background job for deactivated flag | Brendan Abolivier | 2019-06-14 | 1 | -2/+4 | |
* | | | | | | | | | | Merge pull request #5462 from matrix-org/babolivier/account_validity_deactiva... | Brendan Abolivier | 2019-06-14 | 4 | -2/+25 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 4 | -2/+25 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_file | Erik Johnston | 2019-06-14 | 2 | -6/+13 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Don't log exception when failing to fetch remote content. | Erik Johnston | 2019-06-07 | 2 | -6/+13 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Track deactivated accounts in the database (#5378) | Brendan Abolivier | 2019-06-14 | 3 | -0/+137 | |
* | | | | | | | | fix prometheus rendering error | Amber H. Brown | 2019-06-14 | 1 | -1/+1 | |
* | | | | | | | | Clean up code for sending federation EDUs. (#5381) | Richard van der Hoff | 2019-06-13 | 1 | -14/+26 | |
* | | | | | | | | Expose statistics on extrems to prometheus (#5384) | Amber Brown | 2019-06-13 | 2 | -33/+123 | |
* | | | | | | | | Remove Python 2.7 support. (#5425) | Amber Brown | 2019-06-12 | 2 | -2/+9 | |
* | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-11 | 6 | -9/+9 | |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | 1.0.0 v1.0.0 | Erik Johnston | 2019-06-11 | 1 | -1/+1 | |
| * | | | | | | | Bump bleach version so that tests can run on old deps. | Erik Johnston | 2019-06-11 | 1 | -1/+1 | |
| * | | | | | | | Change password reset links to /_matrix. | Erik Johnston | 2019-06-11 | 4 | -7/+7 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-11 | 4 | -2/+7 | |
|\| | | | | | | ||||||
| * | | | | | | 1.0.0rc3 v1.0.0rc3 | Erik Johnston | 2019-06-11 | 1 | -1/+1 | |
| * | | | | | | Fix defaults on checking threepids | Erik Johnston | 2019-06-10 | 2 | -1/+2 | |
| * | | | | | | Merge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zero | Erik Johnston | 2019-06-10 | 1 | -0/+4 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Fix bug sending federation transactions with lots of EDUs | Erik Johnston | 2019-06-10 | 1 | -0/+4 | |
* | | | | | | | | Don't warn user about password reset disabling through config code (#5387) | Andrew Morgan | 2019-06-11 | 2 | -10/+20 | |
* | | | | | | | | add monthly active users to phonehome stats (#5252) | Neil Johnson | 2019-06-10 | 2 | -15/+30 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-10 | 5 | -87/+134 | |
|\| | | | | | | ||||||
| * | | | | | | 1.0.0rc2 v1.0.0rc2 | Erik Johnston | 2019-06-10 | 1 | -1/+1 | |
| * | | | | | | Merge pull request #5417 from matrix-org/rav/shared_ssl_context | Erik Johnston | 2019-06-10 | 2 | -75/+110 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | rename gutwrenched attr | Richard van der Hoff | 2019-06-10 | 1 | -5/+9 | |
| | * | | | | | Fix federation connections to literal IP addresses | Richard van der Hoff | 2019-06-10 | 2 | -6/+11 | |
| | * | | | | | clean up impl, and import idna directly | Richard van der Hoff | 2019-06-10 | 2 | -15/+12 | |
| | * | | | | | Share an SSL context object between SSL connections | Richard van der Hoff | 2019-06-09 | 1 | -60/+89 | |
| | |/ / / / | ||||||
| * | | | | | Merge branch 'erikj/fix_null_valid_until_ms' of github.com:matrix-org/synapse... | Erik Johnston | 2019-06-10 | 1 | -0/+8 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Improve startup checks for insecure notary configs (#5392) | Richard van der Hoff | 2019-06-10 | 2 | -11/+23 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms | Erik Johnston | 2019-06-10 | 1 | -0/+8 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Fix key verification when key stored with null valid_until_ms | Erik Johnston | 2019-06-10 | 1 | -0/+8 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai... | Brendan Abolivier | 2019-06-10 | 2 | -3/+14 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Better wording | Brendan Abolivier | 2019-06-10 | 1 | -1/+1 | |
| * | | | | Doc | Brendan Abolivier | 2019-06-10 | 1 | -0/+5 | |
| * | | | | Don't check whether the user's account is expired on /send_mail requests | Brendan Abolivier | 2019-06-05 | 2 | -3/+9 | |
* | | | | | 1.0.0rc1 v1.0.0rc1 | Neil Johnson | 2019-06-07 | 1 | -1/+1 | |
| |/ / / |/| | | | ||||||
* | | | | Prevent multiple device list updates from breaking a batch send (#5156) | Andrew Morgan | 2019-06-06 | 2 | -31/+126 | |
* | | | | Set default room version to v4. (#5379) | Neil Johnson | 2019-06-06 | 1 | -1/+1 | |
* | | | | Merge pull request #5320 from matrix-org/hawkowl/full-schema-v1 | Erik Johnston | 2019-06-06 | 5 | -2/+2352 | |
|\ \ \ \ | ||||||
| * | | | | fix maybe | Amber H. Brown | 2019-06-07 | 1 | -20/+2 | |
| * | | | | just user dir? | Amber H. Brown | 2019-06-07 | 1 | -1/+19 | |
| * | | | | remove background updates that arent needed | Amber H. Brown | 2019-06-07 | 1 | -33/+1 | |
| * | | | | add more comments | Amber Brown | 2019-06-06 | 1 | -0/+5 | |
| * | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1 | Amber Brown | 2019-06-04 | 39 | -323/+294 | |
| |\ \ \ \ | ||||||
| * | | | | | add stuff in bg updates | Amber Brown | 2019-06-04 | 1 | -10/+62 | |
| * | | | | | WHY IS THIS CALLED A SLIGHTLY DIFFERENT THING | Amber Brown | 2019-06-03 | 1 | -0/+1 | |
| * | | | | | more fix | Amber Brown | 2019-06-03 | 1 | -0/+38 | |
| * | | | | | fix schemas | Amber Brown | 2019-06-03 | 4 | -61/+20 | |
| * | | | | | full schema | Amber Brown | 2019-06-03 | 3 | -0/+2315 | |
| * | | | | | prepare | Amber Brown | 2019-06-03 | 1 | -2/+14 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Add ability to perform password reset via email without trusting the identity... | Andrew Morgan | 2019-06-06 | 17 | -60/+871 | |
* | | | | | Stop hardcoding trust of old matrix.org key (#5374) | Richard van der Hoff | 2019-06-06 | 2 | -74/+226 | |
* | | | | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369) | Richard van der Hoff | 2019-06-06 | 1 | -1/+7 | |
* | | | | | Merge pull request #5221 from matrix-org/erikj/fix_worker_sytest | Erik Johnston | 2019-06-06 | 1 | -1/+11 | |
|\ \ \ \ \ | ||||||
| * | | | | | Better words | Erik Johnston | 2019-06-06 | 1 | -1/+1 | |
| * | | | | | Fix get_max_topological_token to never return None | Erik Johnston | 2019-05-21 | 1 | -1/+11 | |
* | | | | | | Merge pull request #5089 from dnaf/m-heroes-empty-room-name | Brendan Abolivier | 2019-06-06 | 1 | -5/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Simplify condition | Brendan Abolivier | 2019-06-06 | 1 | -2/+2 | |
| * | | | | | | Simplify condition | Brendan Abolivier | 2019-06-05 | 1 | -3/+2 | |
| * | | | | | | Merge branch 'develop' into m-heroes-empty-room-name | Brendan Abolivier | 2019-06-05 | 136 | -1945/+5896 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Lint | Katie Wolfe | 2019-04-24 | 1 | -1/+1 | |
| * | | | | | | | Clean up code | Katie Wolfe | 2019-04-24 | 1 | -2/+3 | |
| * | | | | | | | Show heroes if room name or canonical alias are empty | Katie Wolfe | 2019-04-24 | 1 | -3/+4 | |
| * | | | | | | | Show heroes if room name or canonical alias are empty | Katie Wolfe | 2019-04-24 | 1 | -5/+3 | |
* | | | | | | | | Merge pull request #5359 from matrix-org/rav/enable_tls_verification | Richard van der Hoff | 2019-06-06 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification | Richard van der Hoff | 2019-06-05 | 7 | -22/+121 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Validate federation server TLS certificates by default. | Richard van der Hoff | 2019-06-05 | 1 | -5/+5 | |
* | | | | | | | | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_members | Brendan Abolivier | 2019-06-06 | 1 | -15/+19 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Do user_id != me checks before deciding whether we should pick heroes from th... | Brendan Abolivier | 2019-06-05 | 1 | -15/+19 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5354 from matrix-org/rav/server_keys/99-room-v5 | Richard van der Hoff | 2019-06-06 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Implement room v5 which enforces signing key validity | Richard van der Hoff | 2019-06-05 | 1 | -5/+5 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5353 from matrix-org/rav/verify_key_logging | Richard van der Hoff | 2019-06-06 | 4 | -46/+76 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Associate a request_name with each verify request, for logging | Richard van der Hoff | 2019-06-05 | 4 | -46/+76 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Fix `federation_custom_ca_list` configuration option. | Richard van der Hoff | 2019-06-05 | 1 | -1/+1 | |
* | | | | | | | | | Neilj/add r0.5 to versions (#5360) | Neil Johnson | 2019-06-05 | 1 | -0/+1 | |
* | | | | | | | | | Fix background updates to handle redactions/rejections (#5352) | Erik Johnston | 2019-06-06 | 3 | -9/+57 | |
* | | | | | | | | | Merge pull request #5317 from matrix-org/erikj/make_do_auth_non_essential | Erik Johnston | 2019-06-05 | 1 | -12/+46 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add logging when request fails and clarify we ignore errors. | Erik Johnston | 2019-06-05 | 1 | -4/+12 | |
| * | | | | | | | | | Fix handling of failures when calling /event_auth. | Erik Johnston | 2019-06-03 | 1 | -12/+38 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Neilj/mau tracking config explainer (#5284) | Neil Johnson | 2019-06-05 | 1 | -0/+16 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Add a test room version where we enforce key validity (#5348) | Richard van der Hoff | 2019-06-05 | 2 | -22/+37 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Clean up debug logging (#5347) | Richard van der Hoff | 2019-06-05 | 3 | -8/+18 | |
* | | | | | | | Rename VerifyKeyRequest.deferred field (#5343) | Richard van der Hoff | 2019-06-05 | 1 | -12/+12 | |
* | | | | | | | Call RetryLimiter correctly (#5340) | Richard van der Hoff | 2019-06-04 | 1 | -1/+6 | |
* | | | | | | | Fix failure to fetch batches of PDUs (#5342) | Richard van der Hoff | 2019-06-04 | 1 | -0/+1 | |
* | | | | | | | Rename get_events->get_events_from_store_or_dest (#5344) | Richard van der Hoff | 2019-06-04 | 1 | -20/+13 | |
* | | | | | | | Merge pull request #5341 from matrix-org/babolivier/email_config | Brendan Abolivier | 2019-06-04 | 1 | -42/+57 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | Only parse from email if provided | Brendan Abolivier | 2019-06-04 | 1 | -4/+5 | |
| * | | | | | | Lint | Brendan Abolivier | 2019-06-04 | 1 | -1/+0 | |
| * | | | | | | Make account validity renewal emails work when email notifs are disabled | Brendan Abolivier | 2019-06-04 | 1 | -42/+57 | |
* | | | | | | | Merge pull request #5324 from matrix-org/erikj/ignore_null | Erik Johnston | 2019-06-04 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix | Erik Johnston | 2019-06-03 | 1 | -1/+2 | |
| * | | | | | | | Ignore room state with null bytes in for room stats | Erik Johnston | 2019-06-03 | 1 | -0/+15 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Avoid rapidly backing-off a server if we ignore the retry interval (#5335) | Richard van der Hoff | 2019-06-04 | 1 | -23/+37 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Avoid rapidly backing-off a server if we ignore the retry interval | Richard van der Hoff | 2019-06-03 | 1 | -23/+37 | |
* | | | | | | | | Don't do long retries when calling the key notary server. (#5334) | Richard van der Hoff | 2019-06-04 | 1 | -1/+0 | |
* | | | | | | | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se... | Richard van der Hoff | 2019-06-04 | 2 | -33/+60 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Notary server: make requests to origins in parallel | Richard van der Hoff | 2019-06-04 | 2 | -11/+11 | |
| * | | | | | | | | Don't bomb out on direct key fetches as soon as one fails | Richard van der Hoff | 2019-06-04 | 1 | -22/+36 | |
| * | | | | | | | | Reduce timeout for outbound /key/v2/server requests. | Richard van der Hoff | 2019-06-03 | 1 | -0/+13 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Improve docstrings on MatrixFederationClient. (#5332) | Richard van der Hoff | 2019-06-04 | 1 | -16/+55 | |
* | | | | | | | | Hawkowl/fix missing auth (#5328) | Amber Brown | 2019-06-04 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* / / / / / / | Enforce validity period on server_keys for fed requests. (#5321) | Richard van der Hoff | 2019-06-03 | 4 | -61/+119 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-... | Richard van der Hoff | 2019-06-03 | 1 | -12/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Stop overwriting server keys with other keys | Richard van der Hoff | 2019-05-31 | 1 | -12/+2 | |
* | | | | | | | Unify v1 and v2 REST client APIs (#5226) | Amber Brown | 2019-06-03 | 38 | -311/+292 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #5309 from matrix-org/rav/limit_displayname_length | Richard van der Hoff | 2019-06-01 | 2 | -0/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Limit displaynames and avatar URLs | Richard van der Hoff | 2019-06-01 | 2 | -0/+15 | |
* | | | | | | | Merge pull request #5299 from matrix-org/rav/server_keys/05-rewrite-gsvk-again | Richard van der Hoff | 2019-05-31 | 1 | -48/+53 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/server_keys/05-rewrite... | Richard van der Hoff | 2019-05-31 | 6 | -128/+141 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| * | | | | | | | Rewrite get_server_verify_keys, again. | Richard van der Hoff | 2019-05-30 | 1 | -48/+53 | |
* | | | | | | | | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_delta | Erik Johnston | 2019-05-31 | 2 | -3/+25 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Move delta from +10% to -10% | Brendan Abolivier | 2019-05-31 | 2 | -3/+3 | |
| * | | | | | | | Gah python | Brendan Abolivier | 2019-05-31 | 1 | -1/+1 | |
| * | | | | | | | Make max_delta equal to period * 10% | Brendan Abolivier | 2019-05-31 | 2 | -15/+7 | |
| * | | | | | | | Allow configuring a range for the account validity startup job | Brendan Abolivier | 2019-05-28 | 2 | -2/+32 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5300 from matrix-org/rav/server_keys/06-fix-serverkeys-ha... | Richard van der Hoff | 2019-05-31 | 1 | -25/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove some pointless exception handling | Richard van der Hoff | 2019-05-30 | 1 | -25/+8 | |
* | | | | | | | | Merge pull request #5296 from matrix-org/rav/server_keys/04-use-attrs-for_ver... | Richard van der Hoff | 2019-05-31 | 1 | -17/+21 | |
|\| | | | | | | | ||||||
| * | | | | | | | use attr.s for VerifyKeyRequest | Richard van der Hoff | 2019-05-30 | 1 | -17/+21 | |
* | | | | | | | | Merge pull request #5293 from Kagamihime/messages-federation-format | Erik Johnston | 2019-05-31 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix ignored filter field in `/messages` endpoint | Eisha Chen-yen-su | 2019-05-30 | 1 | -0/+2 | |
* | | | | | | | | | Merge pull request #5294 from matrix-org/erikj/speed_up_room_stats | Erik Johnston | 2019-05-31 | 4 | -87/+111 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add indices. Remove room_ids accidentally added | Erik Johnston | 2019-05-31 | 2 | -13/+56 | |
| * | | | | | | | | Join against events to use its room_id index | Erik Johnston | 2019-05-30 | 1 | -1/+6 | |
| * | | | | | | | | Move deletion from table inside txn | Erik Johnston | 2019-05-30 | 1 | -2/+5 | |
| * | | | | | | | | Fetch membership counts all at once | Erik Johnston | 2019-05-30 | 2 | -38/+18 | |
| * | | | | | | | | Get events all at once | Erik Johnston | 2019-05-30 | 1 | -33/+26 | |
* | | | | | | | | | Merge branch 'master' into develop | Erik Johnston | 2019-05-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | 0.99.5.2 v0.99.5.2 github/release-v0.99.5 release-v0.99.5 | Erik Johnston | 2019-05-30 | 1 | -1/+1 | |
| * | | | | | | | | Add index to temp table | Erik Johnston | 2019-05-30 | 1 | -0/+1 | |
| * | | | | | | | | Update synapse/storage/events_bg_updates.py | Erik Johnston | 2019-05-30 | 1 | -1/+1 | |
| * | | | | | | | | Rename constant | Erik Johnston | 2019-05-30 | 1 | -3/+3 | |
| * | | | | | | | | Move event background updates to a separate file | Erik Johnston | 2019-05-30 | 3 | -369/+405 | |
| * | | | | | | | | Fixup comments and logging | Erik Johnston | 2019-05-30 | 2 | -9/+15 | |
| * | | | | | | | | Log actual number of entries deleted | Erik Johnston | 2019-05-30 | 2 | -5/+13 | |
| * | | | | | | | | Add DB bg update to cleanup extremities. | Erik Johnston | 2019-05-30 | 2 | -0/+205 | |
| * | | | | | | | | Correctly filter out extremities with soft failed prevs (#5274) | Erik Johnston | 2019-05-30 | 1 | -3/+79 | |
* | | | | | | | | | Add index to temp table | Erik Johnston | 2019-05-30 | 1 | -0/+1 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #5278 from matrix-org/erikj/cleanup_bad_extremities | Erik Johnston | 2019-05-30 | 5 | -181/+436 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update synapse/storage/events_bg_updates.py | Erik Johnston | 2019-05-30 | 1 | -1/+1 | |
| * | | | | | | | | Rename constant | Erik Johnston | 2019-05-30 | 1 | -3/+3 | |
| * | | | | | | | | Move event background updates to a separate file | Erik Johnston | 2019-05-30 | 3 | -369/+405 | |
| * | | | | | | | | Fixup comments and logging | Erik Johnston | 2019-05-30 | 2 | -9/+15 | |
| * | | | | | | | | Log actual number of entries deleted | Erik Johnston | 2019-05-29 | 2 | -5/+13 |