summary refs log tree commit diff
path: root/docs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add a complete documentation of the message retention policies supportBrendan Abolivier2020-01-031-0/+191
* Added the section 'Configuration' in /docs/turn-howto.md (#6614)ewaf12020-01-021-0/+2
* Reword sections of federate.md that explained delegation at time of Synapse 1...Aaron Raimist2020-01-021-21/+3
* Merge branch 'master' into developRichard van der Hoff2019-12-311-0/+43
|\
| * sample log config 1.7.2Richard van der Hoff2019-12-241-0/+43
* | Add an export_signing_key script (#6546)Richard van der Hoff2019-12-192-14/+20
* | Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-161-0/+7
* | Document Shutdown Room admin API (#6541)Andrew Morgan2019-12-131-0/+72
* | Merge branch 'master' into developErik Johnston2019-12-131-1/+13
|\|
| * Merge tag 'v1.7.0'Erik Johnston2019-12-134-9/+149
| |\
| * | Update workers.md to make media_repository work (again) (#6519)Mark Nowiasz2019-12-111-1/+13
* | | Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-102-18/+120
| |/ |/|
* | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-051-0/+45
* | privacy by default for room dir (#6355)Neil Johnson2019-12-041-6/+7
* | write some docs for the quarantine_media api (#6458)Richard van der Hoff2019-12-031-0/+17
* | Clarifications for the email configuration settings. (#6423)Richard van der Hoff2019-11-281-1/+16
* | Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-263-8/+20
|\ \
| * | Fix link to user_dir_populate.sql in the user directory docs (#6388)Aaron Raimist2019-11-211-2/+1
| |/
| * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_...Andrew Morgan2019-11-141-1/+1
| |\
| | * Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5Brendan Abolivier2019-11-141-1/+1
| | |\
| | | * Set room version default to 5Neil Johnson2019-10-191-1/+1
| * | | sample configAndrew Morgan2019-11-121-4/+4
| |/ /
| * | document the REPLICATE command a bit better (#6305)Richard van der Hoff2019-11-041-1/+14
* | | Implement per-room message retention policiesBrendan Abolivier2019-11-041-0/+63
|/ /
* | Modify doc to update Google ReCaptcha terms (#6257)Yash Jipkate2019-10-301-3/+3
* | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2019-10-301-1/+1
* | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-241-1/+7
* | Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-231-15/+15
* | Update postgres.md (#6234)Adrien Luxey2019-10-221-3/+7
|/
* cas: support setting display name (#6114)Valérian Rousset2019-10-111-0/+1
* Merge branch 'master' into developBrendan Abolivier2019-10-021-0/+12
|\
| * add explanations on how to actually include an access_token (#6031)axel simon2019-09-131-0/+12
* | Fix 'redaction_retention_period' sampel config to match guidelinesErik Johnston2019-09-261-1/+1
* | Explicitly log when a homeserver does not have a trusted key server configure...Neil Johnson2019-09-261-4/+10
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-251-51/+90
|\ \
| * \ Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-241-1/+18
| |\ \
| | * | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2019-09-231-0/+2
| | * | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupRichard van der Hoff2019-09-231-51/+59
| | |\ \
| | | * \ Merge branch 'develop' into rav/saml_config_cleanupRichard van der Hoff2019-09-1940-2177/+2402
| | | |\ \
| | * | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-231-0/+3
| * | | | | Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1940-2177/+2402
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-0/+26
| | |_|/ / | |/| | |
| * | | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-131-51/+59
| | |_|/ | |/| |
* | | | Review commentsErik Johnston2019-09-251-1/+1
* | | | Prune rows in user_ips older than configured periodErik Johnston2019-09-241-0/+6
| |_|/ |/| |
* | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-201-0/+12
* | | Fix typo in account_threepid_delegates config (#6028)Jorik Schellekens2019-09-181-1/+1
| |/ |/|
* | fix sample configRichard van der Hoff2019-09-181-1/+1
* | (#5849) Convert rst to markdown (#6040)dstipp2019-09-1735-2179/+2074
* | Add developer docs for using SAML without a server (#6032)Travis Ralston2019-09-131-0/+37
* | add report_stats_endpoint config option (#6012)Sorunome2019-09-121-0/+5
* | Update sample configErik Johnston2019-09-111-1/+1
* | Update sample configErik Johnston2019-09-111-0/+7
* | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-091-0/+7
|\ \
| * | Default to censoring redactions after seven daysErik Johnston2019-09-091-3/+5
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_red...Erik Johnston2019-09-051-0/+62
| |\ \
| * | | Make redaction retention period configurableErik Johnston2019-09-051-0/+5
* | | | Servers-known-about statistic (#5981)Amber Brown2019-09-071-0/+10
* | | | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2019-09-061-13/+43
| |/ / |/| |
* | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-0/+62
|/ /
* | Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-281-1/+2
* | Config templating (#5900)Jorik Schellekens2019-08-281-8/+8
* | Implement a structured logging output system. (#5680)Amber Brown2019-08-281-0/+83
* | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-281-0/+19
|\ \
| * | Document GET method for retrieving admin bit of user in admin APIOlivier Wilkinson (reivilibre)2019-08-271-0/+19
* | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-271-0/+8
|\ \ \ | |/ / |/| |
| * | Fixup review commentsErik Johnston2019-08-231-2/+2
| * | Add config option for keys to use to sign keysErik Johnston2019-08-211-0/+8
| |/
* | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-271-0/+20
* | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-221-2/+25
* | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-221-0/+18
|/
* Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-132-0/+14
* LintBrendan Abolivier2019-08-011-1/+1
* Sample configBrendan Abolivier2019-08-011-0/+10
* Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-4/+0
* Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-0/+17
* Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-231-0/+16
* Replace returnValue with return (#5736)Amber Brown2019-07-231-1/+1
* Merge branch 'release-v1.2.0' into developJorik Schellekens2019-07-222-12/+102
|\
| * Opentracing Documentation (#5703)Jorik Schellekens2019-07-222-12/+102
* | Update the coding style doc (#5719)Richard van der Hoff2019-07-191-30/+94
|/
* Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-181-14/+31
* Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-181-0/+102
* Improve `Depends` specs in debian package. (#5675)Richard van der Hoff2019-07-171-3/+5
* Implement access token expiry (#5660)Richard van der Hoff2019-07-121-0/+11
* Update reverse_proxy.rst (#5397)Ulrik Günther2019-07-121-0/+2
* Improved docs on setting up Postgresql (#5661)Lrizika2019-07-111-4/+15
* Add basic opentracing support (#5544)Jorik Schellekens2019-07-111-0/+17
* Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-19/+19
* Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-012-3/+28
|\
| * Update the TLS cipher string and provide configurability for TLS on outgoing ...Amber Brown2019-06-281-0/+9
| * Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-271-0/+6
| * Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2019-06-271-1/+9
| * Merge pull request #5313 from twrist/patch-1Richard van der Hoff2019-06-271-2/+4
| |\
| | * Update HAProxy example rulesIke Johnson2019-06-021-2/+4
* | | update sample configRichard van der Hoff2019-06-271-6/+13
* | | update sample configRichard van der Hoff2019-06-261-0/+13
|/ /
* | Merge branch 'master' into developAndrew Morgan2019-06-251-1/+1
|\ \
| * | Fix broken link in MSC1711 FAQRichard van der Hoff2019-06-251-1/+1
* | | Add info about black to code_style.rst (#5537)Andrew Morgan2019-06-241-45/+42
* | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-241-1/+1
|\ \ \
| * | | Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-241-1/+1
* | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-241-4/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-4/+8
* | | | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-241-0/+7
|/ / /
* | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-221-23/+0
* | | Update docs/workers.rst Erik Johnston2019-06-211-1/+1
* | | Support pagination API in client_reader workerErik Johnston2019-06-211-0/+7
* | | Run Black. (#5482)Amber Brown2019-06-201-79/+79
* | | Remove Postgres 9.4 support (#5448)Amber Brown2019-06-181-2/+2
* | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-141-0/+13
|\ \ \ | |/ / |/| |
| * | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-141-0/+13
* | | Neilj/improve federation docs (#5419)Neil Johnson2019-06-112-3/+91
|/ /
* | Set default room version to v4. (#5379)Neil Johnson2019-06-061-1/+1
* | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-061-10/+50
* | Stop hardcoding trust of old matrix.org key (#5374)Richard van der Hoff2019-06-061-6/+37
* | Neilj/1.0 upgrade notes (#5371)Neil Johnson2019-06-061-7/+5
* | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verificationRichard van der Hoff2019-06-052-6/+21
|\ \
| * | Fix notes about well-known and acme (#5357)Richard van der Hoff2019-06-051-6/+5
| * | Neilj/mau tracking config explainer (#5284)Neil Johnson2019-06-051-0/+16
* | | Update sample configRichard van der Hoff2019-06-051-4/+4
|/ /
* | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_deltaErik Johnston2019-05-311-1/+3
|\ \
| * | Sample configBrendan Abolivier2019-05-311-1/+1
| * | Sample configBrendan Abolivier2019-05-311-8/+3
| * | Config and changelogBrendan Abolivier2019-05-281-0/+7
* | | Clarify that the admin change password endpoint logs them out (#5303)Travis Ralston2019-05-311-1/+1
* | | Merge pull request #5283 from aaronraimist/captcha-docsErik Johnston2019-05-291-0/+1
|\ \ \
| * | | Specify the type of reCAPTCHA key to use (#5013)Aaron Raimist2019-05-281-0/+1
* | | | regenerate sample configAmber Brown2019-05-291-3/+3
* | | | Fix docs on resetting the user directory (#5036)Aaron Raimist2019-05-281-7/+3
|/ / /
* | | Add missing blank line in config (#5249)Richard van der Hoff2019-05-241-0/+1
* | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-0/+9
* | | Room Statistics (#4338)Amber Brown2019-05-211-0/+16
| |/ |/|
* | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati...Brendan Abolivier2019-05-211-0/+8
|\|
| * DocBrendan Abolivier2019-05-211-0/+8
* | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-05-171-23/+22
|\ \ | |/ |/|
| * Stop telling people to install the optional dependencies. (#5197)Richard van der Hoff2019-05-171-23/+22
* | Changelog + sample configBrendan Abolivier2019-05-161-0/+6
* | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-28/+25
* | Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-131-0/+18
|/
* Make Prometheus snippet less confusing on the metrics collection doc (#4288)Gergely Polonkai2019-05-101-1/+4
* Add AllowEncodedSlashes to apache (#5068)colonelkrud2019-05-091-0/+2
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-081-0/+14
* Remove the requirement to authenticate for /admin/server_version. (#5122)Richard van der Hoff2019-05-071-2/+0
* Fix spelling in server notices admin API docs (#5142)Travis Ralston2019-05-061-1/+1
* Fix sample configRichard van der Hoff2019-05-061-1/+1
* Merge branch 'master' into developRichard van der Hoff2019-05-031-5/+12
|\
| * more config comment updatesRichard van der Hoff2019-05-031-2/+5
| * Blacklist 0.0.0.0 and :: by default for URL previewsRichard van der Hoff2019-05-031-5/+9
* | Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-022-19/+54
* | Merge pull request #5124 from matrix-org/babolivier/aliasesBrendan Abolivier2019-05-021-0/+5
|\ \
| * | Add some limitations to alias creationBrendan Abolivier2019-05-021-0/+5
* | | Fix sample configRichard van der Hoff2019-05-011-2/+2
* | | Move admin API to a new prefixRichard van der Hoff2019-05-018-12/+12
|/ /
* | Merge pull request #5116 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-05-011-1/+1
|\ \
| * | Fix whole path for admin routeBrendan Abolivier2019-05-011-1/+1
| * | Fix typo in account validity admin routeBrendan Abolivier2019-05-011-1/+1
* | | Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-252-1/+34
|/ /
* | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-173-0/+27
|\ \
| * \ Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-3/+26
| |\ \
| * \ \ Merge pull request #5063 from matrix-org/erikj/move_endpointsErik Johnston2019-04-151-0/+6
| |\ \ \
| | * | | Only handle GET requests for /push_rulesErik Johnston2019-04-151-0/+3
| | * | | Move some rest endpoints to client readerErik Johnston2019-04-151-0/+3
| * | | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-091-0/+6
| |\ \ \ \
| * | | | | add context to phonehome stats (#5020)Neil Johnson2019-04-081-0/+3
| * | | | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-041-0/+4
| | |/ / / | |/| | |
| * | | | Add admin API for group deletionErik Johnston2019-04-031-0/+14
| | |_|/ | |/| |
* | | | Add management endpoints for account validityBrendan Abolivier2019-04-171-0/+42
| |_|/ |/| |
* | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-3/+26
| |/ |/|
* | Add account expiration featureBrendan Abolivier2019-04-091-0/+6
|/
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-261-0/+14
* Fix nginx example in ACME doc. (#4923)Richard van der Hoff2019-03-251-1/+1
* Update Apache Setup To Remove Location Syntax (#4870)Colin W2019-03-211-9/+5
* Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-211-0/+6
|\
| * Fix up config commentsErik Johnston2019-03-201-3/+4
| * Add option to disable search room listsErik Johnston2019-03-191-0/+5
* | Merge pull request #4895 from matrix-org/erikj/disable_user_searchErik Johnston2019-03-201-0/+5
|\ \
| * | Fix up sample configErik Johnston2019-03-201-2/+4
| * | Update sample configErik Johnston2019-03-191-0/+3
| |/
* / Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-201-0/+8
|/
* Add note on tuning postgresErik Johnston2019-03-191-2/+20
* Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-03-192-5/+3
|\
| * Repoint docs for federation (#4881)Michael Kaye2019-03-191-1/+1
| * fix some typos in federate.mdRichard van der Hoff2019-03-151-4/+2
* | Comment out most options in the generated config. (#4863)Richard van der Hoff2019-03-191-73/+80
* | Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-181-0/+6
* | Add ratelimiting on login (#4821)Brendan Abolivier2019-03-151-11/+28
* | Document using a certificate with a full chain (#4849)Andrew Morgan2019-03-131-0/+5
* | Merge branch 'master' of github.com:matrix-org/synapse into developNeil Johnson2019-03-121-0/+125
|\|
| * fix orphaned sentenceNeil Johnson2019-03-121-1/+0
| * Neilj/improved delegation doc 2 (#4832)Neil Johnson2019-03-121-0/+126
* | Clarify what registration_shared_secret allows for (#2885) (#4844)Aaron Raimist2019-03-111-2/+2
* | Reword the sample config header to be less scary (#4801)Matthew Hodgson2019-03-072-10/+20
* | Update sample configBrendan Abolivier2019-03-051-11/+13
* | Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-051-0/+22
|\ \
| * | add API documentationJoseph Weston2019-03-021-0/+22
* | | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-0/+11
* | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-051-0/+2
|\ \ \
| * | | Allow /keys/{changes,query} API to run on workerErik Johnston2019-03-041-0/+2
* | | | Include a default configuration file in the 'docs' directory. (#4791)Richard van der Hoff2019-03-042-0/+1048
|/ / /
* / / Fix v4v6 option in HAProxy example config (#4790)Seebi2019-03-041-7/+5
|/ /
* | Merge pull request #4759 from matrix-org/erikj/3pid_client_readerErik Johnston2019-02-271-0/+1
|\ \
| * | Move /account/3pid to client_readerErik Johnston2019-02-271-0/+1
* | | Move server key queries to federation readerErik Johnston2019-02-271-0/+1
|/ /
* | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoffErik Johnston2019-02-271-1/+3
|\ \ | |/ |/|
| * Fix tightloop over connecting to replication serverErik Johnston2019-02-261-1/+3
* | Fix apache reverse proxy example (#4742)Paul Tötterman2019-02-261-1/+1
|/
* Minor tweaks to acme docs (#4689)Richard van der Hoff2019-02-221-10/+9
* Added HAProxy example (#4660)Benoît S2019-02-211-0/+18
* Merge pull request #4671 from matrix-org/erikj/state_cache_invalidationErik Johnston2019-02-191-1/+25
|\
| * DocsErik Johnston2019-02-191-0/+5
| * DocumentationErik Johnston2019-02-191-1/+20
* | Update worker docsErik Johnston2019-02-181-1/+2
|/
* Update docsErik Johnston2019-02-181-0/+6
* Merge tag 'v0.99.1'Richard van der Hoff2019-02-143-11/+110
|\
| * Clarifications for reverse proxy docs (#4607)Richard van der Hoff2019-02-113-11/+110
| * Update MSC1711 FAQ to be explicit about well-known (#4584)Erik Johnston2019-02-071-13/+27
* | Update MSC1711_certificates_FAQ.mdErik Johnston2019-02-081-1/+1
* | cleanupsRichard van der Hoff2019-02-071-4/+2
* | Merge branch 'master' into erikj/msc1711_faqRichard van der Hoff2019-02-072-12/+16
|\|
| * Merge remote-tracking branch 'origin/release-v0.99.0'Richard van der Hoff2019-02-071-11/+15
| |\
| | * Update ACME docs to include port instructions (#4578) github/release-v0.99.0 release-v0.99.0Andrew Morgan2019-02-071-11/+15
| * | clarify option 1Richard van der Hoff2019-02-071-1/+1
* | | Update MSC1711 FAQ to be explicit about well-knownErik Johnston2019-02-071-11/+27
|/ /
* / faq cleanupsRichard van der Hoff2019-02-051-36/+18
|/
* Add notes on SRV and .well-known (#4573)Richard van der Hoff2019-02-051-41/+117
* Merge pull request #4570 from matrix-org/anoa/self_signed_upgradeAndrew Morgan2019-02-051-0/+126
|\
| * Add TL;DR and final step details to ACMEAndrew Morgan2019-02-051-4/+20
| * Merge branch 'anoa/self_signed_upgrade' of github.com:matrix-org/synapse into...Andrew Morgan2019-02-051-1/+1
| |\
| | * Update docs/ACME.mdRichard van der Hoff2019-02-051-2/+2
| * | Update ACMEAndrew Morgan2019-02-051-14/+17
| |/
| * Actually add ACME docsAndrew Morgan2019-02-051-0/+107
| * Convert ACME docs to mdAndrew Morgan2019-02-051-98/+0
| * Move ACME docs to docs/ACME.rst and link from UPGRADE.Andrew Morgan2019-02-051-0/+98
* | Neilj/1711faq (#4572)Neil Johnson2019-02-051-0/+260
|/
* Remove mention of lt-cred-mech in the sample coturn config. (#4333)Krithin Sitaram2018-12-281-3/+2
* create support user (#4141)Neil Johnson2018-12-141-4/+7
* Do a GC after each test to fix logcontext leaks (#4227)Richard van der Hoff2018-11-271-1/+57
* Add a note saying you need to manually reclaim disk spaceAaron Raimist2018-11-181-0/+8
* Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-061-4/+36
* Update documentation and templates for new consentTravis Ralston2018-10-122-10/+18
* Merge pull request #3734 from matrix-org/travis/worker-docsTravis Ralston2018-08-231-1/+1
|\
| * Reference that the federation_reader needs the HTTP replication port setTravis Ralston2018-08-211-1/+1
* | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-221-0/+1
|\ \ | |/ |/|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-172-1/+14
| |\
| * | Update workers.rst with new pathsErik Johnston2018-08-071-0/+1
* | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-181-0/+8
| |/ |/|
* | Update the admin register documentation to return a real user IDTravis Ralston2018-08-171-1/+1
* | Update docs/workers.rstErik Johnston2018-08-091-0/+13
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api...Erik Johnston2018-07-231-0/+63
|\