summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-172-9/+50
* | | | Move lookup endpoint to CS API (and s/is_server/id_server/)Brendan Abolivier2019-04-301-1/+0
* | | | [DINSIC] Add ability to proxy identity lookups (#5048)Andrew Morgan2019-04-161-0/+1
* | | | Merge branch 'develop' into dinsicAndrew Morgan2019-04-154-2/+24
|\| | |
| * | | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-111-1/+1
| * | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-091-0/+17
| |\| |
| | * | Add account expiration featureBrendan Abolivier2019-04-091-0/+17
| | |/
| * | add context to phonehome stats (#5020)Neil Johnson2019-04-081-0/+4
| * | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-041-0/+5
| * | Add config.signing_key_path. (#4974)Richard van der Hoff2019-04-021-1/+2
| |/
* | Add config option to block users from looking up 3PIDs (#5010) dinsic_2019-04-05Brendan Abolivier2019-04-051-0/+5
* | Merge branch 'master' of github.com:matrix-org/synapse into dinsicErik Johnston2019-04-053-5/+5
|\|
| * Use yaml safe_loadErik Johnston2019-03-223-5/+5
* | Add config option to use email as display name for new usersErik Johnston2019-04-031-0/+8
* | Update sample configErik Johnston2019-03-211-3/+2
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dinsic-mergedErik Johnston2019-03-2120-117/+313
|\|
| * Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-211-0/+10
| |\
| | * Fix up config commentsErik Johnston2019-03-201-3/+4
| | * Add option to disable search room listsErik Johnston2019-03-191-0/+9
| * | Merge pull request #4895 from matrix-org/erikj/disable_user_searchErik Johnston2019-03-201-0/+9
| |\ \
| | * | Fix up sample configErik Johnston2019-03-201-2/+4
| | * | Update synapse/config/user_directory.pyRichard van der Hoff2019-03-201-1/+1
| | * | Add option to disable searching in the user dirErik Johnston2019-03-191-0/+7
| | |/
| * | Add a config option for torture-testing worker replication. (#4902)Richard van der Hoff2019-03-201-0/+5
| * | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-201-0/+12
| |/
| * Use a regular HomeServerConfig object for unit testsRichard van der Hoff2019-03-192-2/+10
| * Comment out most options in the generated config. (#4863)Richard van der Hoff2019-03-1914-98/+149
| * Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-181-0/+9
| * Add ratelimiting on login (#4821)Brendan Abolivier2019-03-151-18/+40
| * Correctly handle all command line optionsErik Johnston2019-03-141-1/+23
| * Allow passing --daemonize to workersErik Johnston2019-03-132-1/+11
| * Document using a certificate with a full chain (#4849)Andrew Morgan2019-03-131-0/+5
| * Clarify what registration_shared_secret allows for (#2885) (#4844)Aaron Raimist2019-03-111-2/+2
| * Move settings from registration to ratelimiting in config fileBrendan Abolivier2019-03-052-18/+20
| * Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-0/+18
| * Include a default configuration file in the 'docs' directory. (#4791)Richard van der Hoff2019-03-044-13/+25
* | Fixup configErik Johnston2019-03-152-23/+25
* | Merge branch 'master' of github.com:matrix-org/synapse into erikj/dinsic-merg...Erik Johnston2019-03-1529-470/+1075
|\|
| * Fix ACME config for python 2. (#4717)Richard van der Hoff2019-02-251-3/+7
| * switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-251-1/+1
| * Merge pull request #4694 from matrix-org/erikj/fix_sentry_config_formatErik Johnston2019-02-201-0/+2
| |\
| | * Fixup generated metrics configErik Johnston2019-02-201-0/+2
| * | Attempt to make default config more consistentRichard van der Hoff2019-02-1924-196/+248
| |/
| * Merge pull request #4652 from matrix-org/babolivier/acme-delegatedBrendan Abolivier2019-02-191-0/+15
| |\
| | * Improve config documentationBrendan Abolivier2019-02-191-3/+11
| | * Use a configuration parameter to give the domain to generate a certificate forBrendan Abolivier2019-02-181-0/+7
| * | Merge pull request #4632 from matrix-org/erikj/basic_sentryErik Johnston2019-02-181-1/+29
| |\ \ | | |/ | |/|
| | * Fixup error handling and messageErik Johnston2019-02-181-5/+6
| | * FixupErik Johnston2019-02-181-1/+1
| | * Fixup comments and add warningErik Johnston2019-02-131-2/+7
| | * Raise an appropriate error message if sentry_sdk missingErik Johnston2019-02-121-1/+15
| | * Basic sentry integrationErik Johnston2019-02-121-0/+8
| * | config: Remove a repeated word from a logger warningJuuso "Linda" Lapinlampi2019-02-151-1/+1
| * | Merge pull request #4647 from matrix-org/erikj/add_room_publishing_rulesErik Johnston2019-02-151-26/+144
| |\ \
| | * | Move defaults up into codeErik Johnston2019-02-151-22/+44
| | * | Hoist up checks to reduce overall workErik Johnston2019-02-151-17/+15
| | * | Fixup commentsErik Johnston2019-02-151-8/+27
| | * | Clarify commentsErik Johnston2019-02-141-3/+3
| | * | Clarify and fix behaviour when there are multiple aliasesErik Johnston2019-02-141-6/+18
| | * | Fixup commentsErik Johnston2019-02-141-8/+15
| | * | Add configurable room list publishing rulesErik Johnston2019-02-141-17/+77
| * | | Fix errors in acme provisioning (#4648)Richard van der Hoff2019-02-141-0/+2
| |/ /
| * / Special-case the default bind_addresses for metrics listenerRichard van der Hoff2019-02-131-1/+5
| |/
| * Merge pull request #4625 from matrix-org/rav/fix_generate_config_warningsErik Johnston2019-02-121-7/+2
| |\
| | * fix self-signed cert notice from generate-configRichard van der Hoff2019-02-121-7/+2
| * | Disable TLS by default (#4614)Richard van der Hoff2019-02-122-27/+27
| * | Fix error when loading cert if tls is disabled (#4618)Richard van der Hoff2019-02-121-15/+42
| |/
| * fix testsRichard van der Hoff2019-02-111-1/+1
| * Infer no_tls from presence of TLS listenersRichard van der Hoff2019-02-113-12/+23
| * Merge branch 'rav/tls_config_logging_fixes' into rav/tls_cert/workRichard van der Hoff2019-02-111-18/+36
| |\
| | * Logging improvements around TLS certsRichard van der Hoff2019-02-111-18/+36
| * | Fail cleanly if listener config lacks a 'port'Richard van der Hoff2019-02-111-0/+5
| |/
| * Clean up default listener configuration (#4586)Richard van der Hoff2019-02-111-48/+81
| * ACME Reprovisioning (#4522)Amber Brown2019-02-111-1/+11
| * Be tolerant of blank TLS fingerprints config (#4589)Amber Brown2019-02-111-1/+5
| * Merge pull request #4420 from matrix-org/jaywink/openid-listenerErik Johnston2019-02-111-0/+10
| |\
| | * Fix flake8 issuesJason Robinson2019-01-231-1/+1
| | * Remove openid resource from default configJason Robinson2019-01-231-4/+13
| | * Split federation OpenID userinfo endpoint out of the federation resourceJason Robinson2019-01-231-4/+5
| * | Deduplicate some code in synapse.app (#4567)Amber Brown2019-02-081-11/+5
| * | Merge branch 'master' into developRichard van der Hoff2019-02-051-3/+3
| |\ \
| | * | Fix default ACME config for py2 (#4564)Richard van der Hoff2019-02-051-1/+1
| | * | fix typo in config comments (#4557)Richard van der Hoff2019-02-051-2/+2
| * | | by default include m.room.encryption on invites (#3902)Matthew Hodgson2019-01-301-0/+2
| |/ /
| * | ACME config cleanups (#4525)Richard van der Hoff2019-01-301-26/+74
| * | SIGHUP for TLS cert reloading (#4495)Amber Brown2019-01-301-8/+11
| * | Merge pull request #4512 from matrix-org/anoa/consent_dirAndrew Morgan2019-01-291-1/+13
| |\ \
| | * | Check consent dir path on startupAndrew Morgan2019-01-291-1/+13
| * | | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurlTravis Ralston2019-01-291-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Don't recommend :8448 to people on public_baseurlTravis Ralston2019-01-281-1/+1
| * | | Do not generate self-signed TLS certificates by default. (#4509)Amber Brown2019-01-291-43/+18
| |/ /
| * | Fix quoting for allowed_local_3pids example config (#4476)Richard van der Hoff2019-01-251-3/+3
| * | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_checkNeil Johnson2019-01-241-5/+4
| |\ \
| | * | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-221-2/+0
| | * | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-221-5/+6
| | |/
| * | Clarify docs for public_baseurlDavid Baker2019-01-241-1/+5
| * | Support ACME for certificate provisioning (#4384)Amber Brown2019-01-232-26/+93
| |/
| * Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registrationNeil Johnson2019-01-221-0/+9
| |\
| | * fix line lengthNeil Johnson2019-01-211-1/+3
| | * Config option to disable requesting MSISDN on registrationNeil Johnson2019-01-211-0/+7
| * | Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-221-40/+0
| |/
| * Changing macaroon_secret_key no longer logs you out (#4387)Richard van der Hoff2019-01-161-3/+0
| * Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-101-2/+2
| |\
| | * Revert "Fix macaroon_secret_key fallback logic"Richard van der Hoff2019-01-101-3/+3
| | * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-101-5/+5
| | |\
| | | * Fix macaroon_secret_key fallback logicRichard van der Hoff2019-01-101-3/+3
| | | * Fix fallback to signing key for macaroon-secret-keyRichard van der Hoff2019-01-101-2/+2
| * | | Fix synapse.config.__main__ on python 3 (#4356)Amber Brown2019-01-081-1/+1
| * | | Check jinja version for consent resource (#4327)Richard van der Hoff2019-01-071-1/+37
| * | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-229-46/+89
| * | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-221-35/+35
| * | | Merge branch 'release-v0.34.0' into developRichard van der Hoff2018-12-111-15/+27
| |\| |
| | * | Stop installing Matrix Console by defaultRichard van der Hoff2018-12-111-15/+27
| * | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-072-1/+112
| * | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-062-57/+1
| * | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-051-0/+9
| |/ /
| * | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-041-0/+5
| * | Add an option to disable search for homeservers which may not be interested i...Travis Ralston2018-12-041-1/+11
| * | Remove riot.im from the list of trusted Identity Servers in the default confi...Neil Johnson2018-11-201-1/+3
| * | Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-151-0/+6
| * | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-061-0/+18
| * | Set the encoding to UTF8 in the default logconfig (#4138)Amber Brown2018-11-031-0/+1
* | | Rewrite identity server URLs as required. (#4393) dinsic_2019-01-21Michael Kaye2019-01-211-0/+2
* | | Synchronise account metadata onto another server. (#4145) dinsic_2019-01-11Matthew Hodgson2019-01-111-0/+10
* | | merge master into dinsic, again...Matthew Hodgson2018-11-0310-76/+250
|\| |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-255-88/+92
| |\ \
| | * \ Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-254-68/+91
| | |\ \
| | | * | Fix a number of flake8 errorsRichard van der Hoff2018-10-241-1/+1
| | | * | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on...Amber Brown2018-10-202-63/+60
| | | * | Calculate absolute path for email templatesRichard van der Hoff2018-10-191-22/+18
| | * | | isortNeil Johnson2018-10-241-2/+1
| | * | | remove errant exception and styleNeil Johnson2018-10-231-1/+1
| | * | | clean up config error logic and importsNeil Johnson2018-10-171-5/+4
| | * | | improve auto room join logic, comments and testsNeil Johnson2018-10-121-1/+10
| | * | | fix UTsMatthew Hodgson2018-09-281-1/+1
| | * | | untested stab at autocreating autojoin roomsMatthew Hodgson2018-09-281-0/+4
| * | | | Use allow/denyErik Johnston2018-10-251-6/+6
| * | | | Use match rather than searchErik Johnston2018-10-241-2/+3
| * | | | Add config option to control alias creationErik Johnston2018-10-192-1/+103
| | |/ / | |/| |
| * | | Put the warning blob at the top of the fileRichard van der Hoff2018-10-171-6/+9
| * | | Ship the email templates as package_dataRichard van der Hoff2018-10-171-3/+30
| |/ /
| * | Replaced all occurences of e.message with str(e)Schnuffle2018-09-271-1/+1
| * | Remove some superfluous logging (#3855)Amber Brown2018-09-131-1/+16
| * | Fix jwt import checkRichard van der Hoff2018-09-072-1/+1
| * | move threepid checker to config, add missing yieldsNeil Johnson2018-08-311-0/+17
| * | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-241-2/+2
| * | Implement trail usersErik Johnston2018-08-231-0/+6
* | | Merge pull request #4047 from matrix-org/michaelkaye/dinsic_allow_user_direct...Michael Kaye2018-11-021-1/+1
|\ \ \
| * | | Allow us to configure http vs https for user_directoryMichael Kaye2018-10-171-1/+1
* | | | merge in masterMatthew Hodgson2018-10-223-5/+57
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-201-1/+2
| * | Integrate presence from hotfixes (#3694)Amber Brown2018-08-181-0/+6
| * | server limits config docsNeil Johnson2018-08-171-0/+26
| * | add new error type ResourceLimitNeil Johnson2018-08-161-0/+1
| * | update admin email to uriNeil Johnson2018-08-151-1/+1
| * | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-151-1/+1
| * | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-131-0/+4
| * | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-131-4/+0
| * | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-131-0/+4
| * | log *after* reloading log configRichard van der Hoff2018-08-101-2/+1
| * | Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-081-0/+3
| |\ \
| | * | implement reserved users for mau limitsNeil Johnson2018-08-071-1/+1
| | * | load mau limit threepidsNeil Johnson2018-08-061-0/+3
| * | | disable HS from configNeil Johnson2018-08-041-0/+4
| |/ /
| * / fix (lots of) py3 test failuresNeil Johnson2018-08-031-2/+2
| |/
| * Merge branch 'master' into developRichard van der Hoff2018-08-021-0/+2
| |\
| * | remove need to plot limit_usage_by_mauNeil Johnson2018-08-011-3/+6
| * | coding styleNeil Johnson2018-07-311-1/+1
| * | limit register and sign in on number of monthly usersNeil Johnson2018-07-301-0/+5
| * | Comment dummy TURN parameters in default configDavid Baker2018-07-111-2/+2
* | | Merge remote-tracking branch 'origin/master' into dinsicDavid Baker2018-07-1913-51/+61
|\ \ \ | | |/ | |/|
| * | Merge pull request #3377 from Valodim/note-affinityRichard van der Hoff2018-07-191-0/+2
| |\ \ | | |/ | |/|
| | * add note that the affinity package is required for the cpu_affinity settingVincent Breitmoser2018-06-091-0/+2
| | * Merge tag 'v0.31.0'Neil Johnson2018-06-063-1/+20
| | |\
| * | | run isortAmber Brown2018-07-0913-51/+59
* | | | Merge remote-tracking branch 'origin/master' into dinsicDavid Baker2018-07-174-9/+41
|\| | |
| * | | More server_name validationRichard van der Hoff2018-07-041-2/+9
| * | | fix testsMatthew Hodgson2018-06-281-0/+1
| * | | add ip_range_whitelist parameter to limit where ASes can connect fromMatthew Hodgson2018-06-281-1/+10
| * | | Write a clear restart indicator in logsRichard van der Hoff2018-06-201-6/+18
| * | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2018-06-051-0/+3
| |\| | | | |/ | |/|
| | * remove trailing whitespaceRichard van der Hoff2018-05-301-2/+2
| | * fix english and wrap commentRichard van der Hoff2018-05-301-1/+2
| | * add link to thorough instruction how to configure consentRuben Barkow2018-05-251-0/+2
* | | Merge tag 'v0.31.2' into dinsicMichael Kaye2018-06-2211-11/+216
|\| |
| * | Add private IPv6 addresses to preview blacklist #3312Felix Schäfer2018-06-011-0/+3
| * | Run Prometheus on a different port, optionally. (#3274)Amber Brown2018-05-311-0/+10
| * | Fix default for send_server_notice_to_guestsRichard van der Hoff2018-05-251-1/+1
| * | Avoid sending consent notice to guest usersRichard van der Hoff2018-05-251-1/+7
| |/
| * Allow overriding the server_notices user's avatarRichard van der Hoff2018-05-231-3/+12
| * Support for putting %(consent_uri)s in messagesRichard van der Hoff2018-05-231-4/+7
| * Reject attempts to send event before privacy consent is givenRichard van der Hoff2018-05-221-0/+10
| * Move consent config parsing into ConsentConfigRichard van der Hoff2018-05-221-1/+15
| * Send users a server notice about consentRichard van der Hoff2018-05-221-0/+8
| * Rename 'version' param on user consent configRichard van der Hoff2018-05-221-4/+6
| * Replace inline docstrings with "Attributes" in class docstringRichard van der Hoff2018-05-181-23/+15
| * Infrastructure for a server notices roomRichard van der Hoff2018-05-172-1/+89
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-15 04:06:13 +0000