summary refs log tree commit diff
path: root/docs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Replace instance variations of homeserver with correct case/spacing (#6357)Andrew Morgan2020-03-181-4/+4
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_...Andrew Morgan2019-11-141-1/+1
| |\
| * | sample configAndrew Morgan2019-11-121-4/+4
* | | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5Andrew Morgan2020-03-181-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
* | | document the REPLICATE command a bit better (#6305)Andrew Morgan2020-03-161-1/+14
|\| |
| * | document the REPLICATE command a bit better (#6305)Richard van der Hoff2019-11-041-1/+14
* | | Modify doc to update Google ReCaptcha terms (#6257)Andrew Morgan2020-03-161-3/+3
|\| |
| * | 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 Morgan2020-03-161-1/+1
|\| |
| * | 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)Andrew Morgan2020-03-161-1/+7
|\| |
| * | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-241-1/+7
* | | Add config linting script that checks for bool casing (#6203)Andrew Morgan2020-03-161-15/+15
|\| |
| * | Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-231-15/+15
* | | Update postgres.md (#6234)Andrew Morgan2020-03-161-3/+7
|\| |
| * | Update postgres.md (#6234)Adrien Luxey2019-10-221-3/+7
| |/
* | cas: support setting display name (#6114)Andrew Morgan2020-02-261-0/+1
|\|
| * cas: support setting display name (#6114)Valérian Rousset2019-10-111-0/+1
| * Merge branch 'master' into developBrendan Abolivier2019-10-021-0/+12
| |\
* | | Merge pull request #6117 from matrix-org/erikj/fix_sample_configAndrew Morgan2020-02-251-1/+1
|\| |
| * | 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...Andrew Morgan2020-02-251-4/+10
|\| |
| * | Explicitly log when a homeserver does not have a trusted key server configure...Neil Johnson2019-09-261-4/+10
* | | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Andrew Morgan2020-02-251-0/+6
|\| |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-251-51/+90
| |\ \
| * | | Review commentsErik Johnston2019-09-251-1/+1
| * | | Prune rows in user_ips older than configured periodErik Johnston2019-09-241-0/+6
* | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workAndrew Morgan2020-02-251-0/+26
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-241-1/+18
| |\ \ \
| * \ \ \ 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
* | | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2020-02-251-0/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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_cleanupAndrew Morgan2020-02-251-51/+59
|\| | | | |
| * | | | | 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
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
| | * | | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-131-51/+59
* | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2020-02-251-0/+3
|\| | | | |
| * | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-231-0/+3
| | |_|/ / | |/| | |
* | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2020-02-251-0/+12
|\| | | |
| * | | | 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)Andrew Morgan2020-02-251-1/+1
|\| | | |
| * | | | Fix typo in account_threepid_delegates config (#6028)Jorik Schellekens2019-09-181-1/+1
| | |/ / | |/| |
* | | | Fix logcontext spam on non-Linux platforms (#6059)Andrew Morgan2020-02-251-1/+1
|\| | |
| * | | fix sample configRichard van der Hoff2019-09-181-1/+1
* | | | (#5849) Convert rst to markdown (#6040)Andrew Morgan2020-02-2535-2179/+2074
|\| | |
| * | | (#5849) Convert rst to markdown (#6040)dstipp2019-09-1735-2179/+2074
* | | | Add developer docs for using SAML without a server (#6032)Andrew Morgan2020-02-251-0/+37
|\| | |
| * | | Add developer docs for using SAML without a server (#6032)Travis Ralston2019-09-131-0/+37
* | | | add explanations on how to actually include an access_token (#6031)Andrew Morgan2020-02-251-0/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | add explanations on how to actually include an access_token (#6031)axel simon2019-09-131-0/+12
| | |/ | |/|
* | | add report_stats_endpoint config option (#6012)Andrew Morgan2020-02-251-0/+5
|\ \ \ | | |/ | |/|
| * | add report_stats_endpoint config option (#6012)Sorunome2019-09-121-0/+5
* | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionAndrew Morgan2020-02-251-0/+7
|\| |
| * | 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_redactionsAndrew Morgan2020-02-251-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)Andrew Morgan2020-02-251-0/+10
|\| | | |
| * | | | Servers-known-about statistic (#5981)Amber Brown2019-09-071-0/+10
* | | | | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2020-02-251-13/+43
|\| | | |
| * | | | 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)Andrew Morgan2020-02-251-0/+62
|\| | |
| * | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-0/+62
| |/ /
* | | Add a link to python's logging config schema (#5926)Andrew Morgan2020-02-241-1/+2
|\| |
| * | Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-281-1/+2
* | | Config templating (#5900)Andrew Morgan2020-02-211-8/+8
|\| |
| * | Config templating (#5900)Jorik Schellekens2019-08-281-8/+8
* | | Implement a structured logging output system. (#5680)Andrew Morgan2020-02-211-0/+83
|\| |
| * | Implement a structured logging output system. (#5680)Amber Brown2019-08-281-0/+83
* | | Merge pull request #5914 from matrix-org/rei/admin_getadminAndrew Morgan2020-02-211-0/+19
|\| |
| * | 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_keyAndrew Morgan2020-02-211-0/+8
|\| | |
| * | | 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)Andrew Morgan2020-02-211-0/+20
|\| |
| * | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-271-0/+20
* | | Propagate opentracing contexts through EDUs (#5852)Andrew Morgan2020-02-211-2/+25
|\| |
| * | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-221-2/+25
* | | Servlet to purge old rooms (#5845)Andrew Morgan2020-02-211-0/+18
|\| |
| * | 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)Andrew Morgan2020-02-202-0/+14
|\|
| * 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)Andrew Morgan2020-02-201-4/+0
|\|
| * Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-4/+0
* | Room Complexity Client Implementation (#5783)Andrew Morgan2020-02-201-0/+17
|\|
| * Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-0/+17
* | Make Jaeger fully configurable (#5694)Andrew Morgan2020-02-191-0/+16
|\|
| * Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-231-0/+16
* | Replace returnValue with return (#5736)Andrew Morgan2020-02-191-1/+1
|\|
| * 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)Andrew Morgan2020-02-192-12/+102
|\ \ \ | | |/ | |/|
| * | Opentracing Documentation (#5703)Jorik Schellekens2019-07-222-12/+102
* | | Update the coding style doc (#5719)Andrew Morgan2020-02-191-30/+94
|\ \ \ | | |/ | |/|
| * | Update the coding style doc (#5719)Richard van der Hoff2019-07-191-30/+94
| |/
* | Clean up opentracing configuration options (#5712)Andrew Morgan2020-02-191-14/+31
|\|
| * Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-181-14/+31
* | Support Prometheus_client 0.4.0+ (#5636)Andrew Morgan2020-02-191-0/+102
|\|
| * Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-181-0/+102
* | Improve `Depends` specs in debian package. (#5675)Andrew Morgan2020-02-191-3/+5
|\|
| * Improve `Depends` specs in debian package. (#5675)Richard van der Hoff2019-07-171-3/+5
* | Implement access token expiry (#5660)Andrew Morgan2020-02-171-0/+11
|\|
| * Implement access token expiry (#5660)Richard van der Hoff2019-07-121-0/+11
* | Update reverse_proxy.rst (#5397)Andrew Morgan2020-02-171-0/+2
|\|
| * Update reverse_proxy.rst (#5397)Ulrik Günther2019-07-121-0/+2
* | Improved docs on setting up Postgresql (#5661)Andrew Morgan2020-02-171-4/+15
|\|
| * Improved docs on setting up Postgresql (#5661)Lrizika2019-07-111-4/+15
* | Add basic opentracing support (#5544)Andrew Morgan2020-02-171-0/+17
|\|
| * Add basic opentracing support (#5544)Jorik Schellekens2019-07-111-0/+17
* | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-141-4/+4
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-141-19/+19
|\|
| * Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-19/+19
* | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-141-1/+21
|\|
| * Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-012-3/+28
| |\
| * | update sample configRichard van der Hoff2019-06-271-6/+13
| * | update sample configRichard van der Hoff2019-06-261-0/+13
* | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Andrew Morgan2020-02-141-0/+9
|\ \ \ | | |/ | |/|
| * | 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)Andrew Morgan2020-02-141-0/+6
|\| |
| * | 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 Morgan2020-02-141-1/+9
|\| |
| * | 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-1Andrew Morgan2020-02-141-2/+4
|\| |
| * | Merge pull request #5313 from twrist/patch-1Richard van der Hoff2019-06-271-2/+4
| |\ \ | | |/ | |/|
| | * Update HAProxy example rulesIke Johnson2019-06-021-2/+4
* | | Remove & changelog (#5548)Andrew Morgan2020-02-141-1/+1
|\| |
| * | 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 Morgan2020-02-141-45/+42
|\| | |
| * | | 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_optionsAndrew Morgan2020-02-141-1/+1
|\| | |
| * | | 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
* | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathAndrew Morgan2020-02-131-0/+7
|\| | | |
| * | | | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-241-0/+7
| |/ / /
* | | | Drop support for cpu_affinity (#5525)Andrew Morgan2020-02-131-23/+0
|\| | |
| * | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-221-23/+0
* | | | Merge pull request #5505 from matrix-org/erikj/messages_workerAndrew Morgan2020-02-131-1/+1
|\| | |
| * | | Update docs/workers.rst Erik Johnston2019-06-211-1/+1
* | | | Support pagination API in client_reader workerAndrew Morgan2020-02-131-0/+7
|\| | |
| * | | Support pagination API in client_reader workerErik Johnston2019-06-211-0/+7
* | | | Run Black. (#5482)Andrew Morgan2020-02-131-79/+79
|\| | |
| * | | Run Black. (#5482)Amber Brown2019-06-201-79/+79
* | | | Remove Postgres 9.4 support (#5448)Andrew Morgan2020-02-101-2/+2
|\| | |
| * | | 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 the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-121-0/+24
* | | | Add limit_profile_requests_to_known_users option (#18)Andrew Morgan2019-12-051-0/+7
* | | | Create configurable ratelimiter for 3pid invites (#11)Andrew Morgan2019-11-121-0/+6
* | | | Merge branch 'dinsic' into babolivier/dinsic-message-retentionBrendan Abolivier2019-08-281-0/+10
|\ \ \ \
| * | | | LintBrendan Abolivier2019-08-011-1/+1
| * | | | Sample configBrendan Abolivier2019-08-011-0/+10
* | | | | Implement per-room message retention policiesBrendan Abolivier2019-08-281-0/+63
|/ / / /
* | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-4/+8
* | | | Merge branch 'babolivier/third_party_event_rules' into dinsicBrendan Abolivier2019-06-141-0/+13
|\ \ \ \ | | |/ / | |/| |
| * | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-141-0/+13
* | | | Merge branch 'dinsic' into babolivier/userdir_hide_usersBrendan Abolivier2019-06-127-67/+261
|\ \ \ \
| * \ \ \ Merge branch 'master' into dinsicBrendan Abolivier2019-06-126-44/+239
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
| | |\ \
| | * | | 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 branch 'master' into dinsicBrendan Abolivier2019-06-111-23/+22
| |\| |
| | * | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati...Brendan 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
* | | | | | Generate sample configBrendan Abolivier2019-06-101-0/+5
|/ / / / /
* | | | | Merge branch 'babolivier/account_validity_job_delta' of github.com:matrix-org... dinsic_2019-05-31Erik 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
| | |_|/ | |/| |
* | | | Merge pull request #5214 from matrix-org/babolivier/password-policyBrendan Abolivier2019-05-221-0/+30
|\ \ \ \
| * | | | Improve documentation on generated configurationBrendan Abolivier2019-05-211-7/+27
| * | | | Config and changelogBrendan Abolivier2019-05-201-0/+10
| | |/ / | |/| |
* | | | Merge branch 'babolivier/account_validity_expiration_date' into dinsicBrendan Abolivier2019-05-211-0/+8
|\ \ \ \ | | |/ / | |/| |
| * | | DocBrendan Abolivier2019-05-211-0/+8
| |/ /
* | | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-171-28/+49
|\| |
| * | 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
| |/
* | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-1415-44/+212
|\|
| * 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
| * | | | | 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
* | | | | Merge branch 'develop' into dinsicAndrew Morgan2019-04-152-0/+23
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-091-0/+6
| |\| | |
| | * | | Add account expiration featureBrendan 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 config option to block users from looking up 3PIDs (#5010) dinsic_2019-04-05Brendan Abolivier2019-04-051-0/+4
* | Merge branch 'master' of github.com:matrix-org/synapse into dinsicErik Johnston2019-04-053-10/+20
|\|
| * 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
* | Sample configErik Johnston2019-04-031-0/+5
* | Update sample configErik Johnston2019-03-211-0/+52
|/
* 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