Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremities | Erik Johnston | 2019-06-21 | 3 | -1/+37 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | 400 | -10564/+9688 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | |
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-06-17 | 1 | -0/+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 | 2 | -1/+2 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Run Black. (#5482) | Amber Brown | 2019-06-20 | 376 | -10399/+9153 | |
* | | | | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error | Erik Johnston | 2019-06-19 | 2 | -9/+20 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | 387 | -9715/+17324 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-04-10 | 1 | -0/+1 | |
| * | | | | | | | | | 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 | 7 | -1/+166 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Run as background process and fix comments | Erik Johnston | 2019-06-19 | 3 | -4/+7 | |
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-18 | 1 | -0/+1 | |
| * | | | | | | | | | | Add experimental option to reduce extremities. | Erik Johnston | 2019-06-18 | 6 | -1/+162 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5490 from matrix-org/rav/xmlsec_in_docker | Richard van der Hoff | 2019-06-19 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2019-06-18 | 1 | -0/+1 | |
| * | | | | | | | | | | Include xmlsec in the docker image | Richard van der Hoff | 2019-06-18 | 1 | -1/+3 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typo | Brendan Abolivier | 2019-06-19 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix typo in deactivation background job | Brendan Abolivier | 2019-06-19 | 2 | -1/+2 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4276 from Ralith/performance-advice | Richard van der Hoff | 2019-06-18 | 3 | -7/+29 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | README.rst: fix header level | Richard van der Hoff | 2019-06-18 | 1 | -1/+1 | |
| * | | | | | | | | | | Improve advice regarding poor performance | Benjamin Saunders | 2019-06-09 | 3 | -7/+29 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Add some logging to 3pid invite sig verification (#5015) | David Baker | 2019-06-18 | 2 | -8/+39 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Fix seven contrib files with Python syntax errors (#5446) | cclauss | 2019-06-18 | 7 | -119/+131 | |
* | | | | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid | Brendan Abolivier | 2019-06-17 | 3 | -1/+43 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Make check_threepid_can_be_invited async | Brendan Abolivier | 2019-06-17 | 1 | -0/+1 | |
| * | | | | | | | | | Changelog | 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 | 3 | -4/+49 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-17 | 1 | -0/+1 | |
| |/ / / / / / / / / | ||||||
| * | / / / / / / / | Add third party rules hook into create room | Erik Johnston | 2019-06-17 | 2 | -4/+48 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5478 from matrix-org/joriks/demo_python3 | Jorik Schellekens | 2019-06-17 | 3 | -4/+71 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Changelog | Jorik Schellekens | 2019-06-17 | 1 | -0/+1 | |
| * | | | | | | | | | One shot demo server startup | Jorik Schellekens | 2019-06-17 | 2 | -4/+70 | |
* | | | | | | | | | | Remove Postgres 9.4 support (#5448) | Amber Brown | 2019-06-18 | 10 | -79/+50 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions | Erik Johnston | 2019-06-17 | 5 | -19/+29 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Handle failing to talk to master over replication | Erik Johnston | 2019-06-07 | 1 | -1/+9 | |
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-06-07 | 1 | -0/+1 | |
| * | | | | | | | | | 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 | 5 | -30/+124 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-07 | 1 | -0/+1 | |
| * | | | | | | | | | | Add test | Erik Johnston | 2019-06-07 | 3 | -8/+70 | |
| * | | | | | | | | | | Refactor email tests | Erik Johnston | 2019-06-07 | 1 | -22/+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 | 2 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-07 | 1 | -0/+1 | |
| * | | | | | | | | | | Only start background group attestation renewals on master | Erik Johnston | 2019-06-07 | 1 | -3/+4 | |
* | | | | | | | | | | | Move SyTest to Buildkite (#5459) | Amber Brown | 2019-06-17 | 6 | -76/+247 | |
* | | | | | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state | Erik Johnston | 2019-06-17 | 3 | -7/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-14 | 1 | -0/+1 | |
| * | | | | | | | | | | | Fix 3PID invite room state over federation. | Erik Johnston | 2019-06-14 | 1 | -6/+0 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Change to absolute path for contrib/docker | Neil Johnson | 2019-06-13 | 1 | -1/+1 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules | Brendan Abolivier | 2019-06-14 | 9 | -4/+284 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 9 | -4/+284 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive | Erik Johnston | 2019-06-14 | 4 | -12/+13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-14 | 1 | -0/+1 | |
| * | | | | | | | | | | Prometheus histograms are cumalative | Erik Johnston | 2019-06-14 | 3 | -12/+12 | |
* | | | | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_job | Brendan Abolivier | 2019-06-14 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix changelog | Brendan Abolivier | 2019-06-14 | 2 | -1/+2 | |
| * | | | | | | | | | | Changelog | Brendan Abolivier | 2019-06-14 | 1 | -0/+1 | |
| * | | | | | | | | | | 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 | 6 | -27/+68 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 6 | -27/+68 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5460 from matrix-org/joriks/demo_python3 | Jorik Schellekens | 2019-06-14 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Changelog | Jorik Schellekens | 2019-06-14 | 1 | -0/+1 | |
| * | | | | | | | | | | Use python3 in the demo | Jorik Schellekens | 2019-06-14 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_file | Erik Johnston | 2019-06-14 | 3 | -6/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-07 | 1 | -0/+1 | |
| * | | | | | | | | | | 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 | 5 | -0/+183 | |
* | | | | | | | | | | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheus | Erik Johnston | 2019-06-14 | 3 | -39/+25 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | changelog | Amber H. Brown | 2019-06-14 | 1 | -0/+1 | |
| * | | | | | | | | | fix prometheus rendering error | Amber H. Brown | 2019-06-14 | 2 | -39/+24 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Updates to the federation_client script (#5447) | Richard van der Hoff | 2019-06-13 | 2 | -5/+39 | |
* | | | | | | | | | Clean up code for sending federation EDUs. (#5381) | Richard van der Hoff | 2019-06-13 | 2 | -14/+27 | |
* | | | | | | | | | Expose statistics on extrems to prometheus (#5384) | Amber Brown | 2019-06-13 | 7 | -114/+331 | |
* | | | | | | | | | Remove Python 2.7 support. (#5425) | Amber Brown | 2019-06-12 | 9 | -170/+25 | |
* | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-11 | 18 | -50/+394 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | 1.0.0 v1.0.0 | Erik Johnston | 2019-06-11 | 6 | -4/+28 | |
| * | | | | | | | | Merge pull request #5424 from matrix-org/erikj/change_password_reset_links | Erik Johnston | 2019-06-11 | 12 | -32/+262 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Bump bleach version so that tests can run on old deps. | Erik Johnston | 2019-06-11 | 5 | -25/+1 | |
| | * | | | | | | | | Newsfile | Erik Johnston | 2019-06-11 | 1 | -0/+1 | |
| | * | | | | | | | | Change password reset links to /_matrix. | Erik Johnston | 2019-06-11 | 6 | -7/+260 | |
| | | |/ / / / / / | | |/| | | | | | | ||||||
| * / | | | | | | | Neilj/improve federation docs (#5419) | Neil Johnson | 2019-06-11 | 4 | -16/+106 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-11 | 6 | -2/+14 | |
|\| | | | | | | | ||||||
| * | | | | | | | 1.0.0rc3 v1.0.0rc3 | Erik Johnston | 2019-06-11 | 2 | -1/+7 | |
| * | | | | | | | 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 | 2 | -0/+5 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Update changelog.d/5418.bugfix | Erik Johnston | 2019-06-10 | 1 | -1/+1 | |
| | * | | | | | | | Newsfile | Erik Johnston | 2019-06-10 | 1 | -0/+1 | |
| | * | | | | | | | 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 | 3 | -10/+21 | |
* | | | | | | | | | add monthly active users to phonehome stats (#5252) | Neil Johnson | 2019-06-10 | 3 | -15/+31 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-10 | 14 | -195/+489 | |
|\| | | | | | | | ||||||
| * | | | | | | | 1.0.0rc2 v1.0.0rc2 | Erik Johnston | 2019-06-10 | 5 | -4/+12 | |
| * | | | | | | | Merge pull request #5417 from matrix-org/rav/shared_ssl_context | Erik Johnston | 2019-06-10 | 10 | -182/+455 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | fix ci on py2, again | Richard van der Hoff | 2019-06-10 | 1 | -1/+1 | |
| | * | | | | | | rename gutwrenched attr | Richard van der Hoff | 2019-06-10 | 1 | -5/+9 | |
| | * | | | | | | fix CI on python 2.7 | Richard van der Hoff | 2019-06-10 | 1 | -6/+4 | |
| | * | | | | | | fix build fails | Richard van der Hoff | 2019-06-10 | 2 | -1/+4 | |
| | * | | | | | | Tests for SSL certs for federation connections | Richard van der Hoff | 2019-06-10 | 6 | -106/+343 | |
| | * | | | | | | 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 | 3 | -1/+58 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Improve startup checks for insecure notary configs (#5392) | Richard van der Hoff | 2019-06-10 | 3 | -11/+24 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms | Erik Johnston | 2019-06-10 | 3 | -1/+58 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-06-10 | 1 | -0/+1 | |
| * | | | | | | | Fix key verification when key stored with null valid_until_ms | Erik Johnston | 2019-06-10 | 2 | -1/+57 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #5412 from SohamG/fix-4130 | Erik Johnston | 2019-06-10 | 2 | -3/+17 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Accidentally reversed pep8 fixed before, fixed now | sohamg | 2019-06-10 | 1 | -1/+1 | |
| * | | | | | | | Edited description to note that the arg will not work with daemonize set in t... | sohamg | 2019-06-10 | 1 | -2/+3 | |
| * | | | | | | | Resolved pep8 extra spacing issue | sohamg | 2019-06-10 | 1 | -1/+1 | |
| * | | | | | | | Added changelog file. | sohamg | 2019-06-10 | 1 | -0/+1 | |
| * | | | | | | | - Fix https://github.com/matrix-org/synapse/issues/4130 | sohamg | 2019-06-10 | 1 | -3/+15 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5325 from matrix-org/babolivier/port_db_account_validity | Brendan Abolivier | 2019-06-10 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Rewrite changelog | Brendan Abolivier | 2019-06-05 | 1 | -1/+1 | |
| * | | | | | | | Merge branch 'develop' into babolivier/port_db_account_validity | Brendan Abolivier | 2019-06-04 | 51 | -417/+529 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Changelog | Brendan Abolivier | 2019-06-03 | 1 | -0/+1 | |
| * | | | | | | | | Add account_validity's email_sent column to the list of boolean columns in sy... | Brendan Abolivier | 2019-06-03 | 1 | -0/+1 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai... | Brendan Abolivier | 2019-06-10 | 4 | -3/+50 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Better wording | Brendan Abolivier | 2019-06-10 | 1 | -1/+1 | |
| * | | | | | | | | Doc | Brendan Abolivier | 2019-06-10 | 1 | -0/+5 | |
| * | | | | | | | | Gah towncrier | Brendan Abolivier | 2019-06-05 | 1 | -1/+1 | |
| * | | | | | | | | Changelog | Brendan Abolivier | 2019-06-05 | 1 | -0/+1 | |
| * | | | | | | | | Don't check whether the user's account is expired on /send_mail requests | Brendan Abolivier | 2019-06-05 | 3 | -3/+44 | |
* | | | | | | | | | Liberapay is now officially recognised, update FUNDING.yml (#5386) | Andrew Morgan | 2019-06-09 | 2 | -1/+3 | |
| |_|_|_|_|/ / / |/| | | | | | | | ||||||
* | | | | | | | | Merge tag 'v1.0.0rc1' into develop | Neil Johnson | 2019-06-07 | 81 | -83/+84 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||||
| * | | | | | | | 1.0.0rc1 v1.0.0rc1 | Neil Johnson | 2019-06-07 | 81 | -83/+84 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* / | | | | | | Add a sponsor button (#5382) | Andrew Morgan | 2019-06-07 | 2 | -0/+4 | |
|/ / / / / / | ||||||
* | | | | | | Automatically retry builds when a buildkite agent is lost (#5380) | Andrew Morgan | 2019-06-07 | 2 | -0/+67 | |
* | | | | | | Prevent multiple device list updates from breaking a batch send (#5156) | Andrew Morgan | 2019-06-06 | 4 | -31/+196 | |
* | | | | | | Set default room version to v4. (#5379) | Neil Johnson | 2019-06-06 | 5 | -3/+11 | |
* | | | | | | Merge pull request #5320 from matrix-org/hawkowl/full-schema-v1 | Erik Johnston | 2019-06-06 | 7 | -2/+2356 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | 45 | -329/+299 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | 2 | -0/+4 | |
| * | | | | | | | more fix | Amber Brown | 2019-06-03 | 2 | -2/+38 | |
| * | | | | | | | fix schemas | Amber Brown | 2019-06-03 | 5 | -61/+22 | |
| * | | | | | | | full schema | Amber Brown | 2019-06-03 | 3 | -0/+2315 | |
| * | | | | | | | prepare | Amber Brown | 2019-06-03 | 1 | -2/+14 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | remove bloat | Neil Johnson | 2019-06-06 | 1 | -10/+1 | |
* | | | | | | | Add ability to perform password reset via email without trusting the identity... | Andrew Morgan | 2019-06-06 | 20 | -71/+922 | |
* | | | | | | | Stop hardcoding trust of old matrix.org key (#5374) | Richard van der Hoff | 2019-06-06 | 6 | -95/+293 | |
* | | | | | | | Neilj/1.0 upgrade notes (#5371) | Neil Johnson | 2019-06-06 | 4 | -8/+79 | |
* | | | | | | | Regen sample config before kicking off agents (#5370) | Andrew Morgan | 2019-06-06 | 2 | -2/+3 | |
* | | | | | | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369) | Richard van der Hoff | 2019-06-06 | 2 | -1/+8 | |
* | | | | | | | Merge pull request #5221 from matrix-org/erikj/fix_worker_sytest | Erik Johnston | 2019-06-06 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Better words | Erik Johnston | 2019-06-06 | 1 | -1/+1 | |
| * | | | | | | | Newsfile | Erik Johnston | 2019-05-21 | 1 | -0/+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 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add credit in the changelog | Brendan Abolivier | 2019-06-06 | 2 | -1/+1 | |
| * | | | | | | | | 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 | 350 | -3583/+9622 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | |
| * | | | | | | | | | Add full stop to 5084.bugfix | Katie Wolfe | 2019-04-24 | 1 | -1/+1 | |
| * | | | | | | | | | Add changelog.d/5084.bugfix | Katie Wolfe | 2019-04-24 | 1 | -0/+1 | |
| * | | | | | | | | | 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 | 4 | -12/+19 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification | Richard van der Hoff | 2019-06-05 | 28 | -43/+219 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update sample config | Richard van der Hoff | 2019-06-05 | 1 | -4/+4 | |
| * | | | | | | | | | | | Validate federation server TLS certificates by default. | Richard van der Hoff | 2019-06-05 | 3 | -8/+15 | |
* | | | | | | | | | | | | Merge pull request #5361 from matrix-org/rav/generate_signing_key | Richard van der Hoff | 2019-06-06 | 2 | -0/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | add a script to generate new signing_key files | Richard van der Hoff | 2019-06-05 | 2 | -0/+38 | |
* | | | | | | | | | | | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_members | Brendan Abolivier | 2019-06-06 | 2 | -15/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Properly format the changelog | Brendan Abolivier | 2019-06-05 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-06-05 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | 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 | 2 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Implement room v5 which enforces signing key validity | Richard van der Hoff | 2019-06-05 | 2 | -5/+7 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #5353 from matrix-org/rav/verify_key_logging | Richard van der Hoff | 2019-06-06 | 6 | -56/+86 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Associate a request_name with each verify request, for logging | Richard van der Hoff | 2019-06-05 | 6 | -56/+86 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #5362 from matrix-org/rav/fix_custom_ca | Richard van der Hoff | 2019-06-05 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix `federation_custom_ca_list` configuration option. | Richard van der Hoff | 2019-06-05 | 2 | -1/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Neilj/add r0.5 to versions (#5360) | Neil Johnson | 2019-06-05 | 2 | -0/+2 | |
* | | | | | | | | | | | | Fix background updates to handle redactions/rejections (#5352) | Erik Johnston | 2019-06-06 | 5 | -12/+117 | |
| |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Fix notes about well-known and acme (#5357) | Richard van der Hoff | 2019-06-05 | 2 | -6/+6 | |
* | | | | | | | | | | | Merge pull request #5317 from matrix-org/erikj/make_do_auth_non_essential | Erik Johnston | 2019-06-05 | 2 | -12/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add logging when request fails and clarify we ignore errors. | Erik Johnston | 2019-06-05 | 1 | -4/+12 | |
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-03 | 1 | -0/+1 | |
| * | | | | | | | | | | | Fix handling of failures when calling /event_auth. | Erik Johnston | 2019-06-03 | 1 | -12/+38 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Neilj/changelog clean up (#5356) | Neil Johnson | 2019-06-05 | 12 | -12/+12 | |
* | | | | | | | | | | | Neilj/mau tracking config explainer (#5284) | Neil Johnson | 2019-06-05 | 3 | -0/+33 | |
| |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Add a test room version where we enforce key validity (#5348) | Richard van der Hoff | 2019-06-05 | 3 | -22/+38 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Clean up debug logging (#5347) | Richard van der Hoff | 2019-06-05 | 4 | -8/+20 | |
* | | | | | | | | | Rename VerifyKeyRequest.deferred field (#5343) | Richard van der Hoff | 2019-06-05 | 2 | -12/+13 | |
* | | | | | | | | | Call RetryLimiter correctly (#5340) | Richard van der Hoff | 2019-06-04 | 2 | -1/+8 | |
* | | | | | | | | | Fix failure to fetch batches of PDUs (#5342) | Richard van der Hoff | 2019-06-04 | 2 | -0/+2 | |
* | | | | | | | | | Rename get_events->get_events_from_store_or_dest (#5344) | Richard van der Hoff | 2019-06-04 | 2 | -20/+14 | |
* | | | | | | | | | Merge pull request #5341 from matrix-org/babolivier/email_config | Brendan Abolivier | 2019-06-04 | 2 | -42/+58 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||||
| * | | | | | | | | 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 | 2 | -42/+58 | |
* | | | | | | | | | Merge pull request #5324 from matrix-org/erikj/ignore_null | Erik Johnston | 2019-06-04 | 2 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix | Erik Johnston | 2019-06-03 | 1 | -1/+2 | |
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-06-03 | 1 | -0/+1 | |
| * | | | | | | | | | 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 | 2 | -23/+38 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Avoid rapidly backing-off a server if we ignore the retry interval | Richard van der Hoff | 2019-06-03 | 2 | -23/+38 | |
* | | | | | | | | | | Don't do long retries when calling the key notary server. (#5334) | Richard van der Hoff | 2019-06-04 | 2 | -1/+1 | |
* | | | | | | | | | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se... | Richard van der Hoff | 2019-06-04 | 4 | -40/+66 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2019-06-04 | 1 | -0/+1 | |
| * | | | | | | | | | | 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 | 2 | -29/+41 | |
| * | | | | | | | | | | 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 | 2 | -16/+56 | |
| |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
* | | | | | | | | | Hawkowl/fix missing auth (#5328) | Amber Brown | 2019-06-04 | 2 | -0/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Enforce validity period on server_keys for fed requests. (#5321) | Richard van der Hoff | 2019-06-03 | 6 | -88/+228 | |
* | | | | | | | | Revert "Newsfile" | Erik Johnston | 2019-06-03 | 1 | -1/+0 | |
* | | | | | | | | Newsfile | Erik Johnston | 2019-06-03 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-... | Richard van der Hoff | 2019-06-03 | 2 | -12/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Stop overwriting server keys with other keys | Richard van der Hoff | 2019-05-31 | 2 | -12/+3 | |
* | | | | | | | | Unify v1 and v2 REST client APIs (#5226) | Amber Brown | 2019-06-03 | 43 | -317/+296 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #5309 from matrix-org/rav/limit_displayname_length | Richard van der Hoff | 2019-06-01 | 4 | -2/+76 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add some tests | Richard van der Hoff | 2019-06-01 | 1 | -2/+60 | |
| * | | | | | | | Limit displaynames and avatar URLs | Richard van der Hoff | 2019-06-01 | 3 | -0/+16 | |
* | | | | | | | | Merge pull request #5299 from matrix-org/rav/server_keys/05-rewrite-gsvk-again | Richard van der Hoff | 2019-05-31 | 2 | -48/+54 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/server_keys/05-rewrite... | Richard van der Hoff | 2019-05-31 | 12 | -129/+147 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| * | | | | | | | | Rewrite get_server_verify_keys, again. | Richard van der Hoff | 2019-05-30 | 2 | -48/+54 | |
* | | | | | | | | | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_delta | Erik Johnston | 2019-05-31 | 5 | -9/+39 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Sample config | Brendan Abolivier | 2019-05-31 | 1 | -1/+1 | |
| * | | | | | | | | Move delta from +10% to -10% | Brendan Abolivier | 2019-05-31 | 3 | -5/+5 | |
| * | | | | | | | | Sample config | Brendan Abolivier | 2019-05-31 | 1 | -8/+3 | |
| * | | | | | | | | Gah python | Brendan Abolivier | 2019-05-31 | 1 | -1/+1 | |
| * | | | | | | | | Make max_delta equal to period * 10% | Brendan Abolivier | 2019-05-31 | 3 | -32/+8 | |
| * | | | | | | | | Typo | Brendan Abolivier | 2019-05-28 | 1 | -1/+1 | |
| * | | | | | | | | Config and changelog | Brendan Abolivier | 2019-05-28 | 2 | -0/+8 | |
| * | | | | | | | | Allow configuring a range for the account validity startup job | Brendan Abolivier | 2019-05-28 | 3 | -2/+53 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5300 from matrix-org/rav/server_keys/06-fix-serverkeys-ha... | Richard van der Hoff | 2019-05-31 | 2 | -25/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove some pointless exception handling | Richard van der Hoff | 2019-05-30 | 2 | -25/+9 | |
* | | | | | | | | | Merge pull request #5296 from matrix-org/rav/server_keys/04-use-attrs-for_ver... | Richard van der Hoff | 2019-05-31 | 2 | -17/+22 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | use attr.s for VerifyKeyRequest | Richard van der Hoff | 2019-05-30 | 2 | -17/+22 | |
* | | | | | | | | | Merge pull request #5293 from Kagamihime/messages-federation-format | Erik Johnston | 2019-05-31 | 2 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add changelog | Eisha Chen-yen-su | 2019-05-30 | 1 | -0/+1 | |
| * | | | | | | | | | Fix ignored filter field in `/messages` endpoint | Eisha Chen-yen-su | 2019-05-30 | 1 | -0/+2 |