summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Factor out "generate_config_from_template"Richard van der Hoff2019-06-251-41/+81
* Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-253-52/+91
* Merge branch 'develop' of github.com:matrix-org/synapse into developRichard van der Hoff2019-06-255-8/+7
|\
| * Increase default log level for docker image to INFO. (#5547)Richard van der Hoff2019-06-252-5/+3
| * Update docker image to use Python 3.7. (#5546)Richard van der Hoff2019-06-253-3/+4
* | Grafana dashboard updatesRichard van der Hoff2019-06-251-1/+6814
|\ \ | |/ |/|
| * Add extremities graphs to grafana dashboardRichard van der Hoff2019-06-251-23/+832
| * format json for grafana dashboardRichard van der Hoff2019-06-251-1/+6005
|/
* Add info about black to code_style.rst (#5537)Andrew Morgan2019-06-242-45/+43
* Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-244-6/+43
|\
| * changelogRichard van der Hoff2019-06-241-0/+1
| * Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-243-6/+27
| * 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-2430-107/+88
|\|
| * changelogRichard van der Hoff2019-06-241-0/+1
| * 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-243-29/+53
|\ \
| * | 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-24397-10437/+9513
| |\ \
| * | | changelogRichard van der Hoff2019-06-191-0/+1
| * | | 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-246-20/+49
|\ \ \ \
| * | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-246-20/+49
* | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-243-17/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | NewsfileErik Johnston2019-06-241-0/+1
| * | | | Fix /messages on workers when no from param specified.Erik Johnston2019-06-242-17/+19
* | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathRichard van der Hoff2019-06-2410-12/+62
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | changelogRichard van der Hoff2019-06-245-2/+3
| * | | | 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-244-7/+59
|/ / / /
* | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-2435-67/+104
* | | | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-243-53/+94
|/ / /
* | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalRichard van der Hoff2019-06-242-6/+15
|\ \ \
| * | | Use monotonic clock where possible for metricsRichard van der Hoff2019-06-192-6/+15
* | | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-226-74/+2
| |_|/ |/| |
* | | Improve help and cmdline option names for --generate-config options (#5512)Richard van der Hoff2019-06-212-22/+29
* | | Refactor Config parser and add some comments. (#5511)Richard van der Hoff2019-06-212-14/+36
* | | Improve logging when generating config files (#5510)Richard van der Hoff2019-06-214-1/+8
* | | Only import jinja2 when needed (#5514)Andrew Morgan2019-06-212-1/+3
* | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Richard van der Hoff2019-06-212-1/+2
* | | Fix logging error when a tampered event is detected. (#5500)Richard van der Hoff2019-06-212-1/+1
* | | Merge pull request #5513 from matrix-org/erikj/fix_messages_tokenErik Johnston2019-06-212-0/+3
|\ \ \
| * | | NewsfileErik Johnston2019-06-211-0/+1
| * | | Fix /messages on worker when no token suppliedErik Johnston2019-06-211-0/+2
|/ / /
* | | Merge pull request #5505 from matrix-org/erikj/messages_workerErik Johnston2019-06-213-0/+10
|\ \ \
| * | | Update docs/workers.rst Erik Johnston2019-06-211-1/+1
| * | | NewsfileErik Johnston2019-06-211-0/+1
| * | | Support pagination API in client_reader workerErik Johnston2019-06-212-0/+9
|/ / /
* | | Merge pull request #5476 from matrix-org/erikj/histogram_extremitiesErik Johnston2019-06-213-1/+37
|\ \ \
| * | | BlackErik Johnston2019-06-201-2/+2
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_...Erik Johnston2019-06-20400-10564/+9688
| |\ \ \
| * | | | 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
| * | | | NewsfileErik Johnston2019-06-171-0/+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-202-1/+2
| |/ / / |/| | |
* | | | Run Black. (#5482)Amber Brown2019-06-20376-10399/+9153
* | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-192-9/+20
|\ \ \ \
| * | | | Fix loglineErik Johnston2019-06-181-1/+1
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi...Erik Johnston2019-06-18387-9715/+17324
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | NewsfileErik Johnston2019-04-101-0/+1
| * | | | 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-197-1/+166
|\ \ \ \ \
| * | | | | Run as background process and fix commentsErik Johnston2019-06-193-4/+7
| * | | | | NewsfileErik Johnston2019-06-181-0/+1
| * | | | | Add experimental option to reduce extremities.Erik Johnston2019-06-186-1/+162
| | |_|/ / | |/| | |
* | | | | Merge pull request #5490 from matrix-org/rav/xmlsec_in_dockerRichard van der Hoff2019-06-192-1/+4
|\ \ \ \ \
| * | | | | changelogRichard van der Hoff2019-06-181-0/+1
| * | | | | Include xmlsec in the docker imageRichard van der Hoff2019-06-181-1/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typoBrendan Abolivier2019-06-192-1/+2
|\ \ \ \ \
| * | | | | Fix typo in deactivation background jobBrendan Abolivier2019-06-192-1/+2
|/ / / / /
* | | | | Merge pull request #4276 from Ralith/performance-adviceRichard van der Hoff2019-06-183-7/+29
|\ \ \ \ \
| * | | | | README.rst: fix header levelRichard van der Hoff2019-06-181-1/+1
| * | | | | Improve advice regarding poor performanceBenjamin Saunders2019-06-093-7/+29
* | | | | | Add some logging to 3pid invite sig verification (#5015)David Baker2019-06-182-8/+39
| |/ / / / |/| | | |
* | | | | Fix seven contrib files with Python syntax errors (#5446)cclauss2019-06-187-119/+131
* | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidBrendan Abolivier2019-06-173-1/+43
|\ \ \ \ \
| * | | | | Make check_threepid_can_be_invited asyncBrendan Abolivier2019-06-171-0/+1
| * | | | | ChangelogBrendan 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-173-4/+49
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2019-06-171-0/+1
| |/ / / / /
| * | / / / Add third party rules hook into create roomErik Johnston2019-06-172-4/+48
| | |/ / / | |/| | |
* | | | | Merge pull request #5478 from matrix-org/joriks/demo_python3Jorik Schellekens2019-06-173-4/+71
|\ \ \ \ \
| * | | | | ChangelogJorik Schellekens2019-06-171-0/+1
| * | | | | One shot demo server startupJorik Schellekens2019-06-172-4/+70
* | | | | | Remove Postgres 9.4 support (#5448)Amber Brown2019-06-1810-79/+50
| |/ / / / |/| | | |
* | | | | 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
| |/ / / / / / / / / |/| | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-22 19:18:50 +0000