summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* NewsfileErik Johnston2019-06-181-0/+1
* Add experimental option to reduce extremities.Erik Johnston2019-06-186-1/+162
* Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsErik Johnston2019-06-175-19/+29
|\
| * Handle failing to talk to master over replicationErik Johnston2019-06-071-1/+9
| * NewsfileErik Johnston2019-06-071-0/+1
| * 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-175-30/+124
|\ \
| * | NewsfileErik Johnston2019-06-071-0/+1
| * | Add testErik Johnston2019-06-073-8/+70
| * | Refactor email testsErik Johnston2019-06-071-22/+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-172-3/+5
|\ \
| * | NewsfileErik Johnston2019-06-071-0/+1
| * | Only start background group attestation renewals on masterErik Johnston2019-06-071-3/+4
* | | Move SyTest to Buildkite (#5459)Amber Brown2019-06-176-76/+247
* | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-173-7/+2
|\ \ \
| * | | NewsfileErik Johnston2019-06-141-0/+1
| * | | Fix 3PID invite room state over federation.Erik Johnston2019-06-141-6/+0
| * | | Change to absolute path for contrib/dockerNeil Johnson2019-06-131-1/+1
* | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-149-4/+284
|\ \ \ \
| * | | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-149-4/+284
* | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-144-12/+13
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2019-06-141-0/+1
| * | | | | Prometheus histograms are cumalativeErik Johnston2019-06-143-12/+12
* | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_jobBrendan Abolivier2019-06-142-2/+6
|\ \ \ \ \ \
| * | | | | | Fix changelogBrendan Abolivier2019-06-142-1/+2
| * | | | | | ChangelogBrendan Abolivier2019-06-141-0/+1
| * | | | | | 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-146-27/+68
|\| | | | | |
| * | | | | | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-146-27/+68
| |/ / / / /
* | | | | | Merge pull request #5460 from matrix-org/joriks/demo_python3Jorik Schellekens2019-06-142-2/+3
|\ \ \ \ \ \
| * | | | | | ChangelogJorik Schellekens2019-06-141-0/+1
| * | | | | | Use python3 in the demoJorik Schellekens2019-06-141-2/+2
* | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileErik Johnston2019-06-143-6/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | NewsfileErik Johnston2019-06-071-0/+1
| * | | | | | 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-145-0/+183
* | | | | | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheusErik Johnston2019-06-143-39/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | changelogAmber H. Brown2019-06-141-0/+1
| * | | | | fix prometheus rendering errorAmber H. Brown2019-06-142-39/+24
|/ / / / /
* | | | | Updates to the federation_client script (#5447)Richard van der Hoff2019-06-132-5/+39
* | | | | Clean up code for sending federation EDUs. (#5381)Richard van der Hoff2019-06-132-14/+27
* | | | | Expose statistics on extrems to prometheus (#5384)Amber Brown2019-06-137-114/+331
* | | | | Remove Python 2.7 support. (#5425)Amber Brown2019-06-129-170/+25
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-1118-50/+394
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 1.0.0 v1.0.0Erik Johnston2019-06-116-4/+28
| * | | | Merge pull request #5424 from matrix-org/erikj/change_password_reset_linksErik Johnston2019-06-1112-32/+262
| |\ \ \ \
| | * | | | Bump bleach version so that tests can run on old deps.Erik Johnston2019-06-115-25/+1
| | * | | | NewsfileErik Johnston2019-06-111-0/+1
| | * | | | Change password reset links to /_matrix.Erik Johnston2019-06-116-7/+260
| | | |/ / | | |/| |
| * / | | Neilj/improve federation docs (#5419)Neil Johnson2019-06-114-16/+106
| |/ / /
* | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-116-2/+14
|\| | |
| * | | 1.0.0rc3 v1.0.0rc3Erik Johnston2019-06-112-1/+7
| * | | 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-102-0/+5
| |\ \ \
| | * | | Update changelog.d/5418.bugfixErik Johnston2019-06-101-1/+1
| | * | | NewsfileErik Johnston2019-06-101-0/+1
| | * | | 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-113-10/+21
* | | | | add monthly active users to phonehome stats (#5252)Neil Johnson2019-06-103-15/+31
* | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-1014-195/+489
|\| | | |
| * | | | 1.0.0rc2 v1.0.0rc2Erik Johnston2019-06-105-4/+12
| * | | | Merge pull request #5417 from matrix-org/rav/shared_ssl_contextErik Johnston2019-06-1010-182/+455
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | fix ci on py2, againRichard van der Hoff2019-06-101-1/+1
| | * | | rename gutwrenched attrRichard van der Hoff2019-06-101-5/+9
| | * | | fix CI on python 2.7Richard van der Hoff2019-06-101-6/+4
| | * | | fix build failsRichard van der Hoff2019-06-102-1/+4
| | * | | Tests for SSL certs for federation connectionsRichard van der Hoff2019-06-106-106/+343
| | * | | 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-103-1/+58
| |\ \ \ \
| * | | | | Improve startup checks for insecure notary configs (#5392)Richard van der Hoff2019-06-103-11/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_msErik Johnston2019-06-103-1/+58
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | NewsfileErik Johnston2019-06-101-0/+1
| * | | | Fix key verification when key stored with null valid_until_msErik Johnston2019-06-102-1/+57
| |/ / /
* | | | Merge pull request #5412 from SohamG/fix-4130Erik Johnston2019-06-102-3/+17
|\ \ \ \
| * | | | Accidentally reversed pep8 fixed before, fixed nowsohamg2019-06-101-1/+1
| * | | | Edited description to note that the arg will not work with daemonize set in t...sohamg2019-06-101-2/+3
| * | | | Resolved pep8 extra spacing issuesohamg2019-06-101-1/+1
| * | | | Added changelog file.sohamg2019-06-101-0/+1
| * | | | - Fix https://github.com/matrix-org/synapse/issues/4130sohamg2019-06-101-3/+15
* | | | | Merge pull request #5325 from matrix-org/babolivier/port_db_account_validityBrendan Abolivier2019-06-102-0/+2
|\ \ \ \ \
| * | | | | Rewrite changelogBrendan Abolivier2019-06-051-1/+1
| * | | | | Merge branch 'develop' into babolivier/port_db_account_validityBrendan Abolivier2019-06-0451-417/+529
| |\ \ \ \ \
| * | | | | | ChangelogBrendan Abolivier2019-06-031-0/+1
| * | | | | | Add account_validity's email_sent column to the list of boolean columns in sy...Brendan Abolivier2019-06-031-0/+1
* | | | | | | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai...Brendan Abolivier2019-06-104-3/+50
|\ \ \ \ \ \ \
| * | | | | | | Better wordingBrendan Abolivier2019-06-101-1/+1
| * | | | | | | DocBrendan Abolivier2019-06-101-0/+5
| * | | | | | | Gah towncrierBrendan Abolivier2019-06-051-1/+1
| * | | | | | | ChangelogBrendan Abolivier2019-06-051-0/+1
| * | | | | | | Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-053-3/+44
* | | | | | | | Liberapay is now officially recognised, update FUNDING.yml (#5386)Andrew Morgan2019-06-092-1/+3
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge tag 'v1.0.0rc1' into developNeil Johnson2019-06-0781-83/+84
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | 1.0.0rc1 v1.0.0rc1Neil Johnson2019-06-0781-83/+84
| | |_|_|_|/ | |/| | | |
* / | | | | Add a sponsor button (#5382)Andrew Morgan2019-06-072-0/+4
|/ / / / /
* | | | | Automatically retry builds when a buildkite agent is lost (#5380)Andrew Morgan2019-06-072-0/+67
* | | | | Prevent multiple device list updates from breaking a batch send (#5156)Andrew Morgan2019-06-064-31/+196
* | | | | Set default room version to v4. (#5379)Neil Johnson2019-06-065-3/+11
* | | | | Merge pull request #5320 from matrix-org/hawkowl/full-schema-v1Erik Johnston2019-06-067-2/+2356
|\ \ \ \ \
| * | | | | 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-0445-329/+299
| |\ \ \ \ \
| * | | | | | 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-032-0/+4
| * | | | | | more fixAmber Brown2019-06-032-2/+38
| * | | | | | fix schemasAmber Brown2019-06-035-61/+22
| * | | | | | full schemaAmber Brown2019-06-033-0/+2315
| * | | | | | prepareAmber Brown2019-06-031-2/+14
| | |_|/ / / | |/| | | |
* | | | | | remove bloatNeil Johnson2019-06-061-10/+1
* | | | | | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-0620-71/+922
* | | | | | Stop hardcoding trust of old matrix.org key (#5374)Richard van der Hoff2019-06-066-95/+293
* | | | | | Neilj/1.0 upgrade notes (#5371)Neil Johnson2019-06-064-8/+79
* | | | | | Regen sample config before kicking off agents (#5370)Andrew Morgan2019-06-062-2/+3
* | | | | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369)Richard van der Hoff2019-06-062-1/+8
* | | | | | Merge pull request #5221 from matrix-org/erikj/fix_worker_sytestErik Johnston2019-06-062-1/+12
|\ \ \ \ \ \
| * | | | | | Better wordsErik Johnston2019-06-061-1/+1
| * | | | | | NewsfileErik Johnston2019-05-211-0/+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-062-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Add credit in the changelogBrendan Abolivier2019-06-062-1/+1
| * | | | | | | 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-05350-3583/+9622
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| * | | | | | | | Add full stop to 5084.bugfixKatie Wolfe2019-04-241-1/+1
| * | | | | | | | Add changelog.d/5084.bugfixKatie Wolfe2019-04-241-0/+1
| * | | | | | | | 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-064-12/+19
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verificationRichard van der Hoff2019-06-0528-43/+219
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update sample configRichard van der Hoff2019-06-051-4/+4
| * | | | | | | | | | Validate federation server TLS certificates by default.Richard van der Hoff2019-06-053-8/+15
* | | | | | | | | | | Merge pull request #5361 from matrix-org/rav/generate_signing_keyRichard van der Hoff2019-06-062-0/+38
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add a script to generate new signing_key filesRichard van der Hoff2019-06-052-0/+38
* | | | | | | | | | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_membersBrendan Abolivier2019-06-062-15/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Properly format the changelogBrendan Abolivier2019-06-051-1/+1
| * | | | | | | | | | | | ChangelogBrendan Abolivier2019-06-051-0/+1
| * | | | | | | | | | | | 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-062-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implement room v5 which enforces signing key validityRichard van der Hoff2019-06-052-5/+7
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5353 from matrix-org/rav/verify_key_loggingRichard van der Hoff2019-06-066-56/+86
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Associate a request_name with each verify request, for loggingRichard van der Hoff2019-06-056-56/+86
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5362 from matrix-org/rav/fix_custom_caRichard van der Hoff2019-06-052-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix `federation_custom_ca_list` configuration option.Richard van der Hoff2019-06-052-1/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Neilj/add r0.5 to versions (#5360)Neil Johnson2019-06-052-0/+2
* | | | | | | | | | | Fix background updates to handle redactions/rejections (#5352)Erik Johnston2019-06-065-12/+117
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fix notes about well-known and acme (#5357)Richard van der Hoff2019-06-052-6/+6
* | | | | | | | | | Merge pull request #5317 from matrix-org/erikj/make_do_auth_non_essentialErik Johnston2019-06-052-12/+47
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add logging when request fails and clarify we ignore errors.Erik Johnston2019-06-051-4/+12
| * | | | | | | | | | NewsfileErik Johnston2019-06-031-0/+1
| * | | | | | | | | | Fix handling of failures when calling /event_auth.Erik Johnston2019-06-031-12/+38
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Neilj/changelog clean up (#5356)Neil Johnson2019-06-0512-12/+12
* | | | | | | | | | Neilj/mau tracking config explainer (#5284)Neil Johnson2019-06-053-0/+33
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Add a test room version where we enforce key validity (#5348)Richard van der Hoff2019-06-053-22/+38
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Clean up debug logging (#5347)Richard van der Hoff2019-06-054-8/+20
* | | | | | | | Rename VerifyKeyRequest.deferred field (#5343)Richard van der Hoff2019-06-052-12/+13
* | | | | | | | Call RetryLimiter correctly (#5340)Richard van der Hoff2019-06-042-1/+8
* | | | | | | | Fix failure to fetch batches of PDUs (#5342)Richard van der Hoff2019-06-042-0/+2
* | | | | | | | Rename get_events->get_events_from_store_or_dest (#5344)Richard van der Hoff2019-06-042-20/+14
* | | | | | | | Merge pull request #5341 from matrix-org/babolivier/email_configBrendan Abolivier2019-06-042-42/+58
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | 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-042-42/+58
* | | | | | | | Merge pull request #5324 from matrix-org/erikj/ignore_nullErik Johnston2019-06-042-0/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | FixErik Johnston2019-06-031-1/+2
| * | | | | | | | NewsfileErik Johnston2019-06-031-0/+1
| * | | | | | | | 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-042-23/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid rapidly backing-off a server if we ignore the retry intervalRichard van der Hoff2019-06-032-23/+38
* | | | | | | | | Don't do long retries when calling the key notary server. (#5334)Richard van der Hoff2019-06-042-1/+1
* | | | | | | | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se...Richard van der Hoff2019-06-044-40/+66
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | changelogRichard van der Hoff2019-06-041-0/+1
| * | | | | | | | | 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-042-29/+41
| * | | | | | | | | 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-042-16/+56
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Hawkowl/fix missing auth (#5328)Amber Brown2019-06-042-0/+2
|/ / / / / / /
* | | | | | | Enforce validity period on server_keys for fed requests. (#5321)Richard van der Hoff2019-06-036-88/+228
* | | | | | | Revert "Newsfile"Erik Johnston2019-06-031-1/+0
* | | | | | | NewsfileErik Johnston2019-06-031-0/+1
|/ / / / / /
* | | | | | Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-...Richard van der Hoff2019-06-032-12/+3
|\ \ \ \ \ \
| * | | | | | Stop overwriting server keys with other keysRichard van der Hoff2019-05-312-12/+3
* | | | | | | Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0343-317/+296
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #5309 from matrix-org/rav/limit_displayname_lengthRichard van der Hoff2019-06-014-2/+76
|\ \ \ \ \ \
| * | | | | | add some testsRichard van der Hoff2019-06-011-2/+60
| * | | | | | Limit displaynames and avatar URLsRichard van der Hoff2019-06-013-0/+16
* | | | | | | Merge pull request #5299 from matrix-org/rav/server_keys/05-rewrite-gsvk-againRichard van der Hoff2019-05-312-48/+54
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/server_keys/05-rewrite...Richard van der Hoff2019-05-3112-129/+147
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Rewrite get_server_verify_keys, again.Richard van der Hoff2019-05-302-48/+54
* | | | | | | | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_deltaErik Johnston2019-05-315-9/+39
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Sample configBrendan Abolivier2019-05-311-1/+1
| * | | | | | | Move delta from +10% to -10%Brendan Abolivier2019-05-313-5/+5
| * | | | | | | Sample configBrendan Abolivier2019-05-311-8/+3
| * | | | | | | Gah pythonBrendan Abolivier2019-05-311-1/+1
| * | | | | | | Make max_delta equal to period * 10%Brendan Abolivier2019-05-313-32/+8
| * | | | | | | TypoBrendan Abolivier2019-05-281-1/+1
| * | | | | | | Config and changelogBrendan Abolivier2019-05-282-0/+8
| * | | | | | | Allow configuring a range for the account validity startup jobBrendan Abolivier2019-05-283-2/+53
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5300 from matrix-org/rav/server_keys/06-fix-serverkeys-ha...Richard van der Hoff2019-05-312-25/+9
|\ \ \ \ \ \ \
| * | | | | | | Remove some pointless exception handlingRichard van der Hoff2019-05-302-25/+9
* | | | | | | | Merge pull request #5296 from matrix-org/rav/server_keys/04-use-attrs-for_ver...Richard van der Hoff2019-05-312-17/+22
|\| | | | | | |
| * | | | | | | use attr.s for VerifyKeyRequestRichard van der Hoff2019-05-302-17/+22
* | | | | | | | Merge pull request #5293 from Kagamihime/messages-federation-formatErik Johnston2019-05-312-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add changelogEisha Chen-yen-su2019-05-301-0/+1
| * | | | | | | | Fix ignored filter field in `/messages` endpointEisha Chen-yen-su2019-05-301-0/+2
* | | | | | | | | Merge pull request #5294 from matrix-org/erikj/speed_up_room_statsErik Johnston2019-05-315-87/+112
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2019-05-311-0/+1
| * | | | | | | | | Add indices. Remove room_ids accidentally addedErik Johnston2019-05-312-13/+56
| * | | | | | | | | Join against events to use its room_id indexErik Johnston2019-05-301-1/+6
| * | | | | | | | | Move deletion from table inside txnErik Johnston2019-05-301-2/+5
| * | | | | | | | | Fetch membership counts all at onceErik Johnston2019-05-302-38/+18
| * | | | | | | | | Get events all at onceErik Johnston2019-05-301-33/+26
* | | | | | | | | | Clarify that the admin change password endpoint logs them out (#5303)Travis Ralston2019-05-312-1/+2
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' into developErik Johnston2019-05-303-3/+17
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | 0.99.5.2 v0.99.5.2 github/release-v0.99.5 release-v0.99.5Erik Johnston2019-05-306-4/+16
| * | | | | | | fix changelog for 0.99.5.1 (#5270)Richard van der Hoff2019-05-301-2/+1
| * | | | | | | NewsfileErik Johnston2019-05-301-0/+1
| * | | | | | | Add index to temp tableErik Johnston2019-05-301-0/+1
| * | | | | | | Update synapse/storage/events_bg_updates.pyErik Johnston2019-05-301-1/+1
| * | | | | | | Rename constantErik Johnston2019-05-301-3/+3
| * | | | | | | Move event background updates to a separate fileErik Johnston2019-05-303-369/+405
| * | | | | | | Fixup comments and loggingErik Johnston2019-05-302-9/+15
| * | | | | | | NewsfileErik Johnston2019-05-301-0/+1
| * | | | | | | Add testErik Johnston2019-05-301-0/+248
| * | | | | | | Log actual number of entries deletedErik Johnston2019-05-302-5/+13
| * | | | | | | Add DB bg update to cleanup extremities.Erik Johnston2019-05-302-0/+205
| * | | | | | | Correctly filter out extremities with soft failed prevs (#5274)Erik Johnston2019-05-302-3/+80
* | | | | | | | Merge pull request #5291 from matrix-org/erikj/add_indexErik Johnston2019-05-302-0/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | NewsfileErik Johnston2019-05-301-0/+1
| * | | | | | | Add index to temp tableErik Johnston2019-05-301-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #5278 from matrix-org/erikj/cleanup_bad_extremitiesErik Johnston2019-05-307-181/+685
|\ \ \ \ \ \ \
| * | | | | | | Update synapse/storage/events_bg_updates.pyErik Johnston2019-05-301-1/+1
| * | | | | | | Rename constantErik Johnston2019-05-301-3/+3
| * | | | | | | Move event background updates to a separate fileErik Johnston2019-05-303-369/+405
| * | | | | | | Fixup comments and loggingErik Johnston2019-05-302-9/+15
| * | | | | | | NewsfileErik Johnston2019-05-291-0/+1
| * | | | | | | Add testErik Johnston2019-05-291-0/+248
| * | | | | | | Log actual number of entries deletedErik Johnston2019-05-292-5/+13
| * | | | | | | Add DB bg update to cleanup extremities.Erik Johnston2019-05-292-0/+205
* | | | | | | | Merge pull request #5256 from aaronraimist/logout-correct-errorErik Johnston2019-05-302-18/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | LintAaron Raimist2019-05-291-2/+0
| * | | | | | | | Get rid of try exceptAaron Raimist2019-05-271-16/+9
| * | | | | | | | Add changelogAaron Raimist2019-05-251-0/+1
| * | | | | | | | Show correct error when logging out and access token is missingAaron Raimist2019-05-241-4/+4