summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Return before we logErik Johnston2019-03-201-4/+5
* Fix up config commentsErik Johnston2019-03-201-3/+4
* Add option to disable search room listsErik Johnston2019-03-192-0/+22
* Use a regular HomeServerConfig object for unit testsRichard van der Hoff2019-03-192-2/+10
* Merge remote-tracking branch 'origin/develop' into HEADRichard van der Hoff2019-03-193-4/+16
|\
| * fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-192-3/+15
| * Fix user directory background update (#4887)Erik Johnston2019-03-191-1/+1
* | Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-191-3/+5
|/
* Comment out most options in the generated config. (#4863)Richard van der Hoff2019-03-1914-98/+149
* Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-194-256/+325
* Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-182-5/+32
* Add ratelimiting on login (#4821)Brendan Abolivier2019-03-156-22/+102
* Merge pull request #4855 from matrix-org/rav/refactor_transaction_queueRichard van der Hoff2019-03-157-761/+864
|\
| * Rename and move the classesRichard van der Hoff2019-03-137-811/+864
| * Factor per-destination stuff out of TransactionQueueRichard van der Hoff2019-03-131-132/+182
* | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-155-55/+110
|\|
| * Move client receipt processing to federation sender worker.Richard van der Hoff2019-03-134-33/+78
| * declare a ReadReceipt classRichard van der Hoff2019-03-132-24/+34
* | Merge pull request #4853 from matrix-org/erikj/worker_docker_ciErik Johnston2019-03-154-17/+53
|\ \
| * | Correctly handle all command line optionsErik Johnston2019-03-143-16/+42
| * | Allow passing --daemonize to workersErik Johnston2019-03-132-1/+11
* | | Revert "Make federation endpoints more tolerant of trailing slashes for some ...Erik Johnston2019-03-142-8/+8
* | | Merge pull request #4846 from matrix-org/hawkowl/userdir-searchErik Johnston2019-03-147-123/+183
|\ \ \ | |/ / |/| |
| * | fixupAmber Brown2019-03-132-2/+2
| * | fixupAmber Brown2019-03-133-55/+16
| * | fixupAmber Brown2019-03-121-1/+1
| * | fixupAmber Brown2019-03-121-1/+2
| * | fixupAmber Brown2019-03-123-160/+139
| * | fixupAmber Brown2019-03-121-1/+1
| * | use the old methodAmber Brown2019-03-121-3/+2
| * | fixAmber Brown2019-03-121-1/+1
| * | pep8Amber Brown2019-03-121-2/+1
| * | fixesAmber Brown2019-03-123-48/+62
| * | master startupAmber Brown2019-03-112-0/+9
| * | Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-searchAmber Brown2019-03-114-19/+53
| |\ \
| * | | initialAmber Brown2019-03-114-4/+102
* | | | Document using a certificate with a full chain (#4849)Andrew Morgan2019-03-131-0/+5
| |_|/ |/| |
* | | Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-122-0/+61
* | | Clarify what registration_shared_secret allows for (#2885) (#4844)Aaron Raimist2019-03-111-2/+2
* | | Make federation endpoints more tolerant of trailing slashes for some endpoint...Andrew Morgan2019-03-112-8/+8
* | | Correctly log expected errors when fetching server keysErik Johnston2019-03-111-2/+2
| |/ |/|
* | fix incorrect encoding of filenames with spaces in (#2090)Matthew Hodgson2019-03-111-3/+51
* | Add comment to schemaErik Johnston2019-03-081-0/+2
* | Make `prev_state` field optionalErik Johnston2019-03-082-16/+0
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_...Erik Johnston2019-03-0817-426/+384
|\
| * Merge pull request #4829 from matrix-org/erikj/device_list_seen_updatesErik Johnston2019-03-081-3/+7
| |\
| | * When re-syncing device lists reset the stateErik Johnston2019-03-071-3/+7
| * | Add some debug logging for device list handlingErik Johnston2019-03-071-2/+38
| |/
| * Rewrite userdir to be faster (#4537)Amber Brown2019-03-073-366/+174
| * Merge pull request #4779 from matrix-org/travis/iconsTravis Ralston2019-03-063-7/+7
| |\
| | * Use static locations for Riot iconsTravis Ralston2019-03-013-7/+7
| * | Merge pull request #4818 from matrix-org/erikj/prefill_client_ipsErik Johnston2019-03-061-0/+2
| |\ \
| | * | Prefill client IPs cache on workersErik Johnston2019-03-061-0/+2
| * | | Merge pull request #4815 from matrix-org/erikj/docstringsErik Johnston2019-03-062-7/+45
| |\ \ \
| | * | | Add docstrings from matrix-org-hotfixesErik Johnston2019-03-062-7/+45
| | |/ /
| * | | Merge pull request #4816 from matrix-org/erikj/4422_debugErik Johnston2019-03-061-7/+46
| |\ \ \
| | * | | Port #4422 debug logging from hotfixesErik Johnston2019-03-061-7/+46
| | |/ /
| * / / Send message after room has been shutdownErik Johnston2019-03-061-11/+11
| |/ /
| * | Merge pull request #4792 from matrix-org/anoa/replication_tokensAndrew Morgan2019-03-061-3/+28
| |\ \
| | * | Simplify token replication logicAndrew Morgan2019-03-051-23/+14
| | * | Clean up logic and add commentsAndrew Morgan2019-03-041-11/+18
| | * | Clearer branching, fix missing list clearAndrew Morgan2019-03-041-4/+11
| | * | Prevent replication wedgingAndrew Morgan2019-03-041-4/+24
| * | | Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-063-2/+6
| * | | Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-065-11/+7
| * | | Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-055-7/+11
| * | | Move settings from registration to ratelimiting in config fileBrendan Abolivier2019-03-052-18/+20
* | | | Factor out soft fail checksErik Johnston2019-03-081-5/+22
* | | | Implement soft failErik Johnston2019-03-064-1/+95
|/ / /
* | | Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-051-0/+23
|\ \ \
| * | | Add 'server_version' endpoint to admin APIJoseph Weston2019-03-011-0/+23
* | | | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-056-31/+102
* | | | Merge pull request #4794 from matrix-org/anoa/erroneous_dollahsAndrew Morgan2019-03-051-22/+22
|\ \ \ \
| * | | | Remove unnecessary dollar signsAndrew Morgan2019-03-041-22/+22
* | | | | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_roomErik Johnston2019-03-053-29/+126
|\ \ \ \ \
| * | | | | clarify commentsErik Johnston2019-03-052-9/+12
| * | | | | Fix missing null guardErik Johnston2019-03-041-1/+1
| * | | | | Only check history visibility when filteringErik Johnston2019-03-042-35/+46
| * | | | | s/get_forward_events/get_successor_events/Erik Johnston2019-03-042-3/+3
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n...Erik Johnston2019-03-0436-191/+571
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Update commentsErik Johnston2019-02-271-3/+13
| * | | | | Stop backpaginating when events not visibleErik Johnston2019-02-203-5/+78
* | | | | | Merge pull request #4799 from matrix-org/rav/clean_up_replication_codeErik Johnston2019-03-051-60/+5
|\ \ \ \ \ \
| * | | | | | 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-059-747/+762
|\ \ \ \ \ \ \
| * | | | | | | Allow /keys/{changes,query} API to run on workerErik Johnston2019-03-042-2/+13
| * | | | | | | Split DeviceHandler into master and workerErik Johnston2019-03-042-170/+179
| * | | | | | | Fixup slave storesErik Johnston2019-03-046-577/+572
| | |_|_|/ / / | |/| | | | |
* | | | | | | Add some debug about processing read receipts.Richard van der Hoff2019-03-041-6/+20
* | | | | | | Clean up read-receipt handling.Richard van der Hoff2019-03-041-59/+44
| |/ / / / / |/| | | | |
* | | | | | Include a default configuration file in the 'docs' directory. (#4791)Richard van der Hoff2019-03-044-13/+25
|/ / / / /
* | / / / Avoid rebuilding Edu objects in worker mode (#4770)Richard van der Hoff2019-03-045-19/+36
| |/ / / |/| | |
* | | | Fix incorrect log about not persisting duplicate state event. (#4776)Richard van der Hoff2019-03-011-3/+4
| |_|/ |/| |
* | | Merge branch 'master' into developRichard van der Hoff2019-03-011-1/+1
|\ \ \ | |_|/ |/| |
| * | 0.99.2Richard van der Hoff2019-03-011-1/+1
* | | Minor docstring fixes for MatrixFederationAgent (#4765)Andrew Morgan2019-02-281-1/+5
* | | Make 'event_id' a required parameter in federated state requests (#4741)Amber Brown2019-02-271-2/+2
* | | Fix parsing of Content-Disposition headers (#4763)Richard van der Hoff2019-02-271-20/+65
* | | Move from TravisCI to BuildKite (#4752)Amber Brown2019-02-271-1/+1
* | | Merge pull request #4759 from matrix-org/erikj/3pid_client_readerErik Johnston2019-02-272-33/+35
|\ \ \
| * | | Move /account/3pid to client_readerErik Johnston2019-02-272-33/+35
* | | | Merge pull request #4758 from matrix-org/erikj/use_presence_replicationErik Johnston2019-02-272-2/+8
|\ \ \ \
| * | | | When presence is enabled don't send over replicationErik Johnston2019-02-272-2/+8
| |/ / /
* / / / Move server key queries to federation readerErik Johnston2019-02-271-1/+5
|/ / /
* | | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoffErik Johnston2019-02-273-5/+39
|\ \ \ | |/ / |/| |
| * | Move connecting logic into ClientReplicationStreamProtocolErik Johnston2019-02-272-18/+17
| * | Increase the max delay between retry attemptsErik Johnston2019-02-261-1/+1
| * | Fix tightloop over connecting to replication serverErik Johnston2019-02-262-4/+39
* | | 0.99.2rc1 v0.99.2rc1Richard van der Hoff2019-02-271-1/+1
* | | Limit cache invalidation replication line length (#4748)Erik Johnston2019-02-272-5/+27
* | | Add database version to phonehome stats. (#4753)Richard van der Hoff2019-02-274-0/+45
|/ /
* | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Andrew Morgan2019-02-26193-4548/+9279
|\ \
| * | 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-25192-4516/+9135
| | |\ \
| | * | | 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-251-2/+9
| * | | | Fix ACME config for python 2. (#4717)Richard van der Hoff2019-02-251-3/+7
| * | | | switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-254-5/+5
| * | | | Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-253-7/+12
| |\ \ \ \
| | * | | | Log tracebacks correctlyErik Johnston2019-02-253-7/+12
| | | |/ / | | |/| |
| * | | | Merge pull request #4718 from matrix-org/erikj/fix_backfill_state_shredErik Johnston2019-02-251-3/+31
| |\ \ \ \
| | * | | | 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
| | * | | | 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-252-2/+26
| |\ \ \ \ \
| | * | | | | 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-251-21/+51
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | raise_from already raisesErik Johnston2019-02-251-4/+4
| | * | | | | Handle errors when fetching remote server keysErik Johnston2019-02-231-21/+51
| | |/ / / /
| * / / / / Correctly proxy exception in frontend_proxy workerErik Johnston2019-02-231-5/+10
| |/ / / /
| * | | | Merge pull request #4716 from matrix-org/erikj/pusher_loggingErik Johnston2019-02-223-1/+16
| |\ \ \ \
| | * | | | Add missing returnErik Johnston2019-02-221-0/+1
| | * | | | Correctly handle PusherConfigExceptionErik Johnston2019-02-221-0/+9
| | * | | | Drop logging level of creating a pusherErik Johnston2019-02-221-1/+1
| | * | | | Correctly handle null data in HttpPusherErik Johnston2019-02-221-0/+5
| | |/ / /
| * / / / Fix state cache invalidation on workersErik Johnston2019-02-222-12/+35
| |/ / /
| * | | Add prometheus metrics for number of badge update pushes. (#4709)Richard van der Hoff2019-02-221-8/+25
| * | | bail out early in on_new_receipts if no pushers (#4706)Richard van der Hoff2019-02-211-0/+8
| * | | Run push_receipts_to_remotes as background job (#4707)Richard van der Hoff2019-02-211-34/+34
| * | | Merge pull request #4263 from rkfg/developErik Johnston2019-02-211-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Prevent crash on pagination.rkfg2018-12-061-1/+1
| * | | Merge pull request #4694 from matrix-org/erikj/fix_sentry_config_formatErik Johnston2019-02-201-0/+2
| |\ \ \
| | * | | Fixup generated metrics configErik Johnston2019-02-201-0/+2
| * | | | Add metrics for number of outgoing EDUs, by type (#4695)Richard van der Hoff2019-02-202-6/+18
| * | | | UPSERT many functionality (#4644)Amber Brown2019-02-201-12/+134
| * | | | Logging improvements for the pusher (#4691)Richard van der Hoff2019-02-202-13/+14
| * | | | Fix TaskStopped exceptions when outbound requests time out (#4690)Richard van der Hoff2019-02-203-18/+29
| * | | | Merge pull request #4678 from matrix-org/rav/tls_install_instructionsRichard van der Hoff2019-02-2024-196/+248
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Attempt to make default config more consistentRichard van der Hoff2019-02-1924-196/+248
| * | | | Fix registration on workers (#4682)Erik Johnston2019-02-2012-150/+275
| * | | | Merge pull request #4671 from matrix-org/erikj/state_cache_invalidationErik Johnston2019-02-193-32/+70
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | DocsErik Johnston2019-02-191-2/+3
| | * | | Use itertoolsErik Johnston2019-02-191-2/+2
| | * | | DocumentationErik Johnston2019-02-191-4/+4
| | * | | Batch cache invalidation over replicationErik Johnston2019-02-183-32/+69
| * | | | Merge pull request #4652 from matrix-org/babolivier/acme-delegatedBrendan Abolivier2019-02-192-4/+20
| |\ \ \ \
| | * | | | 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-188-40/+213
| | |\ \ \ \
| | * | | | | 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-151-4/+23
| * | | | | | Merge pull request #4670 from matrix-org/erikj/register_login_splitErik Johnston2019-02-192-41/+43
| |\ \ \ \ \ \
| | * | | | | | Split /login into client_readerErik Johnston2019-02-182-41/+43
| * | | | | | | Try and make TLS federation client code faster (#4674)Richard van der Hoff2019-02-191-8/+6
| |\ \ \ \ \ \ \
| | * | | | | | | 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-191-0/+22
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | lintAndrew Morgan2019-02-181-1/+3
| | * | | | | | Move member event processing and changelog fixAndrew Morgan2019-02-181-9/+7
| | * | | | | | Membership events are done laterAndrew Morgan2019-02-181-12/+20
| | * | | | | | Transfer bans on room upgradeAndrew Morgan2019-02-181-0/+14
| * | | | | | | Merge pull request #4632 from matrix-org/erikj/basic_sentryErik Johnston2019-02-183-1/+60
| |\ \ \ \ \ \ \
| | * | | | | | | Fixup error handling and messageErik Johnston2019-02-181-5/+6
| | * | | | | | | FixupErik Johnston2019-02-181-1/+1
| | * | | | | | | Fixup comments and add warningErik Johnston2019-02-132-5/+10
| | * | | | | | | 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-188-193/+419
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Move register_device into handlerErik Johnston2019-02-184-102/+74
| | * | | | | | | Update docsErik Johnston2019-02-181-1/+1
| | * | | | | | | Split out registration to workerErik Johnston2019-02-187-147/+401
| * | | | | | | | Merge pull request #4668 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-181-5/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | pep8Erik Johnston2019-02-181-1/+5
| | * | | | | | | | Correctly handle HttpResponseExceptionErik Johnston2019-02-181-4/+4
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge pull request #4669 from matrix-org/erikj/log_exceptionErik Johnston2019-02-181-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Cleanup top level request exception loggingErik Johnston2019-02-181-3/+3
| | |/ / / / / / /
| * | | | | | | | Merge pull request #4651 from matrix-org/matthew/well-known-corsErik Johnston2019-02-181-0/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | FixupErik Johnston2019-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-182-1/+3
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Fix kicking guest users in worker modeErik Johnston2019-02-182-1/+3
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #4643 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-184-8/+19
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Correctly handle RequestSendFailed exceptionsErik Johnston2019-02-144-8/+19
| | | |_|/ / / | | |/| | | |
| * | | | | | config: Remove a repeated word from a logger warningJuuso "Linda" Lapinlampi2019-02-151-1/+1
| * | | | | | Merge pull request #4647 from matrix-org/erikj/add_room_publishing_rulesErik Johnston2019-02-153-31/+193
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | 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-141-6/+18
| | * | | | | Only fetch aliases when publishing roomsErik Johnston2019-02-141-15/+15
| | * | | | | Fixup commentsErik Johnston2019-02-141-8/+15
| | * | | | | Add configurable room list publishing rulesErik Johnston2019-02-143-22/+126
| | |/ / / /
| * | | | | Merge branch 'master' into developRichard van der Hoff2019-02-143-7/+16
| |\ \ \ \ \
| | * | | | | 0.99.1.1 v0.99.1.1Richard van der Hoff2019-02-141-1/+1
| | * | | | | Fix errors in acme provisioning (#4648)Richard van der Hoff2019-02-142-6/+15
| * | | | | | Merge branch 'master' into developRichard van der Hoff2019-02-141-2/+2
| |\| | | | | | | |/ / / / | |/| | | |
| | * | | | 0.99.1 v0.99.1Richard van der Hoff2019-02-141-2/+2
| | * | | | 0.99.1rc2 v0.99.1rc2Richard van der Hoff2019-02-131-1/+1
| * | | | | Merge pull request #4450 from 14mRh4X0r/fix-dependency-messageRichard van der Hoff2019-02-131-2/+5
| |\ \ \ \ \
| | * | | | | Fix error message for optional dependenciesWillem Mulder2019-01-231-2/+5
| * | | | | | Merge remote-tracking branch 'origin/release-v0.99.1' into developRichard van der Hoff2019-02-133-22/+34
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Update synapse/app/_base.pyErik Johnston2019-02-131-1/+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-132-131/+116
| |/ / / / /
| * | | | | Update changelog and versionErik Johnston2019-02-121-1/+1
| * | | | | Merge pull request #4608 from matrix-org/anoa/acls_room_upgradeErik Johnston2019-02-121-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Transfer Server ACLs on room upgradeAndrew Morgan2019-02-111-0/+1
| * | | | | Merge pull request #4627 from matrix-org/erikj/user_ips_analyzeErik Johnston2019-02-122-3/+31
| |\ \ \ \ \
| | * | | | | Fix pep8Erik Johnston2019-02-121-1/+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-121-3/+60
| |\ \ \ \ \ \
| | * | | | | | 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-121-7/+2
| |\ \ \ \ \ \
| | * | | | | | fix self-signed cert notice from generate-configRichard van der Hoff2019-02-121-7/+2
| | |/ / / / /
| * | | | | | Disable TLS by default (#4614)Richard van der Hoff2019-02-122-27/+27