summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add parse_row method to replication stream classRichard van der Hoff2019-03-273-3/+19
* move FederationStream out to its own fileRichard van der Hoff2019-03-274-23/+43
* move EventsStream out to its own fileRichard van der Hoff2019-03-273-23/+42
* Move replication.tcp.streams into a packageRichard van der Hoff2019-03-273-34/+52
* Fix/improve some docstrings in the replication code. (#4949)Richard van der Hoff2019-03-272-7/+19
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-266-26/+122
* Use the state event amount for userdir import batching, not room count (#4944)Amber Brown2019-03-271-8/+20
* Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-263-8/+9
* Fix ClientReplicationStreamProtocol.__str__ (#4929)Richard van der Hoff2019-03-252-4/+5
* Fix bug where read-receipts lost their timestamps (#4927)Richard van der Hoff2019-03-253-12/+30
* Refactor out state delta handling into its own class (#4917)Amber Brown2019-03-254-110/+151
* Merge pull request #4869 from matrix-org/erikj/yaml_loadErik Johnston2019-03-223-5/+5
|\
| * Use yaml safe_loadErik Johnston2019-03-223-5/+5
* | Remove trailing slashes from outbound federation requests and retry on 400 (#...Andrew Morgan2019-03-212-17/+89
|\ \ | |/ |/|
| * Clean up backoff_on_404 and metehod callsAndrew Morgan2019-03-211-9/+13
| * kwargs doesn't like commas on calling funcs either. TILAndrew Morgan2019-03-201-2/+2
| * lintAndrew Morgan2019-03-201-2/+6
| * New test, fix issuesAndrew Morgan2019-03-201-49/+28
| * Fix comments. v0.99.2 -> v0.99.3Andrew Morgan2019-03-201-5/+5
| * Just return if not doing any trailing slash shennanigansAndrew Morgan2019-03-201-0/+2
| * lintAndrew Morgan2019-03-181-1/+1
| * Better exception handlingAndrew Morgan2019-03-181-16/+17
| * Correct var nameAndrew Morgan2019-03-131-2/+2
| * receiving a 400 caused an exception. handle itAndrew Morgan2019-03-131-5/+12
| * is this what purgatory feels likeAndrew Morgan2019-03-131-3/+3
| * i should have given up x2Andrew Morgan2019-03-131-18/+13
| * i should have given upAndrew Morgan2019-03-131-1/+1
| * there comes a time when you should give up. but you dontAndrew Morgan2019-03-131-1/+1
| * as aboveAndrew Morgan2019-03-131-2/+4
| * no kwargs todayAndrew Morgan2019-03-131-7/+12
| * Or perhaps I was the one who was drunkAndrew Morgan2019-03-131-6/+3
| * go home python, you're drunkAndrew Morgan2019-03-131-4/+2
| * Syntax checker is borkAndrew Morgan2019-03-131-6/+5
| * Destructure againAndrew Morgan2019-03-131-7/+8
| * Are you happy nowAndrew Morgan2019-03-131-2/+2
| * Syntax testAndrew Morgan2019-03-131-6/+5
| * Remove testing codeAndrew Morgan2019-03-131-3/+0
| * Add missing docstring detailAndrew Morgan2019-03-131-1/+1
| * Fix syntax issuesAndrew Morgan2019-03-131-7/+10
| * Switch to wrapper function around _send_requestAndrew Morgan2019-03-132-37/+76
| * Retry on 400:M_UNRECOGNIZEDAndrew Morgan2019-03-131-6/+10
| * Fix paranthesis indentAndrew Morgan2019-03-131-1/+2
| * Add workaround noteAndrew Morgan2019-03-131-10/+4
| * Cleaner way of implementing trailing slashesAndrew Morgan2019-03-122-68/+62
| * Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-112-9/+9
| |\
| * \ Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-114-19/+53
| |\ \
| * | | lintAndrew Morgan2019-03-081-1/+3
| * | | Retry certain federation requests on 404Andrew Morgan2019-03-082-5/+50
| * | | Remove trailing slashes from outbound federation requestsAndrew Morgan2019-03-081-7/+7
* | | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-212-2/+11
|\ \ \ \
| * | | | Deny peeking into rooms that have been blockedErik Johnston2019-03-212-2/+11
* | | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-216-24/+62
|\| | | |
| * | | | Fix upsertErik Johnston2019-03-211-0/+1
| * | | | Revert spurious deleteErik Johnston2019-03-201-0/+4
| * | | | comment block_roomErik Johnston2019-03-201-0/+9
| * | | | Use flagsErik Johnston2019-03-205-15/+17
| * | | | Move requester check into assert_accepted_privacy_policyErik Johnston2019-03-201-5/+8
| * | | | Gracefully handle failing to kick userErik Johnston2019-03-201-19/+27
| * | | | Log new room IDErik Johnston2019-03-201-1/+6
| * | | | Only require consent for events with an associated requestErik Johnston2019-03-201-1/+5
| * | | | Allow blocking a room multiple timesErik Johnston2019-03-201-2/+4
* | | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-213-0/+32
|\ \ \ \ \
| * | | | | Disable publishing to room list when its disabledErik Johnston2019-03-201-0/+8
| * | | | | Pull out config optionErik Johnston2019-03-201-3/+3
| * | | | | 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
* | | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_searchErik Johnston2019-03-202-0/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix up sample configErik Johnston2019-03-201-2/+4
| * | | | | Update synapse/config/user_directory.pyRichard van der Hoff2019-03-201-1/+1
| * | | | | Add option to disable searching in the user dirErik Johnston2019-03-192-0/+13
| |/ / / /
* | | | | Batching in the user directory import (#4900)Amber Brown2019-03-211-0/+13
* | | | | Add a config option for torture-testing worker replication. (#4902)Richard van der Hoff2019-03-202-1/+22
* | | | | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-204-22/+171
|/ / / /
* | | | 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