summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Correct pep517 flag in readme (#5651)Andrew Morgan2020-02-172-1/+2
|\
| * Correct pep517 flag in readme (#5651)Bruno Windels2019-07-102-1/+2
* | Merge pull request #5638 from matrix-org/babolivier/invite-jsonAndrew Morgan2020-02-173-8/+30
|\|
| * Merge pull request #5638 from matrix-org/babolivier/invite-jsonBrendan Abolivier2019-07-092-4/+19
| |\
| | * Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-08241-1918/+2403
| | |\
| | * | ChangelogBrendan Abolivier2019-07-081-0/+1
| | * | LintBrendan Abolivier2019-07-081-1/+2
| | * | Use application/json when querying the IS's /store-invite endpointBrendan Abolivier2019-07-081-4/+17
* | | | remove unused and unnecessary check for FederationDeniedError (#5645)Andrew Morgan2020-02-172-4/+2
|\| | |
| * | | remove unused and unnecessary check for FederationDeniedError (#5645)Hubert Chathi2019-07-092-4/+2
* | | | Include the original event in /relations (#5626)Andrew Morgan2020-02-174-4/+12
|\| | |
| * | | Include the original event in /relations (#5626)Andrew Morgan2019-07-094-4/+12
* | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfAndrew Morgan2020-02-171-0/+4
|\| | |
| * | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-093-0/+52
| |\ \ \
| | * | | LintBrendan Abolivier2019-07-081-2/+2
| | * | | Add test caseBrendan Abolivier2019-07-081-0/+47
| | * | | ChangelogBrendan Abolivier2019-07-081-0/+1
| | * | | Allow newly-registered users to lookup their own profilesBrendan Abolivier2019-07-081-0/+4
| | | |/ | | |/|
* | | | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-178-81/+44
|\| | |
| * | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-088-81/+44
* | | | Unblacklist some user_directory sytests (#5637)Andrew Morgan2020-02-172-4/+1
|\| | |
| * | | Unblacklist some user_directory sytests (#5637)Richard van der Hoff2019-07-092-4/+1
* | | | Better logging for auto-join. (#5643)Andrew Morgan2020-02-172-0/+8
|\| | |
| * | | Better logging for auto-join. (#5643)Richard van der Hoff2019-07-082-0/+8
| |/ /
* | | Update ModuleApi to avoid register(generate_token=True) (#5640)Andrew Morgan2020-02-172-8/+57
|\| |
| * | Update ModuleApi to avoid register(generate_token=True) (#5640)Richard van der Hoff2019-07-082-8/+57
* | | Factor out some redundant code in the login impl (#5639)Andrew Morgan2020-02-172-39/+11
|\| |
| * | Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-082-39/+11
* | | Move get_or_create_user to test code (#5628)Andrew Morgan2020-02-172-9/+60
|\| |
| * | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-083-60/+60
* | | Add a few more common environment directory names to black exclusion (#5630)Andrew Morgan2020-02-172-0/+3
|\| |
| * | Add a few more common environment directory names to black exclusion (#5630)Andrew Morgan2019-07-082-0/+3
* | | Add default push rule to ignore reactions (#5623)Andrew Morgan2020-02-172-0/+14
|\| |
| * | Add default push rule to ignore reactions (#5623)J. Ryan Stinnett2019-07-052-0/+14
* | | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2020-02-173-7/+24
|\| |
| * | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-053-7/+24
* | | Remove support for invite_3pid_guest. (#5625)Andrew Morgan2020-02-177-196/+3
|\| |
| * | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-057-196/+3
* | | remove dead transaction persist code (#5622)Andrew Morgan2020-02-174-69/+1
|\| |
| * | remove dead transaction persist code (#5622)Richard van der Hoff2019-07-054-69/+1
* | | Fixes to the federation rate limiter (#5621)Andrew Morgan2020-02-176-16/+148
|\| |
| * | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-056-16/+148
* | | Make errors about email password resets much clearer (#5616)Andrew Morgan2020-02-172-11/+9
|\| |
| * | Make errors about email password resets much clearer (#5616)Andrew Morgan2019-07-052-11/+9
* | | Improve the backwards compatibility re-exports of synapse.logging.context (#5...Andrew Morgan2020-02-174-5/+62
|\| |
| * | Improve the backwards compatibility re-exports of synapse.logging.context (#5...Amber Brown2019-07-054-5/+62
* | | Add a sytest blacklist file (#5611)Andrew Morgan2020-02-175-169/+71
|\| |
| * | Add a sytest blacklist file (#5611)Andrew Morgan2019-07-055-148/+43
* | | Blacklist some flaky testsAndrew Morgan2020-02-141-0/+6
* | | Pin black to 19.3b0Andrew Morgan2020-02-141-1/+1
* | | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-1413-24/+19
* | | Delete duplicate user deactivationAndrew Morgan2020-02-141-7/+0
* | | Fix account_validity incorrect email response contentAndrew Morgan2020-02-141-2/+5
* | | Fix incorrect run_in_background import statementAndrew Morgan2020-02-141-1/+1
* | | Fix signedjson deleted methodAndrew Morgan2020-02-141-4/+12
* | | Merge branch 'master' of github.com:matrix-org/synapse into developAndrew Morgan2020-02-141-0/+7
|\| |
| * | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-07-043-6/+26
| |\ \
* | \ \ Update changelogAndrew Morgan2020-02-141-0/+10
|\ \ \ \ | | |/ / | |/| |
| * | | Update changelog v1.1.0 github/release-v1.1.0 release-v1.1.0Erik Johnston2019-07-041-0/+10
* | | | 1.1.0Andrew Morgan2020-02-144-6/+8
|\| | |
| * | | 1.1.0Erik Johnston2019-07-044-4/+9
* | | | Merge pull request #5615 from matrix-org/anoa/fix_changelog_email_resetsAndrew Morgan2020-02-140-0/+0
|\| | |
| * | | Merge pull request #5615 from matrix-org/anoa/fix_changelog_email_resetsErik Johnston2019-07-042-1/+2
| |\ \ \
* | \ \ \ Suggest people use a config file for Docker instead of env varsAndrew Morgan2020-02-142-1/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Suggest people use a config file for Docker instead of env varsAndrew Morgan2019-07-042-1/+2
| |/ / /
* | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-1498-233/+249
|\ \ \ \ | | |/ / | |/| |
| * | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0498-233/+249
* | | | Fix 'utime went backwards' errors on daemonization. (#5609)Andrew Morgan2020-02-143-31/+44
|\| | |
| * | | Fix 'utime went backwards' errors on daemonization. (#5609)Richard van der Hoff2019-07-033-31/+44
| |/ /
* | | 1.1.0rc2Andrew Morgan2020-02-146-5/+18
|\| |
| * | 1.1.0rc2 v1.1.0rc2Richard van der Hoff2019-07-036-5/+18
* | | Fix a number of "Starting txn from sentinel context" warnings (#5605)Andrew Morgan2020-02-145-6/+35
|\| |
| * | Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-035-6/+35
* | | Remove SMTP_* env var functionality from docker conf (#5596)Andrew Morgan2020-02-142-19/+1
|\| |
| * | Remove SMTP_* env var functionality from docker conf (#5596)Andrew Morgan2019-07-032-19/+1
* | | Fix media repo breaking (#5593)Andrew Morgan2020-02-146-24/+58
|\| |
| * | Fix media repo breaking (#5593)Amber Brown2019-07-026-24/+58
* | | tweak changelogAndrew Morgan2020-02-141-10/+13
|\| |
| * | tweak changelog v1.1.0rc1Richard van der Hoff2019-07-021-10/+13
* | | Merge remote-tracking branch 'origin/master' into release-v1.1.0Andrew Morgan2020-02-140-0/+0
|\| |
| * | Merge remote-tracking branch 'origin/master' into release-v1.1.0Richard van der Hoff2019-07-023-5/+7
| |\ \
* | | | prepare v1.1.0rc1Andrew Morgan2020-02-1491-94/+106
|\| | |
| * | | prepare v1.1.0rc1Richard van der Hoff2019-07-0291-94/+106
* | | | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-147-45/+231
|\| | |
| * | | Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-027-45/+231
| |\ \ \
| | * \ \ Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-0155-450/+832
| | |\ \ \
| | * | | | Address review commentsRichard van der Hoff2019-07-011-5/+7
| | * | | | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| | * | | | update sample configRichard van der Hoff2019-06-271-6/+13
| | * | | | cleanupsRichard van der Hoff2019-06-273-11/+18
| | * | | | update sample configRichard van der Hoff2019-06-261-0/+13
| | * | | | Add support for tracking SAML2 sessions.Richard van der Hoff2019-06-262-3/+56
| | * | | | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-264-50/+96
| | * | | | Revert redundant changes to static jsRichard van der Hoff2019-06-261-4/+2
| | * | | | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-26478-11486/+18913
| | |\ \ \ \
| | * | | | | changelogRichard van der Hoff2019-06-111-0/+1
| | * | | | | Merge tag 'v1.0.0rc3' into rav/saml2_clientRichard van der Hoff2019-06-116-2/+14
| | |\ \ \ \ \
| | * | | | | | Code cleanups and simplifications.Richard van der Hoff2019-06-116-50/+53
| | * | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-10157-1096/+5758
| | |\ \ \ \ \ \
| | * | | | | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-025-2/+55
* | | | | | | | | Merge pull request #5587 from matrix-org/erikj/fix_synctlAndrew Morgan2020-02-142-6/+7
|\| | | | | | | |
| * | | | | | | | Merge pull request #5587 from matrix-org/erikj/fix_synctlErik Johnston2019-07-022-6/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | NewsfileErik Johnston2019-07-021-0/+1
| | * | | | | | | | Fix --no-daemonize flag for synctlErik Johnston2019-07-021-6/+6
* | | | | | | | | | Add ability to set timezone for Docker container (#5383)Andrew Morgan2020-02-143-1/+3
|\| | | | | | | | |
| * | | | | | | | | Add ability to set timezone for Docker container (#5383)Amir Zarrinkafsh2019-07-023-1/+3
* | | | | | | | | | Fix JWT login with new users (#5586)Andrew Morgan2020-02-142-6/+4
|\| | | | | | | | |
| * | | | | | | | | Fix JWT login with new users (#5586)PauRE2019-07-022-6/+4
| |/ / / / / / / /
* | | | | | | | | fix async/await consentresource (#5585)Andrew Morgan2020-02-142-1/+4
|\| | | | | | | |
| * | | | | | | | fix async/await consentresource (#5585)Amber Brown2019-07-012-1/+4
* | | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopAndrew Morgan2020-02-142-2/+20
|\| | | | | | | |
| * | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopErik Johnston2019-07-012-2/+20
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Fixup commentErik Johnston2019-07-011-6/+13
| | * | | | | | | NewsfileErik Johnston2019-06-211-0/+1
| | * | | | | | | Fix sync tightloop bug.Erik Johnston2019-06-211-2/+12
* | | | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Andrew Morgan2020-02-1412-174/+162
|\| | | | | | | |
| * | | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-2912-174/+162
* | | | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimitAndrew Morgan2020-02-140-0/+0
|\| | | | | | | |
| * | | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimitBrendan Abolivier2019-06-282-0/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| | * | | | | | | | ChangelogBrendan Abolivier2019-06-281-0/+1
| | * | | | | | | | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Don't log GC 0s at INFO (#5557)Andrew Morgan2020-02-142-1/+5
|\| | | | | | | |
| * | | | | | | | Don't log GC 0s at INFO (#5557)Amber Brown2019-06-282-1/+5
* | | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Andrew Morgan2020-02-147-9/+190
|\| | | | | | | |
| * | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Amber Brown2019-06-287-9/+190
* | | | | | | | | Added possibilty to disable local password authentication (#5092)Andrew Morgan2020-02-145-1/+18
|\| | | | | | | |
| * | | | | | | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-275-1/+18
* | | | | | | | | Include systemd-python in Debian package to allow logging to journal (#5261)Andrew Morgan2020-02-142-1/+8
|\| | | | | | | |
| * | | | | | | | Include systemd-python in Debian package to allow logging to journal (#5261)Silke Hofstra2019-06-272-1/+8
* | | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2020-02-143-2/+19
|\| | | | | | | |
| * | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2019-06-273-2/+19
* | | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesAndrew Morgan2020-02-144-37/+98
|\| | | | | | | |
| * | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesErik Johnston2019-06-274-37/+98
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Review commentsErik Johnston2019-06-272-7/+5
| | * | | | | | | Move changelogErik Johnston2019-06-261-0/+0
| | * | | | | | | Refactor and comment sync device list codeErik Johnston2019-06-261-17/+53
| | * | | | | | | Use batch_iter and correct docstringErik Johnston2019-06-261-15/+12
| | * | | | | | | Rename get_users_whose_devices_changedErik Johnston2019-06-263-5/+5
| | * | | | | | | NewsfileErik Johnston2019-06-261-0/+1
| | * | | | | | | Refactor get_user_ids_changed to pull less from DBErik Johnston2019-06-263-28/+57
* | | | | | | | | Docker image: Add a migrate_config mode (#5567)Andrew Morgan2020-02-144-17/+58
|\| | | | | | | |
| * | | | | | | | Docker image: Add a migrate_config mode (#5567)Richard van der Hoff2019-06-274-17/+58
* | | | | | | | | Docker image: open the non-TLS port by default. (#5568)Andrew Morgan2020-02-142-0/+2
|\| | | | | | | |
| * | | | | | | | Docker image: open the non-TLS port by default. (#5568)Richard van der Hoff2019-06-272-0/+2
* | | | | | | | | Deprecate the env var way of running the docker image (#5566)Andrew Morgan2020-02-144-154/+99
|\| | | | | | | |
| * | | | | | | | Deprecate the env var way of running the docker image (#5566)Richard van der Hoff2019-06-274-154/+99
* | | | | | | | | Fix JWT login (#5555)Andrew Morgan2020-02-143-1/+3
|\| | | | | | | |
| * | | | | | | | Fix JWT login (#5555)PauRE2019-06-273-1/+3
* | | | | | | | | Merge pull request #5565 from matrix-org/rav/docker/fix_log_configAndrew Morgan2020-02-143-1/+14
|\| | | | | | | |
| * | | | | | | | Merge pull request #5565 from matrix-org/rav/docker/fix_log_configRichard van der Hoff2019-06-273-1/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| | * | | | | | | | Docker: generate our own log configRichard van der Hoff2019-06-261-1/+8
| | * | | | | | | | Add support for SYNAPSE_CONFIG_DIRRichard van der Hoff2019-06-262-0/+5
* | | | | | | | | | Reduce the amount of stuff we send in the docker context (#5564)Andrew Morgan2020-02-142-9/+14
|\| | | | | | | | |
| * | | | | | | | | Reduce the amount of stuff we send in the docker context (#5564)Richard van der Hoff2019-06-272-9/+14
* | | | | | | | | | Merge pull request #5563 from matrix-org/rav/docker/data_dirAndrew Morgan2020-02-143-4/+25
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5563 from matrix-org/rav/docker/data_dirRichard van der Hoff2019-06-273-4/+25
| |\| | | | | | | |
| | * | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| | * | | | | | | | Docker image: add support for SYNAPSE_DATA_DIR parameterRichard van der Hoff2019-06-262-4/+17
| | * | | | | | | | document supported env vars for docker 'generate' optionRichard van der Hoff2019-06-261-0/+7
* | | | | | | | | | Merge pull request #5562 from matrix-org/rav/docker/no-generate-keysAndrew Morgan2020-02-142-8/+24
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5562 from matrix-org/rav/docker/no-generate-keysRichard van der Hoff2019-06-272-8/+24
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| | * | | | | | | | | Docker: only run --generate-keys when generating config on-the-fly.Richard van der Hoff2019-06-261-7/+21
| | * | | | | | | | | improve logging for generate_config_from_templateRichard van der Hoff2019-06-261-1/+2
| | |/ / / / / / / /
* | | | | | | | | | Merge pull request #5561 from matrix-org/rav/docker/refactorAndrew Morgan2020-02-142-62/+118
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5561 from matrix-org/rav/docker/refactorRichard van der Hoff2019-06-272-62/+118
| |\| | | | | | | |
| | * | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| | * | | | | | | | isortRichard van der Hoff2019-06-251-4/+5
| | * | | | | | | | Add a main() functionRichard van der Hoff2019-06-251-8/+11
| | * | | | | | | | Factor out a run_generate_config functionRichard van der Hoff2019-06-251-17/+28
| | * | | | | | | | Factor out "generate_config_from_template"Richard van der Hoff2019-06-251-41/+81
* | | | | | | | | | Merge pull request #5570 from almereyda/patch-2Andrew Morgan2020-02-142-2/+3
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5570 from almereyda/patch-2Richard van der Hoff2019-06-272-2/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fix changelogRichard van der Hoff2019-06-271-1/+1
| | * | | | | | | | | Create 5570.miscjon r2019-06-271-0/+1
| | * | | | | | | | | Update purge_api READMEjon r2019-06-271-2/+2
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
* | | | | | | | | | Merge pull request #5313 from twrist/patch-1Andrew Morgan2020-02-142-2/+5
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5313 from twrist/patch-1Richard van der Hoff2019-06-272-2/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Create 5313.miscIke Johnson2019-06-021-0/+1
| | * | | | | | | | Update HAProxy example rulesIke Johnson2019-06-021-2/+4
* | | | | | | | | | Merge pull request #5552 from matrix-org/rav/github_templatesAndrew Morgan2020-02-143-5/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge pull request #5552 from matrix-org/rav/github_templatesRichard van der Hoff2019-06-263-5/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | changelogRichard van der Hoff2019-06-251-0/+1
| | * | | | | | | | | Update github templatesRichard van der Hoff2019-06-251-2/+3
| | * | | | | | | | | Update SUPPORT.mdRichard van der Hoff2019-06-251-3/+3
* | | | | | | | | | | Improve docs on choosing server_name (#5558)Andrew Morgan2020-02-142-13/+19
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Improve docs on choosing server_name (#5558)Richard van der Hoff2019-06-262-13/+19
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Remove & changelog (#5548)Andrew Morgan2020-02-143-55/+2
|\| | | | | | | | |
| * | | | | | | | | Remove & changelog (#5548)Amber Brown2019-06-262-54/+1
| * | | | | | | | | Merge branch 'master' into developAndrew Morgan2019-06-253-2/+7
| |\| | | | | | | | | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'release-v1.0.0'Andrew Morgan2019-06-252-1/+6
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix broken link in MSC1711 FAQRichard van der Hoff2019-06-251-1/+1
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2020-02-144-53/+6905
|\| | | | | | | |
| * | | | | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-253-52/+91
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developRichard van der Hoff2019-06-255-8/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Grafana dashboard updatesRichard van der Hoff2019-06-251-1/+6814
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add extremities graphs to grafana dashboardRichard van der Hoff2019-06-251-23/+832
| | * | | | | | | | | format json for grafana dashboardRichard van der Hoff2019-06-251-1/+6005
| |/ / / / / / / / /
* | | | | | | | | | Increase default log level for docker image to INFO. (#5547)Andrew Morgan2020-02-142-5/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Increase default log level for docker image to INFO. (#5547)Richard van der Hoff2019-06-252-5/+3
* | | | | | | | | | Update docker image to use Python 3.7. (#5546)Andrew Morgan2020-02-143-3/+4
|\| | | | | | | | |
| * | | | | | | | | Update docker image to use Python 3.7. (#5546)Richard van der Hoff2019-06-253-3/+4
| |/ / / / / / / /
* | | | | | | | | Update changelog to better expain password reset change (#5545Andrew Morgan2020-02-142-1/+6
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Update changelog to better expain password reset change (#5545) github/release-v1.0.0 release-v1.0.0Andrew Morgan2019-06-242-1/+6
* | | | | | | | | Add info about black to code_style.rst (#5537)Andrew Morgan2020-02-142-45/+43
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Add info about black to code_style.rst (#5537)Andrew Morgan2019-06-242-45/+43
* | | | | | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsAndrew Morgan2020-02-144-6/+43
|\| | | | | | | |
| * | | | | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-244-6/+43
| |\ \ \ \ \ \ \ \
| | * | | | | | | | changelogRichard van der Hoff2019-06-241-0/+1
| | * | | | | | | | Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-243-6/+27
| | * | | | | | | | Add --data-directory commandline argumentRichard van der Hoff2019-06-241-0/+15
* | | | | | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsAndrew Morgan2020-02-1430-107/+88
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsRichard van der Hoff2019-06-2430-107/+88
| |\| | | | | | | |
| | * | | | | | | | changelogRichard van der Hoff2019-06-241-0/+1
| | * | | | | | | | 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 #5499 from matrix-org/rav/cleanup_metricsAndrew Morgan2020-02-143-29/+53
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metricsRichard van der Hoff2019-06-243-29/+53
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | blackRichard van der Hoff2019-06-241-6/+2
| | * | | | | | | | | Avoid raising exceptions in metricsRichard van der Hoff2019-06-241-8/+14
| | * | | | | | | | | Merge branch 'develop' into rav/cleanup_metricsRichard van der Hoff2019-06-24397-10437/+9513
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | changelogRichard van der Hoff2019-06-191-0/+1
| | * | | | | | | | | | Sanity-checking for metrics updatesRichard van der Hoff2019-06-191-7/+33
| | * | | | | | | | | | Simplify PerformanceCounters.update interfaceRichard van der Hoff2019-06-191-11/+12
| | * | | | | | | | | | Remove unused _get_event_countersRichard van der Hoff2019-06-191-7/+1
* | | | | | | | | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsAndrew Morgan2020-02-130-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-246-20/+49
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-246-20/+49
* | | | | | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenAndrew Morgan2020-02-133-17/+20
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-243-17/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | NewsfileErik Johnston2019-06-241-0/+1
| | * | | | | | | | | | | Fix /messages on workers when no from param specified.Erik Johnston2019-06-242-17/+19
* | | | | | | | | | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathAndrew Morgan2020-02-1310-12/+62
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathRichard van der Hoff2019-06-2410-12/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | changelogRichard van der Hoff2019-06-245-2/+3
| | * | | | | | | | | | | 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-244-7/+59
| |/ / / / / / / / / / /
* | | | | | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Andrew Morgan2020-02-1335-67/+104
|\| | | | | | | | | | |
| * | | | | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-2435-67/+104
* | | | | | | | | | | | Factor acme bits out to a separate file (#5521)Andrew Morgan2020-02-133-53/+94
|\| | | | | | | | | | |
| * | | | | | | | | | | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-243-53/+94
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalAndrew Morgan2020-02-132-6/+15
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalRichard van der Hoff2019-06-242-6/+15
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Use monotonic clock where possible for metricsRichard van der Hoff2019-06-192-6/+15
| | | |_|_|/ / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Drop support for cpu_affinity (#5525)Andrew Morgan2020-02-136-74/+2
|\| | | | | | | | | |
| * | | | | | | | | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-226-74/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Improve help and cmdline option names for --generate-config options (#5512)Andrew Morgan2020-02-132-22/+29
|\| | | | | | | | |
| * | | | | | | | | Improve help and cmdline option names for --generate-config options (#5512)Richard van der Hoff2019-06-212-22/+29