summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4799 from matrix-org/rav/clean_up_replication_codeErik Johnston2019-03-052-60/+6
|\
| * changelogRichard van der Hoff2019-03-041-0/+1
| * Remove redundant PreserveLoggingContextRichard van der Hoff2019-03-041-10/+5
| * Remove unused `wait_for_replication` methodRichard van der Hoff2019-03-041-50/+0
* | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-0511-747/+765
|\ \
| * | NewsfileErik Johnston2019-03-041-0/+1
| * | Allow /keys/{changes,query} API to run on workerErik Johnston2019-03-043-2/+15
| * | Split DeviceHandler into master and workerErik Johnston2019-03-042-170/+179
| * | Fixup slave storesErik Johnston2019-03-046-577/+572
* | | Merge pull request #4798 from matrix-org/rav/rr_debugRichard van der Hoff2019-03-042-6/+21
|\ \ \
| * | | Add some debug about processing read receipts.Richard van der Hoff2019-03-042-6/+21
* | | | Merge pull request #4797 from matrix-org/rav/inline_rr_sendRichard van der Hoff2019-03-042-59/+45
|\| | | | |_|/ |/| |
| * | Clean up read-receipt handling.Richard van der Hoff2019-03-042-59/+45
|/ /
* / Include a default configuration file in the 'docs' directory. (#4791)Richard van der Hoff2019-03-0411-13/+1114
|/
* Fix v4v6 option in HAProxy example config (#4790)Seebi2019-03-042-7/+6
* Avoid rebuilding Edu objects in worker mode (#4770)Richard van der Hoff2019-03-046-19/+37
* Update test_typing to use HomeserverTestCase. (#4771)Richard van der Hoff2019-03-045-179/+176
* Fix incorrect log about not persisting duplicate state event. (#4776)Richard van der Hoff2019-03-012-3/+5
* Merge branch 'master' into developRichard van der Hoff2019-03-013-6/+6
|\
| * 0.99.2 v0.99.2 github/release-v0.99.2 release-v0.99.2Richard van der Hoff2019-03-011-6/+0
| * 0.99.2Richard van der Hoff2019-03-013-4/+10
* | Minor docstring fixes for MatrixFederationAgent (#4765)Andrew Morgan2019-02-282-1/+6
* | Make 'event_id' a required parameter in federated state requests (#4741)Amber Brown2019-02-272-2/+3
* | Fix parsing of Content-Disposition headers (#4763)Richard van der Hoff2019-02-273-20/+111
* | Move from TravisCI to BuildKite (#4752)Amber Brown2019-02-2713-108/+325
* | Merge pull request #4759 from matrix-org/erikj/3pid_client_readerErik Johnston2019-02-274-33/+37
|\ \
| * | Update changelog.d/4759.featureRichard van der Hoff2019-02-271-1/+1
| * | NewsfileErik Johnston2019-02-271-0/+1
| * | Move /account/3pid to client_readerErik Johnston2019-02-273-33/+36
* | | Merge pull request #4758 from matrix-org/erikj/use_presence_replicationErik Johnston2019-02-273-2/+9
|\ \ \
| * | | NewsfileErik Johnston2019-02-271-0/+1
| * | | When presence is enabled don't send over replicationErik Johnston2019-02-272-2/+8
| |/ /
* | | Merge pull request #4757 from matrix-org/erikj/key_api_fed_readaeErik Johnston2019-02-274-1/+13
|\ \ \ | |/ / |/| |
| * | Fix unit testsErik Johnston2019-02-271-0/+6
| * | NewsfileErik Johnston2019-02-271-0/+1
| * | Move server key queries to federation readerErik Johnston2019-02-272-1/+6
|/ /
* | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoffErik Johnston2019-02-275-6/+43
|\ \ | |/ |/|
| * Move connecting logic into ClientReplicationStreamProtocolErik Johnston2019-02-272-18/+17
| * NewsfileErik Johnston2019-02-261-0/+1
| * Increase the max delay between retry attemptsErik Johnston2019-02-261-1/+1
| * Fix tightloop over connecting to replication serverErik Johnston2019-02-263-5/+42
* | 0.99.2rc1 v0.99.2rc1Richard van der Hoff2019-02-2750-53/+63
* | Limit cache invalidation replication line length (#4748)Erik Johnston2019-02-273-5/+28
* | Add database version to phonehome stats. (#4753)Richard van der Hoff2019-02-275-0/+46
* | Fix check-newsfragment script (#4750)Richard van der Hoff2019-02-263-4/+10
* | Fix apache reverse proxy example (#4742)Paul Tötterman2019-02-261-1/+1
|/
* Merge pull request #4746 from matrix-org/anoa/public_rooms_federate_developAndrew Morgan2019-02-264-13/+65
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Andrew Morgan2019-02-26391-6363/+18845
| |\ | |/ |/|
* | Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federateAndrew Morgan2019-02-264-70/+17
|\ \
| * | Revert "Prevent showing non-fed rooms in fed /publicRooms"Andrew Morgan2019-02-264-70/+17
|/ /
* | Merge pull request #4736 from matrix-org/anoa/public_rooms_federateAndrew Morgan2019-02-264-17/+70
|\ \
| * | Cleaner chunk logicAndrew Morgan2019-02-261-5/+4
| * | Correct indentAndrew Morgan2019-02-261-3/+3
| * | Correct docstring types and chunk logicAndrew Morgan2019-02-261-10/+11
| * | Clean up room chunk logicAndrew Morgan2019-02-261-6/+8
| * | Make not showing non-federated rooms the defaultAndrew Morgan2019-02-262-13/+1
| * | Result may be NoneAndrew Morgan2019-02-261-1/+1
| * | Address rich commentsAndrew Morgan2019-02-262-7/+31
| * | Fix group's call to generate_room_entryAndrew Morgan2019-02-251-4/+2
| * | elif not else ifAndrew Morgan2019-02-251-1/+1
| * | syntax derpAndrew Morgan2019-02-251-1/+1
| * | Simplify call to generate_room_entryAndrew Morgan2019-02-251-17/+13
| * | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Erik Johnston2019-02-25384-6331/+18693
| |\ \
| * | | Docs and arg name clarificationAndrew Morgan2019-02-251-2/+15
| * | | Don't restrict non-fed rooms over client APIsAndrew Morgan2019-02-253-14/+22
| * | | Config option to prevent showing non-fed rooms in fed /publicRoomsAndrew Morgan2019-02-252-2/+26
* | | | Don't log stack trace when client has gone away during media download (#4738)Erik Johnston2019-02-252-2/+10
* | | | Fix ACME config for python 2. (#4717)Richard van der Hoff2019-02-252-3/+8
* | | | switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-255-5/+7
* | | | Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-255-8/+14
|\ \ \ \
| * | | | NewsfileErik Johnston2019-02-252-1/+2
| * | | | Log tracebacks correctlyErik Johnston2019-02-253-7/+12
| | |/ / | |/| |
* | | | Merge pull request #4718 from matrix-org/erikj/fix_backfill_state_shredErik Johnston2019-02-252-3/+32
|\ \ \ \
| * | | | Fixup changelogErik Johnston2019-02-251-1/+1
| * | | | Fix typoErik Johnston2019-02-251-1/+1
| * | | | More commentsErik Johnston2019-02-251-0/+4
| * | | | Assert rather than clobber the valuesErik Johnston2019-02-251-2/+2
| * | | | NewsfileErik Johnston2019-02-251-0/+1
| * | | | Add comments and paranoiaErik Johnston2019-02-251-2/+23
| * | | | Fix backfill storing incorrect state for eventsErik Johnston2019-02-221-1/+4
* | | | | Merge pull request #4721 from matrix-org/erikj/msc_1866Erik Johnston2019-02-253-2/+27
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2019-02-231-0/+1
| * | | | | MSC 1866 - Use M_UNSUPPORTED_ROOM_VERSION for invite APIErik Johnston2019-02-232-2/+26
* | | | | | Merge pull request #4722 from matrix-org/erikj/correctly_handle_keyring_excep...Erik Johnston2019-02-252-21/+52
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | raise_from already raisesErik Johnston2019-02-251-4/+4
| * | | | | NewsfileErik Johnston2019-02-231-0/+1
| * | | | | Handle errors when fetching remote server keysErik Johnston2019-02-231-21/+51
| |/ / / /
* | | | | Merge pull request #4723 from matrix-org/erikj/frontend_proxy_exceptionErik Johnston2019-02-252-5/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | NewsfileErik Johnston2019-02-231-0/+1
| * | | | Correctly proxy exception in frontend_proxy workerErik Johnston2019-02-231-5/+10
|/ / / /
* | | | Merge pull request #4716 from matrix-org/erikj/pusher_loggingErik Johnston2019-02-224-1/+17
|\ \ \ \
| * | | | Add missing returnErik Johnston2019-02-221-0/+1
| * | | | Correctly handle PusherConfigExceptionErik Johnston2019-02-221-0/+9
| * | | | NewsfileErik Johnston2019-02-221-0/+1
| * | | | Drop logging level of creating a pusherErik Johnston2019-02-221-1/+1
| * | | | Correctly handle null data in HttpPusherErik Johnston2019-02-221-0/+5
| |/ / /
* | | | Merge pull request #4715 from matrix-org/erikj/fix_state_invalidationErik Johnston2019-02-223-12/+36
|\ \ \ \
| * | | | NewsfileErik Johnston2019-02-221-0/+1
| * | | | Fix state cache invalidation on workersErik Johnston2019-02-222-12/+35
| |/ / /
* / / / Debian: fix overwriting of config settings on upgrade (#4696)Richard van der Hoff2019-02-225-8/+165
|/ / /
* | | Add prometheus metrics for number of badge update pushes. (#4709)Richard van der Hoff2019-02-222-8/+26
* | | Better checks on newsfragments (#4698)Richard van der Hoff2019-02-224-12/+68
* | | Minor tweaks to acme docs (#4689)Richard van der Hoff2019-02-222-10/+10
* | | bail out early in on_new_receipts if no pushers (#4706)Richard van der Hoff2019-02-212-0/+9
* | | Run push_receipts_to_remotes as background job (#4707)Richard van der Hoff2019-02-212-34/+35
* | | Added HAProxy example (#4660)Benoît S2019-02-212-0/+19
* | | Merge pull request #4263 from rkfg/developErik Johnston2019-02-212-1/+2
|\ \ \
| * | | Prevent crash on pagination.rkfg2018-12-062-1/+2
* | | | Merge pull request #4701 from fistons/fix-migration-scriptErik Johnston2019-02-212-0/+4
|\ \ \ \
| * | | | Consider e2e_room_keys.is_verified column as booleanEric2019-02-202-0/+4
|/ / / /
* | | | Merge pull request #4694 from matrix-org/erikj/fix_sentry_config_formatErik Johnston2019-02-202-0/+3
|\ \ \ \
| * | | | NewsfileErik Johnston2019-02-201-0/+1
| * | | | Fixup generated metrics configErik Johnston2019-02-201-0/+2
* | | | | Add metrics for number of outgoing EDUs, by type (#4695)Richard van der Hoff2019-02-203-6/+19
* | | | | UPSERT many functionality (#4644)Amber Brown2019-02-204-13/+224
* | | | | Logging improvements for the pusher (#4691)Richard van der Hoff2019-02-203-13/+15
* | | | | Fix TaskStopped exceptions when outbound requests time out (#4690)Richard van der Hoff2019-02-204-18/+30
* | | | | Clean up gitignores (#4688)Richard van der Hoff2019-02-203-58/+38
* | | | | Merge pull request #4678 from matrix-org/rav/tls_install_instructionsRichard van der Hoff2019-02-2026-216/+268
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | changelogRichard van der Hoff2019-02-191-0/+1
| * | | | Attempt to make default config more consistentRichard van der Hoff2019-02-1924-196/+248
| * | | | clarify TLS instructionsRichard van der Hoff2019-02-191-20/+19
* | | | | Fix registration on workers (#4682)Erik Johnston2019-02-2014-151/+277
* | | | | Run unit tests against python 3.7 (#4677)Richard van der Hoff2019-02-203-38/+14
* | | | | Merge pull request #4671 from matrix-org/erikj/state_cache_invalidationErik Johnston2019-02-195-33/+96
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | DocsErik Johnston2019-02-192-2/+8
| * | | | Use itertoolsErik Johnston2019-02-191-2/+2
| * | | | DocumentationErik Johnston2019-02-192-5/+24
| * | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | Batch cache invalidation over replicationErik Johnston2019-02-183-32/+69
* | | | | Merge pull request #4676 from matrix-org/rav/pg95Richard van der Hoff2019-02-192-14/+33
|\ \ \ \ \
| * | | | | Test against Postgres 9.5 as well as 9.4Richard van der Hoff2019-02-192-14/+33
| |/ / / /
* | | | | Merge pull request #4652 from matrix-org/babolivier/acme-delegatedBrendan Abolivier2019-02-193-4/+21
|\ \ \ \ \
| * | | | | Improve config documentationBrendan Abolivier2019-02-191-3/+11
| * | | | | Fetch ACME domain into an instance memberBrendan Abolivier2019-02-191-4/+5
| * | | | | Use a configuration parameter to give the domain to generate a certificate forBrendan Abolivier2019-02-182-25/+11
| * | | | | Merge branch 'develop' into babolivier/acme-delegatedBrendan Abolivier2019-02-1814-41/+297
| |\ \ \ \ \
| * | | | | | Typo in changelogAndrew Morgan2019-02-181-1/+1
| * | | | | | Typo in info logAndrew Morgan2019-02-181-1/+1
| * | | | | | Various cosmetics to make TravisCI happyBrendan Abolivier2019-02-151-2/+5
| * | | | | | Remove unused importBrendan Abolivier2019-02-151-1/+0
| * | | | | | Support .well-known delegation when issuing certificates through ACMEBrendan Abolivier2019-02-152-4/+24
* | | | | | | Merge pull request #4670 from matrix-org/erikj/register_login_splitErik Johnston2019-02-195-43/+47
|\ \ \ \ \ \ \
| * | | | | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | | | | Update worker docsErik Johnston2019-02-182-2/+3
| * | | | | | | Split /login into client_readerErik Johnston2019-02-182-41/+43
* | | | | | | | Try and make TLS federation client code faster (#4674)Richard van der Hoff2019-02-192-8/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | misc->featureRichard van der Hoff2019-02-191-0/+0
| * | | | | | | | changelogAmber Brown2019-02-191-0/+1
| * | | | | | | | fix to use makeContext so that we don't need to rebuild the certificateoption...Amber Brown2019-02-191-8/+6
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #4642 from matrix-org/anoa/bans_room_upgradeAndrew Morgan2019-02-192-0/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | lintAndrew Morgan2019-02-181-1/+3
| * | | | | | | Move member event processing and changelog fixAndrew Morgan2019-02-182-9/+7
| * | | | | | | Membership events are done laterAndrew Morgan2019-02-181-12/+20
| * | | | | | | Add changelogAndrew Morgan2019-02-181-0/+1
| * | | | | | | Transfer bans on room upgradeAndrew Morgan2019-02-181-0/+14
* | | | | | | | Merge pull request #4632 from matrix-org/erikj/basic_sentryErik Johnston2019-02-184-1/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixup error handling and messageErik Johnston2019-02-181-5/+6
| * | | | | | | | FixupErik Johnston2019-02-181-1/+1
| * | | | | | | | Fixup comments and add warningErik Johnston2019-02-133-6/+11
| * | | | | | | | NewsfileErik Johnston2019-02-121-0/+1
| * | | | | | | | CommentsErik Johnston2019-02-121-0/+8
| * | | | | | | | Raise an appropriate error message if sentry_sdk missingErik Johnston2019-02-121-1/+15
| * | | | | | | | Basic sentry integrationErik Johnston2019-02-123-0/+31
* | | | | | | | | Merge pull request #4666 from matrix-org/erikj/register_login_splitErik Johnston2019-02-1811-255/+450
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Move register_device into handlerErik Johnston2019-02-185-172/+97
| * | | | | | | | Update docsErik Johnston2019-02-182-1/+7
| * | | | | | | | Update changelog.d/4666.featureWill Hunt2019-02-181-1/+1
| * | | | | | | | Fix unit testsErik Johnston2019-02-181-6/+15
| * | | | | | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | | | | | Split out registration to workerErik Johnston2019-02-187-147/+401
* | | | | | | | | Merge pull request #4668 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-182-5/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pep8Erik Johnston2019-02-181-1/+5
| * | | | | | | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | | | | | | Correctly handle HttpResponseExceptionErik Johnston2019-02-181-4/+4
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4669 from matrix-org/erikj/log_exceptionErik Johnston2019-02-182-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | | | | | | Cleanup top level request exception loggingErik Johnston2019-02-181-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #4651 from matrix-org/matthew/well-known-corsErik Johnston2019-02-182-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FixupErik Johnston2019-02-182-1/+2
| * | | | | | | | | changelogMatthew Hodgson2019-02-181-0/+1
| * | | | | | | | | fix missig importMatthew Hodgson2019-02-181-0/+1
| * | | | | | | | | tabsMatthew Hodgson2019-02-141-1/+1
| * | | | | | | | | set CORS on .well-known URI to unbreak modularMatthew Hodgson2019-02-141-0/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4667 from matrix-org/erikj/fix_revoke_guest_access_workersErik Johnston2019-02-183-1/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | | | | | Fix kicking guest users in worker modeErik Johnston2019-02-182-1/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4643 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-185-8/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | NewsfileErik Johnston2019-02-141-0/+1
| * | | | | | | Correctly handle RequestSendFailed exceptionsErik Johnston2019-02-144-8/+19
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4657 from matrix-org/travis/linda/spellingErik Johnston2019-02-183-2/+3
|\ \ \ \ \ \ \
| * | | | | | | UPGRADE.rst: Fix a typo in "Upgrading Synapse" sectionJuuso "Linda" Lapinlampi2019-02-151-1/+1
| * | | | | | | config: Remove a repeated word from a logger warningJuuso "Linda" Lapinlampi2019-02-151-1/+1
| * | | | | | | ChangelogTravis Ralston2019-02-151-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #4647 from matrix-org/erikj/add_room_publishing_rulesErik Johnston2019-02-156-31/+274
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Move defaults up into codeErik Johnston2019-02-151-22/+44
| * | | | | | Hoist up checks to reduce overall workErik Johnston2019-02-151-17/+15
| * | | | | | Fixup commentsErik Johnston2019-02-151-8/+27
| * | | | | | Clarify commentsErik Johnston2019-02-141-3/+3
| * | | | | | Clarify and fix behaviour when there are multiple aliasesErik Johnston2019-02-142-6/+24
| * | | | | | Only fetch aliases when publishing roomsErik Johnston2019-02-141-15/+15
| * | | | | | Fixup commentsErik Johnston2019-02-141-8/+15
| * | | | | | NewsfileErik Johnston2019-02-141-0/+1
| * | | | | | Add configurable room list publishing rulesErik Johnston2019-02-145-22/+200
| |/ / / / /
* | | | | | Merge branch 'master' into developRichard van der Hoff2019-02-146-8/+37
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'release-v0.99.1'Richard van der Hoff2019-02-146-8/+37
| |\ \ \ \ \ \
| | * | | | | | Fix debian build dockerfile github/release-v0.99.1 release-v0.99.1Richard van der Hoff2019-02-141-1/+5
| | * | | | | | 0.99.1.1 v0.99.1.1Richard van der Hoff2019-02-144-3/+17
| | * | | | | | Fix errors in acme provisioning (#4648)Richard van der Hoff2019-02-143-6/+17
* | | | | | | | Merge branch 'master' into developRichard van der Hoff2019-02-146-7/+17
|\| | | | | | | | |_|/ / / / / |/| | | | | |
| * | | | | | Merge tag 'v0.99.1'Richard van der Hoff2019-02-1456-555/+1312
| |\| | | | |
| | * | | | | 0.99.1 v0.99.1Richard van der Hoff2019-02-143-16/+11
| | * | | | | implement `reload` by sending the HUP signal (#4622)Дамјан Георгиевски2019-02-142-0/+7
| | * | | | | 0.99.1rc2 v0.99.1rc2Richard van der Hoff2019-02-133-2/+10
| * | | | | | Update MSC1711_certificates_FAQ.mdErik Johnston2019-02-081-1/+1
* | | | | | | Merge pull request #4450 from 14mRh4X0r/fix-dependency-messageRichard van der Hoff2019-02-132-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix error message for optional dependenciesWillem Mulder2019-01-232-2/+7
* | | | | | | | Merge remote-tracking branch 'origin/release-v0.99.1' into developRichard van der Hoff2019-02-134-22/+35
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #4636 from matrix-org/rav/bind_address_fixesRichard van der Hoff2019-02-134-22/+35
| |\ \ \ \ \ \ \
| | * | | | | | | Update synapse/app/_base.pyErik Johnston2019-02-131-1/+1
| | * | | | | | | changelogRichard van der Hoff2019-02-131-0/+1
| | * | | | | | | Use `listen_tcp` for the replication listenerRichard van der Hoff2019-02-131-7/+7
| | * | | | | | | Improve logging around listening servicesRichard van der Hoff2019-02-132-11/+20
| | * | | | | | | Special-case the default bind_addresses for metrics listenerRichard van der Hoff2019-02-132-4/+7
| |/ / / / / / /
* / / / / / / / Run `black` on user directory code (#4635)Amber Brown2019-02-133-131/+117
|/ / / / / / /
* | | | | | | Fixup changelog v0.99.1rc1Erik Johnston2019-02-121-4/+4
* | | | | | | Update changelog and versionErik Johnston2019-02-1232-32/+47
* | | | | | | Merge pull request #4608 from matrix-org/anoa/acls_room_upgradeErik Johnston2019-02-122-0/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | ChangelogAndrew Morgan2019-02-111-0/+1
| * | | | | | Transfer Server ACLs on room upgradeAndrew Morgan2019-02-111-0/+1
* | | | | | | Fixup changelog entriesErik Johnston2019-02-124-2/+2
* | | | | | | Merge pull request #4627 from matrix-org/erikj/user_ips_analyzeErik Johnston2019-02-123-3/+32
|\ \ \ \ \ \ \
| * | | | | | | Fix pep8Erik Johnston2019-02-121-1/+1
| * | | | | | | NewsfileErik Johnston2019-02-121-0/+1
| * | | | | | | Analyze user_ips before running deduplicationErik Johnston2019-02-122-3/+31
* | | | | | | | Merge pull request #4626 from matrix-org/erikj/fixup_user_ips_dedupeErik Johnston2019-02-122-3/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | NewsfileErik Johnston2019-02-121-0/+1
| * | | | | | | | Reduce user_ips bloat during dedupe background updateErik Johnston2019-02-121-3/+60
| |/ / / / / / /
* | | | | | | | Merge pull request #4625 from matrix-org/rav/fix_generate_config_warningsErik Johnston2019-02-122-7/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | fix self-signed cert notice from generate-configRichard van der Hoff2019-02-122-7/+3
| |/ / / / / / /
* | | | | | | | README updates (#4621)Richard van der Hoff2019-02-123-63/+80
* | | | | | | | Disable TLS by default (#4614)Richard van der Hoff2019-02-123-27/+28
* | | | | | | | Fix error when loading cert if tls is disabled (#4618)Richard van der Hoff2019-02-124-18/+47
|/ / / / / / /
* | | | | | | Merge pull request #4619 from matrix-org/rav/remove_docker_no_tls_hacksErik Johnston2019-02-123-24/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove redundant entries from docker configRichard van der Hoff2019-02-113-24/+2
* | | | | | | | Merge pull request #4613 from matrix-org/rav/deprecate_no_tlsErik Johnston2019-02-1211-44/+82
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix testsRichard van der Hoff2019-02-112-3/+7
| * | | | | | | Infer no_tls from presence of TLS listenersRichard van der Hoff2019-02-1110-20/+27
| * | | | | | | Merge branch 'rav/no_create_server_contexts_if_no_tls' into rav/tls_cert/workRichard van der Hoff2019-02-113-3/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Don't create server contexts when TLS is disabledRichard van der Hoff2019-02-113-3/+7
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-18 21:13:26 +0000