summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2020-03-161-2/+2
|\| |
| * | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2019-11-011-2/+2
* | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2020-03-162-3/+3
|\| |
| * | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-312-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-2/+8
|\| |
| * | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-241-2/+8
* | | Add config linting script that checks for bool casing (#6203)Andrew Morgan2020-03-169-15/+22
|\| |
| * | Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-239-15/+22
| |/
* | Fix logging config for the docker image (#6197)Andrew Morgan2020-03-161-3/+2
|\|
| * Fix logging config for the docker image (#6197)Richard van der Hoff2019-10-181-3/+2
* | cas: support setting display name (#6114)Andrew Morgan2020-02-261-0/+3
|\|
| * cas: support setting display name (#6114)Valérian Rousset2019-10-111-0/+3
* | Refactor HomeserverConfig so it can be typechecked (#6137)Andrew Morgan2020-02-2633-79/+385
|\|
| * Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-1033-79/+385
* | Fix up some typechecking (#6150)Andrew Morgan2020-02-266-12/+20
|\|
| * Fix up some typechecking (#6150)Amber Brown2019-10-026-12/+20
* | 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-252-12/+52
|\|
| * Explicitly log when a homeserver does not have a trusted key server configure...Neil Johnson2019-09-262-12/+52
* | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Andrew Morgan2020-02-251-0/+13
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-253-61/+185
| |\
| * | Review commentsErik Johnston2019-09-251-1/+1
| * | Prune rows in user_ips older than configured periodErik Johnston2019-09-241-0/+13
* | | Enable cleaning up extremities with dummy events by default to prevent undue ...Andrew Morgan2020-02-251-3/+1
|\ \ \ | | |/ | |/|
| * | Enable cleaning up extremities with dummy events by default to prevent undue ...Neil Johnson2019-09-251-3/+1
* | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workAndrew Morgan2020-02-251-2/+76
|\| |
| * | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-241-6/+42
| |\ \
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-245-3/+44
| |\ \ \
| * \ \ \ Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1914-168/+524
| |\ \ \ \
| * | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-2/+76
* | | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingAndrew Morgan2020-02-251-6/+42
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingRichard van der Hoff2019-09-241-6/+42
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | docstrings and commentsRichard van der Hoff2019-09-241-7/+21
| | * | | | Merge branch 'develop' into rav/fix_attribute_mappingRichard van der Hoff2019-09-1914-168/+524
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Fix a bug with saml attribute maps.Richard van der Hoff2019-09-191-6/+28
* | | | | | 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/+62
|\| | | | |
| * | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupRichard van der Hoff2019-09-231-51/+62
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into rav/saml_config_cleanupRichard van der Hoff2019-09-1914-168/+524
| | |\ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | |
| | * | | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-131-51/+62
| | | |/ / | | |/| |
* | | | | 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
| | |_|/ | |/| |
* | | | Merge pull request #6072 from matrix-org/rav/fix_retry_resetAndrew Morgan2020-02-252-2/+2
|\| | |
| * | | fix broken copyrightsMatthew Hodgson2019-09-232-2/+2
* | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2020-02-251-0/+36
|\| | |
| * | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-201-0/+36
* | | | 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
| | |/ | |/|
* | | (#5849) Convert rst to markdown (#6040)Andrew Morgan2020-02-251-6/+6
|\| |
| * | (#5849) Convert rst to markdown (#6040)dstipp2019-09-171-6/+6
* | | Fix well-known lookups with the federation certificate whitelist (#5997)Andrew Morgan2020-02-251-1/+8
|\| |
| * | Fix well-known lookups with the federation certificate whitelist (#5997)Amber Brown2019-09-141-1/+8
* | | Fix for structured logging tests stomping on logs (#6023)Andrew Morgan2020-02-251-8/+25
|\| |
| * | Fix for structured logging tests stomping on logs (#6023)Amber Brown2019-09-131-8/+25
* | | add report_stats_endpoint config option (#6012)Andrew Morgan2020-02-251-0/+9
|\| |
| * | add report_stats_endpoint config option (#6012)Sorunome2019-09-121-0/+9
* | | Blow up config if opentracing is missing (#5985)Andrew Morgan2020-02-251-0/+7
|\| |
| * | Blow up config if opentracing is missing (#5985)Jorik Schellekens2019-09-121-0/+7
* | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionAndrew Morgan2020-02-251-0/+13
|\| |
| * | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionErik Johnston2019-09-111-0/+13
| |\ \
| | * | Fix commentsErik Johnston2019-09-111-1/+1
| | * | Allow use of different ratelimits for admin redactions.Erik Johnston2019-09-111-0/+13
* | | | Check dependencies on setup in the nicer way. (#5989)Andrew Morgan2020-02-252-27/+12
|\| | |
| * | | Check dependencies on setup in the nicer way. (#5989)Jorik Schellekens2019-09-112-27/+12
| |/ /
* | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsAndrew Morgan2020-02-251-0/+17
|\| |
| * | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-091-0/+17
| |\ \
| | * | Default to censoring redactions after seven daysErik Johnston2019-09-091-4/+6
| | * | Handle setting retention period to 0Erik Johnston2019-09-091-1/+1
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_red...Erik Johnston2019-09-051-8/+5
| | |\ \
| | * | | Make redaction retention period configurableErik Johnston2019-09-051-0/+15
* | | | | Servers-known-about statistic (#5981)Andrew Morgan2020-02-251-0/+31
|\| | | |
| * | | | Servers-known-about statistic (#5981)Amber Brown2019-09-071-0/+31
* | | | | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2020-02-252-28/+130
|\| | | |
| * | | | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2019-09-062-28/+130
| | |/ / | |/| |
* | | | Fix and refactor room and user stats (#5971)Andrew Morgan2020-02-251-8/+5
|\| | |
| * | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-8/+5
| |/ /
* | | 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
* | | Let synctl use a config directory. (#5904)Andrew Morgan2020-02-241-3/+4
|\| |
| * | Let synctl use a config directory. (#5904)Jorik Schellekens2019-08-281-3/+4
* | | Config templating (#5900)Andrew Morgan2020-02-214-37/+161
|\| |
| * | Config templating (#5900)Jorik Schellekens2019-08-284-37/+161
* | | Implement a structured logging output system. (#5680)Andrew Morgan2020-02-211-42/+61
|\| |
| * | Implement a structured logging output system. (#5680)Amber Brown2019-08-281-42/+61
* | | Merge pull request #5895 from matrix-org/erikj/notary_keyAndrew Morgan2020-02-211-4/+30
|\| |
| * | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-271-4/+30
| |\ \
| | * | Don't implicitly include server signing keyErik Johnston2019-08-231-7/+6
| | * | Add config option for keys to use to sign keysErik Johnston2019-08-211-4/+31
* | | | Merge pull request #5909 from aaronraimist/public_base_urlAndrew Morgan2020-02-211-1/+1
|\| | |
| * | | public_base_url is actually public_baseurlAaron Raimist2019-08-261-1/+1
| |/ /
* | | Fix up password reset template config names (#5863)Andrew Morgan2020-02-201-8/+8
|\| |
| * | Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-8/+8
| |/
* | Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startupAndrew Morgan2020-02-201-1/+1
|\|
| * fix config being a dict, actuallyAmber H. Brown2019-08-141-1/+1
* | Don't load the media repo when configured to use an external media repo (#5754)Andrew Morgan2020-02-201-0/+20
|\|
| * Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-131-0/+20
| * LintBrendan Abolivier2019-08-011-12/+7
| * Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-2/+48
* | Remove non-functional 'expire_access_token' setting (#5782)Andrew Morgan2020-02-201-6/+0
|\|
| * Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-6/+0
* | Room Complexity Client Implementation (#5783)Andrew Morgan2020-02-201-0/+41
|\|
| * Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-0/+41
* | Make Jaeger fully configurable (#5694)Andrew Morgan2020-02-191-0/+22
|\|
| * Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-231-0/+22
* | Fix logging in workers (#5729)Andrew Morgan2020-02-191-0/+1
|\|
| * Fix logging in workers (#5729)Amber Brown2019-07-221-0/+1
| * Merge branch 'release-v1.2.0' into developJorik Schellekens2019-07-221-12/+2
| |\
* | \ Opentracing Documentation (#5703)Andrew Morgan2020-02-191-12/+2
|\ \ \ | | |/ | |/|
| * | Opentracing Documentation (#5703)Jorik Schellekens2019-07-221-12/+2
* | | Remove non-dedicated logging options and command line arguments (#5678)Andrew Morgan2020-02-193-76/+13
|\ \ \ | | |/ | |/|
| * | Remove non-dedicated logging options and command line arguments (#5678)Amber Brown2019-07-192-75/+12
| |/
| * enable aggregations support by defaultNeil Johnson2019-07-181-1/+1
* | Clean up opentracing configuration options (#5712)Andrew Morgan2020-02-191-22/+41
|\|
| * Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-181-22/+41
* | Merge pull request #5597 from matrix-org/erikj/admin_api_cmdAndrew Morgan2020-02-175-10/+79
|\|
| * Clean up arg name and remove lying commentErik Johnston2019-07-161-7/+5
| * Fix invoking add_argument from homeserver.pyErik Johnston2019-07-151-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmdErik Johnston2019-07-157-19/+114
| |\
| * | Move creation of ArgumentParser to callerErik Johnston2019-07-151-10/+5
| * | Fix up commentsErik Johnston2019-07-151-1/+1
| * | Change add_arguments to be a static methodErik Johnston2019-07-155-5/+39
| * | Add basic admin cmd appErik Johnston2019-07-021-3/+45
* | | Implement access token expiry (#5660)Andrew Morgan2020-02-171-0/+16
|\ \ \ | | |/ | |/|
| * | Implement access token expiry (#5660)Richard van der Hoff2019-07-121-0/+16
* | | Add basic opentracing support (#5544)Andrew Morgan2020-02-172-0/+52
|\| |
| * | Add basic opentracing support (#5544)Jorik Schellekens2019-07-112-0/+52
* | | Remove support for invite_3pid_guest. (#5625)Andrew Morgan2020-02-171-3/+2
|\| |
| * | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-051-3/+2
* | | Fixes to the federation rate limiter (#5621)Andrew Morgan2020-02-171-2/+2
|\| |
| * | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-051-2/+2
* | | Make errors about email password resets much clearer (#5616)Andrew Morgan2020-02-171-11/+8
|\| |
| * | Make errors about email password resets much clearer (#5616)Andrew Morgan2019-07-051-11/+8
* | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-141-2/+2
|\| |
| * | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-2/+2
* | | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-141-1/+32
|\| |
| * | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-013-2/+47
| |\|
| * | cleanupsRichard van der Hoff2019-06-271-6/+13
| * | Add support for tracking SAML2 sessions.Richard van der Hoff2019-06-261-1/+19
| * | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-2631-620/+704
| |\ \
| * | | Code cleanups and simplifications.Richard van der Hoff2019-06-111-1/+6
| * | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-104-99/+422
| |\ \ \
| * | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-021-0/+1
* | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Andrew Morgan2020-02-141-1/+31
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Amber Brown2019-06-281-1/+31
* | | | | Added possibilty to disable local password authentication (#5092)Andrew Morgan2020-02-141-0/+7
|\| | | |
| * | | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-271-0/+7
* | | | | 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 #5524 from matrix-org/rav/new_cmdline_optionsAndrew Morgan2020-02-142-5/+41
|\| | |
| * | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-242-5/+41
| |\ \ \
| | * | | Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-242-5/+26
| | * | | Add --data-directory commandline argumentRichard van der Hoff2019-06-241-0/+15
* | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsAndrew Morgan2020-02-1429-107/+87
|\| | | |
| * | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsRichard van der Hoff2019-06-2429-107/+87
| |\| | |
| | * | | Don't load the generated config as the default.Richard van der Hoff2019-06-2429-94/+60
| | * | | Ensure that all config options have sensible defaultsRichard van der Hoff2019-06-244-13/+27
| * | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-241-10/+34
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-10/+34
* | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathAndrew Morgan2020-02-132-5/+14
|\| | | |
| * | | | Remove unused Config.config_dir_path attributeRichard van der Hoff2019-06-241-3/+0
| * | | | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-241-2/+14
| |/ / /
* | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Andrew Morgan2020-02-1330-63/+99
|\| | |
| * | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-2430-63/+99
* | | | Drop support for cpu_affinity (#5525)Andrew Morgan2020-02-132-25/+0
|\| | |
| * | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-222-25/+0
* | | | Improve help and cmdline option names for --generate-config options (#5512)Andrew Morgan2020-02-131-22/+28
|\| | |
| * | | Improve help and cmdline option names for --generate-config options (#5512)Richard van der Hoff2019-06-211-22/+28
* | | | Refactor Config parser and add some comments. (#5511)Andrew Morgan2020-02-131-14/+35
|\| | |
| * | | Refactor Config parser and add some comments. (#5511)Richard van der Hoff2019-06-211-14/+35
* | | | Improve logging when generating config files (#5510)Andrew Morgan2020-02-133-1/+7
|\| | |
| * | | Improve logging when generating config files (#5510)Richard van der Hoff2019-06-213-1/+7
* | | | Run Black. (#5482)Andrew Morgan2020-02-132-3/+3
|\| | |
| * | | Run Black. (#5482)Amber Brown2019-06-2022-427/+369
* | | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1122-444/+397
* | | | Add experimental option to reduce extremities.Andrew Morgan2020-02-101-0/+6
|\| | |
| * | | Add experimental option to reduce extremities.Erik Johnston2019-06-181-0/+6
| * | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-142-0/+44
| |\ \ \
* | \ \ \ Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-104-1/+54
|\ \ \ \ \
| * | | | | Add the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-121-0/+30
| * | | | | Add limit_profile_requests_to_known_users option (#18)Andrew Morgan2019-12-051-0/+13
| * | | | | Create configurable ratelimiter for 3pid invites (#11)Andrew Morgan2019-11-121-0/+9
| * | | | | Rename io.open import to limite side-effectsBrendan Abolivier2019-09-091-2/+2
| * | | | | LintBrendan Abolivier2019-09-091-1/+1
| * | | | | Read all files as UTF-8Brendan Abolivier2019-09-091-1/+2
* | | | | | Remove Python 2.7 support. (#5425)Andrew Morgan2020-02-101-6/+5
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | / Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-111-6/+5
| | |_|/ | |/| |
* | | | Merge branch 'dinsic' into babolivier/dinsic-message-retentionBrendan Abolivier2019-08-281-2/+43
|\ \ \ \
| * | | | LintBrendan Abolivier2019-08-011-12/+7
| * | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-2/+48
* | | | | Implement per-room message retention policiesBrendan Abolivier2019-08-281-0/+172
|/ / / /
* | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-10/+34
* | | | Merge branch 'babolivier/third_party_event_rules' into dinsicBrendan Abolivier2019-06-142-0/+44
|\ \ \ \ | | |/ / | |/| |
| * | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-142-0/+44
| |/ /
* | | Merge branch 'dinsic' into babolivier/userdir_hide_usersBrendan Abolivier2019-06-127-73/+501
|\ \ \
| * | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-127-73/+496
| |\| |
| | * | Improve startup checks for insecure notary configs (#5392)Richard van der Hoff2019-06-101-4/+23
| | * | 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-15/+138
| | * | Stop hardcoding trust of old matrix.org key (#5374)Richard van der Hoff2019-06-061-39/+189
| | * | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verificationRichard van der Hoff2019-06-052-1/+17
| | |\ \
| | | * | Fix `federation_custom_ca_list` configuration option.Richard van der Hoff2019-06-051-1/+1
| | | * | Neilj/mau tracking config explainer (#5284)Neil Johnson2019-06-051-0/+16
| | * | | Validate federation server TLS certificates by default.Richard van der Hoff2019-06-051-5/+5
| | |/ /
| | * | Merge pull request #5341 from matrix-org/babolivier/email_configBrendan Abolivier2019-06-041-42/+57
| | |\ \ | | | |/ | | |/|
| | * | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_deltaErik Johnston2019-05-311-1/+5
| | |\ \
| | * | | Fix docs on resetting the user directory (#5036)Aaron Raimist2019-05-281-3/+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/+32
| | * | | Room Statistics (#4338)Amber Brown2019-05-212-10/+92
| * | | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-111-0/+5
| |\| | |
| | * | | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati...Brendan Abolivier2019-05-211-0/+8
| | |\ \ \
| | * \ \ \ Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+5
| | |\ \ \ \
| | | * | | | Add aggregations APIErik Johnston2019-05-161-0/+5
* | | | | | | Hide new users from the user directory if enabled in the server config.Brendan Abolivier2019-06-101-0/+11
|/ / / / / /
* | | | | | Merge branch 'babolivier/email_config' into dinsic dinsic_2019-06-04Brendan Abolivier2019-06-041-42/+57
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Only parse from email if providedBrendan Abolivier2019-06-041-4/+5
| * | | | | LintBrendan Abolivier2019-06-041-1/+0
| * | | | | Make account validity renewal emails work when email notifs are disabledBrendan Abolivier2019-06-041-42/+57
| | |_|/ / | |/| | |
* | | | | Merge branch 'babolivier/account_validity_job_delta' of github.com:matrix-org... dinsic_2019-05-31Erik Johnston2019-05-311-1/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Move delta from +10% to -10%Brendan Abolivier2019-05-311-1/+1
| * | | | Gah pythonBrendan Abolivier2019-05-311-1/+1
| * | | | Make max_delta equal to period * 10%Brendan Abolivier2019-05-311-11/+4
| * | | | Allow configuring a range for the account validity startup jobBrendan Abolivier2019-05-281-0/+11
| |/ / /
* | | | Merge pull request #5214 from matrix-org/babolivier/password-policyBrendan Abolivier2019-05-221-1/+37
|\ \ \ \
| * | | | Improve documentation on generated configurationBrendan Abolivier2019-05-211-7/+27
| * | | | First implementation of MSC2000Brendan Abolivier2019-05-201-1/+17
| | |/ / | |/| |
* | | | 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-172-42/+122
|\| |
| * | Add option to disable per-room profilesBrendan Abolivier2019-05-161-0/+11
| * | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-42/+73
| |/
| * Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-131-0/+38
* | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-145-29/+208
|\|
| * add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-081-0/+27
| * Merge branch 'master' into developRichard van der Hoff2019-05-031-10/+21
| |\
| | * 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-10/+18
| * | Merge pull request #5124 from matrix-org/babolivier/aliasesBrendan Abolivier2019-05-021-0/+11
| |\ \
| | * | Add some limitations to alias creationBrendan Abolivier2019-05-021-0/+11
| * | | Move admin API to a new prefixRichard van der Hoff2019-05-011-2/+2
| |/ /
| * | Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-252-8/+93
| * | Don't crash on lack of expiry templatesBrendan Abolivier2019-04-181-2/+6
| * | Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-172-9/+50
| |\ \