summary refs log tree commit diff
path: root/docs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-231-0/+10
* Merge branch 'master' into developBrendan Abolivier2020-04-231-1/+1
|\
| * Revert "Merge pull request #7315 from matrix-org/babolivier/request_token"Brendan Abolivier2020-04-231-10/+0
| * Merge pull request #7315 from matrix-org/babolivier/request_tokenBrendan Abolivier2020-04-231-0/+10
| |\
| | * Config option to inhibit 3PID errors on /requestTokenBrendan Abolivier2020-04-221-0/+10
| * | Improve example TURN configuration in documentation (#7284)nataraj-hates-MS-for-stealing-github2020-04-171-1/+1
| * | Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_log...Richard van der Hoff2020-04-031-4/+0
| * | Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallbackBrendan Abolivier2020-03-271-0/+4
| |\ \
| | * | Update the wording of the config commentBrendan Abolivier2020-03-271-3/+3
| | * | Regenerate sample configBrendan Abolivier2020-03-261-1/+5
| | |/
* | | Stop the master relaying USER_SYNC for other workers (#7318)Richard van der Hoff2020-04-221-5/+1
* | | Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-221-7/+100
* | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-221-0/+2
|\ \ \
| * | | Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-04-211-0/+2
| | |/ | |/|
* | | Fix indention in generated config file (#7300)Lars Franke2020-04-201-26/+26
* | | Clarify the comments for media_storage_providers options (#7272)Tristan Lins2020-04-171-4/+3
* | | Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-151-0/+25
* | | Add setting to nginx configuration to allow larger file uploads (#7251)Ryan Hovland2020-04-131-0/+3
* | | Add matrix-synapse-shared-secret-auth as an example password provider (#7248)Andrew Morgan2020-04-091-0/+1
* | | Make systemd-with-workers doc official (#7234)Richard van der Hoff2020-04-086-15/+160
* | | Add documentation to password_providers config option (#7238)Andrew Morgan2020-04-082-2/+17
* | | Extend web_client_location to handle absolute URLs (#7006)Martin Milata2020-04-031-3/+8
* | | Update postgres.md (#7119)siroccal2020-04-011-1/+27
* | | Improve TURN documentation. (#7167)Jostein Kjønigsen2020-03-311-0/+7
* | | Fix a small typo in the `metrics_flags` config option. (#7171)Andrew Morgan2020-03-301-1/+1
* | | Remove usage of "conn_id" for presence. (#7128)Erik Johnston2020-03-301-0/+6
* | | Add developer documentation for running a local CAS server (#7147)Patrick Cloke2020-03-302-2/+70
* | | Always whitelist the login fallback for SSO (#7153)Richard van der Hoff2020-03-271-0/+4
* | | Admin API to join users to a room. (#7051)Dirk Klimpel2020-03-271-0/+34
* | | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-0/+23
* | | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-261-0/+35
* | | Remove unused captcha_bypass_secret option (#7137)Aaron Raimist2020-03-251-4/+0
* | | Move catchup of replication streams to worker. (#7024)Erik Johnston2020-03-251-33/+13
* | | Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-241-3/+2
* | | Merge branch 'master' into developRichard van der Hoff2020-03-231-2/+1
|\ \ \ | | |/ | |/|
| * | Merge tag 'v1.12.0'Richard van der Hoff2020-03-234-6/+31
| |\|
| * | Update postgres.mdRichard van der Hoff2020-03-171-2/+1
* | | Improve database configuration docs (#6988)Richard van der Hoff2020-03-202-15/+70
| |/ |/|
* | Add an option to the set password API to choose whether to logout other devic...Patrick Cloke2020-03-181-1/+5
* | Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-171-13/+0
* | Put the file in the templates directoryBrendan Abolivier2020-03-111-7/+16
* | Update wording and configBrendan Abolivier2020-03-111-0/+3
* | Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-101-0/+13
|\ \
| * | Update sample_config.yamlDirk Klimpel2020-03-101-1/+1
| * | updates after reviewdklimpel2020-03-091-5/+5
| * | add disable_3pid_changesdklimpel2020-03-081-0/+5
| * | lint2dklimpel2020-03-081-2/+2
| * | changelogdklimpel2020-03-081-0/+8
* | | Update sample configBrendan Abolivier2020-03-101-0/+7
* | | Update routing of fallback auth in the worker docs. (#7048)Patrick Cloke2020-03-091-0/+1
* | | Merge branch 'master' into developBrendan Abolivier2020-03-031-0/+50
|\ \ \ | |/ / |/| / | |/
| * Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-021-3/+19
| * Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-021-0/+34
* | Fix minor issues with email config (#6962)Richard van der Hoff2020-02-241-4/+5
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-211-1/+1
|/
* Merge pull request #6940 from matrix-org/babolivier/federate.mdBrendan Abolivier2020-02-193-153/+126
|\
| * Incorporate reviewBrendan Abolivier2020-02-192-12/+13
| * Incorporate reviewBrendan Abolivier2020-02-182-21/+17
| * PhrasingBrendan Abolivier2020-02-181-1/+1
| * Add mention of SRV records as an advanced topicBrendan Abolivier2020-02-181-0/+10
| * Argh trailing spacesBrendan Abolivier2020-02-181-2/+2
| * Fix links in the reverse proxy docBrendan Abolivier2020-02-181-3/+4
| * Make federate.md more of a sumary of the steps to follow to set up replicationBrendan Abolivier2020-02-181-17/+28
| * Split the delegating documentation out of federate.md and trim it downBrendan Abolivier2020-02-182-133/+87
* | Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-181-0/+5
|\ \
| * | Add mention and warning about ACME v1 deprecation to the Synapse configBrendan Abolivier2020-02-131-0/+5
* | | Fix worker docs to point `/publicised_groups` API correctly. (#6938)Erik Johnston2020-02-181-3/+4
* | | Add a warning about indentation to generated config (#6920)Richard van der Hoff2020-02-142-2/+14
* | | Filter the results of user directory searching via the spam checker (#6888)Patrick Cloke2020-02-141-0/+3
| |/ |/|
* | Add documentation for the spam checker module (#6906)Patrick Cloke2020-02-131-0/+85
* | Update docs/ACME.mdBrendan Abolivier2020-02-131-1/+1
* | Mention that using Synapse to serve certificates requires restartsBrendan Abolivier2020-02-121-1/+3
* | Remove duplicated info about certbot et alBrendan Abolivier2020-02-121-5/+0
* | Update ACME.md to mention ACME v1 deprecationBrendan Abolivier2020-02-121-7/+41
|/
* Merge pull request #6891 from matrix-org/babolivier/retention-doc-amendBrendan Abolivier2020-02-122-0/+7
|\
| * RephraseBrendan Abolivier2020-02-122-5/+5
| * Also spell it out in the purge history API docBrendan Abolivier2020-02-111-0/+3
| * Spell out that Synapse never purges the last event sent in a roomBrendan Abolivier2020-02-111-0/+4
* | Merge branch 'master' into developBrendan Abolivier2020-02-121-1/+2
|\ \ | |/ |/|
| * Merge tag 'v1.10.0'Brendan Abolivier2020-02-122-1/+36
| |\
| * | Update documentation (#6859)Robin Vleij2020-02-051-1/+2
* | | Add support for putting fed user query API on workers (#6873)Erik Johnston2020-02-071-0/+1
* | | Allow moving group read APIs to workers (#6866)Erik Johnston2020-02-071-0/+8
* | | Admin api to add an email address (#6789)Dirk Klimpel2020-02-071-0/+11
| |/ |/|
* | Warn if postgres database has non-C locale. (#6734)Erik Johnston2020-01-281-1/+19
* | Fix federation_reader listeners doc as per PR reviewJason Robinson2020-01-271-2/+12
* | Clarifications to the workers documentationJason Robinson2020-01-241-0/+7
|/
* Update admin room docs with correct endpoints (#6770)Andrew Morgan2020-01-231-4/+4
* Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-221-0/+173
* Allow streaming cache invalidate all to workers. (#6749)Erik Johnston2020-01-221-0/+5
* Wake up transaction queue when remote server comes back online (#6706)Erik Johnston2020-01-171-1/+5
* Clarify the `account_validity` and `email` sections of the sample configurati...Richard van der Hoff2020-01-171-132/+152
* Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-132-8/+72
* Document more supported endpoints for workers (#6698)Richard van der Hoff2020-01-131-0/+4
* Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-091-1/+32
* Fix typo in message retention policies docBrendan Abolivier2020-01-081-1/+1
* Merge pull request #6624 from matrix-org/babolivier/retention_docBrendan Abolivier2020-01-081-0/+191
|\
| * Fix referenceBrendan Abolivier2020-01-071-1/+1
| * Incorporate reviewBrendan Abolivier2020-01-071-27/+28
| * Merge branch 'develop' into babolivier/retention_docBrendan Abolivier2020-01-072-6/+2
| |\
| * | Apply suggestions from code reviewBrendan Abolivier2020-01-071-5/+4
| * | Fix vacuum instructions for sqliteBrendan Abolivier2020-01-031-2/+2
| * | Add a complete documentation of the message retention policies supportBrendan Abolivier2020-01-031-0/+191
* | | Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typoBrendan Abolivier2020-01-071-5/+5
|\ \ \ | |_|/ |/| |
| * | RewordBrendan Abolivier2020-01-071-3/+3
| * | Change the example from 5min to 12hBrendan Abolivier2020-01-071-4/+4
| * | Update sample configBrendan Abolivier2020-01-031-1/+1
| |/
* | Automate generation of the sample and debian log configs (#6627)Richard van der Hoff2020-01-031-2/+2
* | Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-031-4/+0
|/
* 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