summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-114-93/+86
* Add basic opentracing support (#5544)Jorik Schellekens2019-07-1110-12/+615
* Inline issue_access_token (#5659)Richard van der Hoff2019-07-111-7/+3
* Merge pull request #5658 from matrix-org/babolivier/is-jsonBrendan Abolivier2019-07-101-1/+1
|\
| * TypoBrendan Abolivier2019-07-101-1/+1
| * Send 3PID bind requests as JSON dataBrendan Abolivier2019-07-101-1/+1
* | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-102-21/+5
|/
* Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
* Merge pull request #5638 from matrix-org/babolivier/invite-jsonBrendan Abolivier2019-07-091-4/+18
|\
| * Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-08105-1513/+1630
| |\
| * | LintBrendan Abolivier2019-07-081-1/+2
| * | Use application/json when querying the IS's /store-invite endpointBrendan Abolivier2019-07-081-4/+17
* | | remove unused and unnecessary check for FederationDeniedError (#5645)Hubert Chathi2019-07-091-4/+1
* | | Include the original event in /relations (#5626)Andrew Morgan2019-07-092-4/+6
* | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-091-0/+4
|\ \ \
| * | | Allow newly-registered users to lookup their own profilesBrendan Abolivier2019-07-081-0/+4
| | |/ | |/|
* | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-086-56/+15
* | | Better logging for auto-join. (#5643)Richard van der Hoff2019-07-081-0/+7
|/ /
* | Update ModuleApi to avoid register(generate_token=True) (#5640)Richard van der Hoff2019-07-081-8/+56
* | Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-39/+10
* | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-081-51/+0
* | Add default push rule to ignore reactions (#5623)J. Ryan Stinnett2019-07-051-0/+13
* | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-051-1/+5
* | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-056-196/+2
* | remove dead transaction persist code (#5622)Richard van der Hoff2019-07-053-69/+0
* | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-052-10/+10
* | Make errors about email password resets much clearer (#5616)Andrew Morgan2019-07-051-11/+8
* | Improve the backwards compatibility re-exports of synapse.logging.context (#5...Amber Brown2019-07-053-5/+61
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-07-041-1/+1
|\ \
| * | 1.1.0Erik Johnston2019-07-041-1/+1
* | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0471-141/+153
* | | Fix 'utime went backwards' errors on daemonization. (#5609)Richard van der Hoff2019-07-032-31/+43
|/ /
* | 1.1.0rc2 v1.1.0rc2Richard van der Hoff2019-07-031-1/+1
* | Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-034-6/+34
* | Fix media repo breaking (#5593)Amber Brown2019-07-023-12/+24
* | prepare v1.1.0rc1Richard van der Hoff2019-07-021-1/+1
* | Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-025-44/+209
|\ \
| * \ Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-0122-205/+303
| |\ \
| * | | Address review commentsRichard van der Hoff2019-07-011-5/+7
| * | | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| * | | cleanupsRichard van der Hoff2019-06-273-11/+18
| * | | Add support for tracking SAML2 sessions.Richard van der Hoff2019-06-262-3/+56
| * | | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-264-50/+96
| * | | Revert redundant changes to static jsRichard van der Hoff2019-06-261-4/+2
| * | | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-26304-9516/+9216
| |\ \ \
| * \ \ \ Merge tag 'v1.0.0rc3' into rav/saml2_clientRichard van der Hoff2019-06-114-2/+7
| |\ \ \ \
| * | | | | Code cleanups and simplifications.Richard van der Hoff2019-06-116-50/+53
| * | | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-1085-861/+4648
| |\ \ \ \ \
| * | | | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-025-2/+55
* | | | | | | Fix JWT login with new users (#5586)PauRE2019-07-021-6/+3
* | | | | | | fix async/await consentresource (#5585)Amber Brown2019-07-011-1/+3
* | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopErik Johnston2019-07-011-2/+19
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fixup commentErik Johnston2019-07-011-6/+13
| * | | | | | Fix sync tightloop bug.Erik Johnston2019-06-211-2/+12
* | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-299-156/+114
* | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimitBrendan Abolivier2019-06-281-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| * | | | | | | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Don't log GC 0s at INFO (#5557)Amber Brown2019-06-281-1/+4
* | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Amber Brown2019-06-282-7/+64
* | | | | | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-273-1/+11
* | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2019-06-271-1/+9
* | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesErik Johnston2019-06-273-37/+97
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Review commentsErik Johnston2019-06-272-7/+5
| * | | | | | Refactor and comment sync device list codeErik Johnston2019-06-261-17/+53
| * | | | | | Use batch_iter and correct docstringErik Johnston2019-06-261-15/+12
| * | | | | | Rename get_users_whose_devices_changedErik Johnston2019-06-263-5/+5
| * | | | | | Refactor get_user_ids_changed to pull less from DBErik Johnston2019-06-263-28/+57
| | |_|_|_|/ | |/| | | |
* / | | | | Fix JWT login (#5555)PauRE2019-06-272-1/+2
|/ / / / /
* | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-252-52/+90
* | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-242-5/+41
|\ \ \ \ \
| * | | | | Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-242-5/+26
| * | | | | Add --data-directory commandline argumentRichard van der Hoff2019-06-241-0/+15
* | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsRichard van der Hoff2019-06-2429-107/+87
|\| | | | |
| * | | | | Don't load the generated config as the default.Richard van der Hoff2019-06-2429-94/+60
| * | | | | Ensure that all config options have sensible defaultsRichard van der Hoff2019-06-244-13/+27
* | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metricsRichard van der Hoff2019-06-242-29/+52
|\ \ \ \ \ \
| * | | | | | blackRichard van der Hoff2019-06-241-6/+2
| * | | | | | Avoid raising exceptions in metricsRichard van der Hoff2019-06-241-8/+14
| * | | | | | Merge branch 'develop' into rav/cleanup_metricsRichard van der Hoff2019-06-24291-9106/+8018
| |\ \ \ \ \ \
| * | | | | | | Sanity-checking for metrics updatesRichard van der Hoff2019-06-191-7/+33
| * | | | | | | Simplify PerformanceCounters.update interfaceRichard van der Hoff2019-06-191-11/+12
| * | | | | | | Remove unused _get_event_countersRichard van der Hoff2019-06-191-7/+1
* | | | | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-243-15/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-243-15/+39
* | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-242-17/+19
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix /messages on workers when no from param specified.Erik Johnston2019-06-242-17/+19
* | | | | | | | | Remove unused Config.config_dir_path attributeRichard van der Hoff2019-06-241-3/+0
* | | | | | | | | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-243-7/+52
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-2430-63/+99
* | | | | | | | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-242-53/+93
|/ / / / / / /
* | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalRichard van der Hoff2019-06-241-6/+14
|\ \ \ \ \ \ \
| * | | | | | | Use monotonic clock where possible for metricsRichard van der Hoff2019-06-191-6/+14
* | | | | | | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-224-51/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Improve help and cmdline option names for --generate-config options (#5512)Richard van der Hoff2019-06-211-22/+28
* | | | | | | Refactor Config parser and add some comments. (#5511)Richard van der Hoff2019-06-211-14/+35
* | | | | | | Improve logging when generating config files (#5510)Richard van der Hoff2019-06-213-1/+7
* | | | | | | Only import jinja2 when needed (#5514)Andrew Morgan2019-06-211-1/+2
* | | | | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Richard van der Hoff2019-06-211-1/+1
* | | | | | | Fix logging error when a tampered event is detected. (#5500)Richard van der Hoff2019-06-211-1/+0
* | | | | | | Fix /messages on worker when no token suppliedErik Johnston2019-06-211-0/+2
* | | | | | | Support pagination API in client_reader workerErik Johnston2019-06-211-0/+2
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremitiesErik Johnston2019-06-212-1/+36
|\ \ \ \ \ \
| * | | | | | BlackErik Johnston2019-06-201-2/+2
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_...Erik Johnston2019-06-20292-9079/+7986
| |\ \ \ \ \ \
| * | | | | | | Add descriptions and remove redundant set(..)Erik Johnston2019-06-192-4/+7
| * | | | | | | Only count non-cache state resolutionErik Johnston2019-06-181-3/+3
| * | | | | | | Use consistent bucketsErik Johnston2019-06-181-1/+1
| * | | | | | | Add metric fo number of state groups in resolutionErik Johnston2019-06-171-0/+10
| * | | | | | | Add metrics for len of new extremities persisted.Erik Johnston2019-06-171-1/+23
* | | | | | | | Improve email notification logging (#5502)Neil Johnson2019-06-201-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Run Black. (#5482)Amber Brown2019-06-20291-9076/+7753
* | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-191-9/+19
|\ \ \ \ \ \ \
| * | | | | | | Fix loglineErik Johnston2019-06-181-1/+1
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi...Erik Johnston2019-06-18171-2326/+11195
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Handle the case of `get_missing_events` failingErik Johnston2019-04-101-9/+20
* | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsErik Johnston2019-06-195-1/+124
|\ \ \ \ \ \ \ \
| * | | | | | | | Run as background process and fix commentsErik Johnston2019-06-192-3/+6
| * | | | | | | | Add experimental option to reduce extremities.Erik Johnston2019-06-185-1/+121
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Fix typo in deactivation background jobBrendan Abolivier2019-06-191-1/+1
* | | | | | | | Add some logging to 3pid invite sig verification (#5015)David Baker2019-06-181-8/+38
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidBrendan Abolivier2019-06-172-1/+42
|\ \ \ \ \ \ \
| * | | | | | | Make check_threepid_can_be_invited asyncBrendan Abolivier2019-06-171-0/+1
| * | | | | | | Add third party rules hook for 3PID invitesBrendan Abolivier2019-06-172-1/+41
* | | | | | | | Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_developErik Johnston2019-06-172-4/+48
|\| | | | | | |
| * | | | | | | Add third party rules hook into create roomErik Johnston2019-06-172-4/+48
| |/ / / / / /
* / / / / / / Remove Postgres 9.4 support (#5448)Amber Brown2019-06-182-24/+6
|/ / / / / /
* | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsErik Johnston2019-06-174-19/+28
|\ \ \ \ \ \
| * | | | | | Handle failing to talk to master over replicationErik Johnston2019-06-071-1/+9
| * | | | | | Handle HttpResponseException when using federation client.Erik Johnston2019-06-073-18/+19
* | | | | | | Merge pull request #5388 from matrix-org/erikj/fix_email_pushErik Johnston2019-06-173-7/+53
|\ \ \ \ \ \ \
| * | | | | | | Add testErik Johnston2019-06-072-7/+42
| * | | | | | | Fix email notifications for large unnamed rooms.Erik Johnston2019-06-071-0/+11
| |/ / / / / /
* | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterErik Johnston2019-06-171-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Only start background group attestation renewals on masterErik Johnston2019-06-071-3/+4
* | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-171-6/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix 3PID invite room state over federation.Erik Johnston2019-06-141-6/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-146-4/+191
|\ \ \ \ \ \ \ \
| * | | | | | | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-146-4/+191
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-142-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Prometheus histograms are cumalativeErik Johnston2019-06-142-2/+2
* | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_jobBrendan Abolivier2019-06-141-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix background job for deactivated flagBrendan Abolivier2019-06-141-2/+4
* | | | | | | | | | Merge pull request #5462 from matrix-org/babolivier/account_validity_deactiva...Brendan Abolivier2019-06-144-2/+25
|\| | | | | | | | |
| * | | | | | | | | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-144-2/+25
| |/ / / / / / / /
* | | | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileErik Johnston2019-06-142-6/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Don't log exception when failing to fetch remote content.Erik Johnston2019-06-072-6/+13
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Track deactivated accounts in the database (#5378)Brendan Abolivier2019-06-143-0/+137
* | | | | | | | fix prometheus rendering errorAmber H. Brown2019-06-141-1/+1
* | | | | | | | Clean up code for sending federation EDUs. (#5381)Richard van der Hoff2019-06-131-14/+26
* | | | | | | | Expose statistics on extrems to prometheus (#5384)Amber Brown2019-06-132-33/+123
* | | | | | | | Remove Python 2.7 support. (#5425)Amber Brown2019-06-122-2/+9
* | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-116-9/+9
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | 1.0.0 v1.0.0Erik Johnston2019-06-111-1/+1
| * | | | | | | Bump bleach version so that tests can run on old deps.Erik Johnston2019-06-111-1/+1
| * | | | | | | Change password reset links to /_matrix.Erik Johnston2019-06-114-7/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-114-2/+7
|\| | | | | |
| * | | | | | 1.0.0rc3 v1.0.0rc3Erik Johnston2019-06-111-1/+1
| * | | | | | Fix defaults on checking threepidsErik Johnston2019-06-102-1/+2
| * | | | | | Merge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zeroErik Johnston2019-06-101-0/+4
| |\ \ \ \ \ \
| | * | | | | | Fix bug sending federation transactions with lots of EDUsErik Johnston2019-06-101-0/+4
* | | | | | | | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-112-10/+20
* | | | | | | | add monthly active users to phonehome stats (#5252)Neil Johnson2019-06-102-15/+30
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-105-87/+134
|\| | | | | |
| * | | | | | 1.0.0rc2 v1.0.0rc2Erik Johnston2019-06-101-1/+1
| * | | | | | Merge pull request #5417 from matrix-org/rav/shared_ssl_contextErik Johnston2019-06-102-75/+110
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | rename gutwrenched attrRichard van der Hoff2019-06-101-5/+9
| | * | | | | Fix federation connections to literal IP addressesRichard van der Hoff2019-06-102-6/+11
| | * | | | | clean up impl, and import idna directlyRichard van der Hoff2019-06-102-15/+12
| | * | | | | Share an SSL context object between SSL connectionsRichard van der Hoff2019-06-091-60/+89
| | |/ / / /
| * | | | | Merge branch 'erikj/fix_null_valid_until_ms' of github.com:matrix-org/synapse...Erik Johnston2019-06-101-0/+8
| |\ \ \ \ \
| * | | | | | Improve startup checks for insecure notary configs (#5392)Richard van der Hoff2019-06-102-11/+23
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_msErik Johnston2019-06-101-0/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix key verification when key stored with null valid_until_msErik Johnston2019-06-101-0/+8
| |/ / / /
* | | | | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai...Brendan Abolivier2019-06-102-3/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Better wordingBrendan Abolivier2019-06-101-1/+1
| * | | | DocBrendan Abolivier2019-06-101-0/+5
| * | | | Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-052-3/+9
* | | | | 1.0.0rc1 v1.0.0rc1Neil Johnson2019-06-071-1/+1
| |/ / / |/| | |
* | | | Prevent multiple device list updates from breaking a batch send (#5156)Andrew Morgan2019-06-062-31/+126
* | | | Set default room version to v4. (#5379)Neil Johnson2019-06-061-1/+1
* | | | Merge pull request #5320 from matrix-org/hawkowl/full-schema-v1Erik Johnston2019-06-065-2/+2352
|\ \ \ \
| * | | | fix maybeAmber H. Brown2019-06-071-20/+2
| * | | | just user dir?Amber H. Brown2019-06-071-1/+19
| * | | | remove background updates that arent neededAmber H. Brown2019-06-071-33/+1
| * | | | add more commentsAmber Brown2019-06-061-0/+5
| * | | | Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1Amber Brown2019-06-0439-323/+294
| |\ \ \ \
| * | | | | add stuff in bg updatesAmber Brown2019-06-041-10/+62
| * | | | | WHY IS THIS CALLED A SLIGHTLY DIFFERENT THINGAmber Brown2019-06-031-0/+1
| * | | | | more fixAmber Brown2019-06-031-0/+38
| * | | | | fix schemasAmber Brown2019-06-034-61/+20
| * | | | | full schemaAmber Brown2019-06-033-0/+2315
| * | | | | prepareAmber Brown2019-06-031-2/+14
| | |_|_|/ | |/| | |
* | | | | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-0617-60/+871
* | | | | Stop hardcoding trust of old matrix.org key (#5374)Richard van der Hoff2019-06-062-74/+226
* | | | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369)Richard van der Hoff2019-06-061-1/+7
* | | | | Merge pull request #5221 from matrix-org/erikj/fix_worker_sytestErik Johnston2019-06-061-1/+11
|\ \ \ \ \
| * | | | | Better wordsErik Johnston2019-06-061-1/+1
| * | | | | Fix get_max_topological_token to never return NoneErik Johnston2019-05-211-1/+11
* | | | | | Merge pull request #5089 from dnaf/m-heroes-empty-room-nameBrendan Abolivier2019-06-061-5/+4
|\ \ \ \ \ \
| * | | | | | Simplify conditionBrendan Abolivier2019-06-061-2/+2
| * | | | | | Simplify conditionBrendan Abolivier2019-06-051-3/+2
| * | | | | | Merge branch 'develop' into m-heroes-empty-room-nameBrendan Abolivier2019-06-05136-1945/+5896
| |\ \ \ \ \ \
| * | | | | | | LintKatie Wolfe2019-04-241-1/+1
| * | | | | | | Clean up codeKatie Wolfe2019-04-241-2/+3
| * | | | | | | Show heroes if room name or canonical alias are emptyKatie Wolfe2019-04-241-3/+4
| * | | | | | | Show heroes if room name or canonical alias are emptyKatie Wolfe2019-04-241-5/+3
* | | | | | | | Merge pull request #5359 from matrix-org/rav/enable_tls_verificationRichard van der Hoff2019-06-061-5/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verificationRichard van der Hoff2019-06-057-22/+121
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Validate federation server TLS certificates by default.Richard van der Hoff2019-06-051-5/+5
* | | | | | | | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_membersBrendan Abolivier2019-06-061-15/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do user_id != me checks before deciding whether we should pick heroes from th...Brendan Abolivier2019-06-051-15/+19
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5354 from matrix-org/rav/server_keys/99-room-v5Richard van der Hoff2019-06-061-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement room v5 which enforces signing key validityRichard van der Hoff2019-06-051-5/+5
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5353 from matrix-org/rav/verify_key_loggingRichard van der Hoff2019-06-064-46/+76
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Associate a request_name with each verify request, for loggingRichard van der Hoff2019-06-054-46/+76
| |/ / / / / / / /
* | | | | | | | | Fix `federation_custom_ca_list` configuration option.Richard van der Hoff2019-06-051-1/+1
* | | | | | | | | Neilj/add r0.5 to versions (#5360)Neil Johnson2019-06-051-0/+1
* | | | | | | | | Fix background updates to handle redactions/rejections (#5352)Erik Johnston2019-06-063-9/+57
* | | | | | | | | Merge pull request #5317 from matrix-org/erikj/make_do_auth_non_essentialErik Johnston2019-06-051-12/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add logging when request fails and clarify we ignore errors.Erik Johnston2019-06-051-4/+12
| * | | | | | | | | Fix handling of failures when calling /event_auth.Erik Johnston2019-06-031-12/+38
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Neilj/mau tracking config explainer (#5284)Neil Johnson2019-06-051-0/+16
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Add a test room version where we enforce key validity (#5348)Richard van der Hoff2019-06-052-22/+37
| |/ / / / / / |/| | | | | |
* | | | | | | Clean up debug logging (#5347)Richard van der Hoff2019-06-053-8/+18
* | | | | | | Rename VerifyKeyRequest.deferred field (#5343)Richard van der Hoff2019-06-051-12/+12
* | | | | | | Call RetryLimiter correctly (#5340)Richard van der Hoff2019-06-041-1/+6
* | | | | | | Fix failure to fetch batches of PDUs (#5342)Richard van der Hoff2019-06-041-0/+1
* | | | | | | Rename get_events->get_events_from_store_or_dest (#5344)Richard van der Hoff2019-06-041-20/+13
* | | | | | | Merge pull request #5341 from matrix-org/babolivier/email_configBrendan Abolivier2019-06-041-42/+57
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Only parse from email if providedBrendan Abolivier2019-06-041-4/+5
| * | | | | | LintBrendan Abolivier2019-06-041-1/+0
| * | | | | | Make account validity renewal emails work when email notifs are disabledBrendan Abolivier2019-06-041-42/+57
* | | | | | | Merge pull request #5324 from matrix-org/erikj/ignore_nullErik Johnston2019-06-041-0/+16
|\ \ \ \ \ \ \
| * | | | | | | FixErik Johnston2019-06-031-1/+2
| * | | | | | | Ignore room state with null bytes in for room statsErik Johnston2019-06-031-0/+15
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Avoid rapidly backing-off a server if we ignore the retry interval (#5335)Richard van der Hoff2019-06-041-23/+37
|\ \ \ \ \ \ \
| * | | | | | | Avoid rapidly backing-off a server if we ignore the retry intervalRichard van der Hoff2019-06-031-23/+37
* | | | | | | | Don't do long retries when calling the key notary server. (#5334)Richard van der Hoff2019-06-041-1/+0
* | | | | | | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se...Richard van der Hoff2019-06-042-33/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | Notary server: make requests to origins in parallelRichard van der Hoff2019-06-042-11/+11
| * | | | | | | | Don't bomb out on direct key fetches as soon as one failsRichard van der Hoff2019-06-041-22/+36
| * | | | | | | | Reduce timeout for outbound /key/v2/server requests.Richard van der Hoff2019-06-031-0/+13
| |/ / / / / / /
* | | | | | | | Improve docstrings on MatrixFederationClient. (#5332)Richard van der Hoff2019-06-041-16/+55
* | | | | | | | Hawkowl/fix missing auth (#5328)Amber Brown2019-06-041-0/+1
|/ / / / / / /
* / / / / / / Enforce validity period on server_keys for fed requests. (#5321)Richard van der Hoff2019-06-034-61/+119
|/ / / / / /
* | | | | | Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-...Richard van der Hoff2019-06-031-12/+2
|\ \ \ \ \ \
| * | | | | | Stop overwriting server keys with other keysRichard van der Hoff2019-05-311-12/+2
* | | | | | | Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0338-311/+292
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #5309 from matrix-org/rav/limit_displayname_lengthRichard van der Hoff2019-06-012-0/+15
|\ \ \ \ \ \