summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'shhs' of ssh://github.com/matrix-org/synapse into shhs shhs-v1.2.1.1 github/shhs shhsAmber H. Brown2019-07-268-65/+124
|\
| * Merge tag 'v1.2.1' into shhs shhs-v1.2.1Amber Brown2019-07-267-19/+124
| |\
| | * correct attributions in changelog github/release-v1.2.1 release-v1.2.1Richard van der Hoff2019-07-261-1/+4
| | * correct attributions in changelogRichard van der Hoff2019-07-261-1/+2
| | * 1.2.1Richard van der Hoff2019-07-265-4/+30
| | * Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-263-4/+38
| | |\
| | | * Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-263-4/+38
| | * | Log when we receive receipt from a different originErik Johnston2019-07-261-13/+22
| | * | Fix DoS when there is a cycle in redaction eventsRichard van der Hoff2019-07-261-0/+4
| | * | Merge branch 'rav/redactions/cross_room_id' into release-v1.2.1Richard van der Hoff2019-07-252-0/+28
| | |\ \
| | | * | log when a redaction attempts to redact an event in a different roomRichard van der Hoff2019-07-252-0/+28
| | |/ /
| * | | don't have a circleci configAmber Brown2019-07-261-46/+0
* | | | fix merging forward shhs-v1.2.0.2Amber H. Brown2019-07-261-1/+1
* | | | fix this shhs-v1.2.0.1Amber H. Brown2019-07-261-1/+1
|/ / /
* | | Merge tag 'v1.2.0' into shhs shhs-v1.2Amber H. Brown2019-07-26111-1284/+4042
|\| |
| * | 1.2.0 v1.2.0 github/release-v1.2.0 release-v1.2.0Andrew Morgan2019-07-253-3/+12
| |/
| * 1.2.0rc2 v1.2.0rc2Andrew Morgan2019-07-243-2/+10
| * Fix servlet metric names (#5734)Jorik Schellekens2019-07-2410-31/+92
| * Make changelog slightly more readable v1.2.0rc1Andrew Morgan2019-07-221-1/+1
| * 1.2.0rc1Andrew Morgan2019-07-2254-56/+82
| * Opentracing Documentation (#5703)Jorik Schellekens2019-07-225-24/+230
| * towncrierNeil Johnson2019-07-181-0/+1
| * enable aggregations support by defaultNeil Johnson2019-07-181-1/+1
| * Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-187-63/+96
| * Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-1820-50/+399
| * Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-185-39/+180
| * Convert synapse.federation.transport.server to async (#5689)Richard van der Hoff2019-07-182-242/+189
| * Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-175-24/+57
| * Improve `Depends` specs in debian package. (#5675)Richard van der Hoff2019-07-176-3/+33
| * More refactoring in `get_events_as_list` (#5707)Richard van der Hoff2019-07-174-27/+198
| * Fix redaction authentication (#5700)Richard van der Hoff2019-07-172-85/+131
| * Refactor `get_events_as_list` (#5699)Richard van der Hoff2019-07-172-48/+75
| * Merge pull request #5597 from matrix-org/erikj/admin_api_cmdErik Johnston2019-07-168-13/+357
| |\
| | * Remove pointless descriptionErik Johnston2019-07-161-1/+0
| | * Clean up arg name and remove lying commentErik Johnston2019-07-161-7/+5
| | * Fix typo in synapse/app/admin_cmd.pyErik Johnston2019-07-161-1/+1
| | * Fix invoking add_argument from homeserver.pyErik Johnston2019-07-151-1/+1
| | * s/exfiltrate_user_data/export_user_data/Erik Johnston2019-07-151-1/+1
| | * Add FileExfiltrationWriterErik Johnston2019-07-151-1/+69
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmdErik Johnston2019-07-15293-2140/+3248
| | |\ | | |/ | |/|
| * | Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2019-07-153-0/+26
| * | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-156-7/+423
| |\ \
| | * | Fixup docstringsErik Johnston2019-07-121-7/+5
| | * | pep8Erik Johnston2019-07-051-4/+0
| | * | Remove FileExfiltrationWriterErik Johnston2019-07-051-63/+0
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi...Erik Johnston2019-07-05217-1407/+1732
| | |\ \
| | * | | Assume key existence. Update docstringsErik Johnston2019-07-052-9/+11
| | * | | Fixup from review comments.Erik Johnston2019-07-042-22/+27
| | * | | Apply comment fixups from code reviewErik Johnston2019-07-031-6/+6
| * | | | Add a `docker` type to the towncrier configuration (#5673)Richard van der Hoff2019-07-127-14/+27
| * | | | Implement access token expiry (#5660)Richard van der Hoff2019-07-1214-31/+253
| * | | | fix typo: backgroud -> backgroundAndrew Morgan2019-07-122-5/+5
| * | | | fix changelog nameRichard van der Hoff2019-07-121-0/+0
| * | | | Update reverse_proxy.rst (#5397)Ulrik Günther2019-07-122-0/+3
| * | | | Add missing space in default logging file format generated by the Docker imag...Slavi Pantaleev2019-07-122-1/+2
| * | | | Upgrade Alpine Linux used in the Docker image (3.8 -> 3.10) (#5619)Slavi Pantaleev2019-07-122-2/+3
| * | | | Add a mechanism for per-test configs (#5657)Richard van der Hoff2019-07-122-1/+55
| * | | | Use /src for checking out synapse during sytests (#5664)Amber Brown2019-07-112-0/+4
| * | | | Improved docs on setting up Postgresql (#5661)Lrizika2019-07-112-4/+16
| * | | | small typo fix (#5655)Andrew Morgan2019-07-112-1/+2
| * | | | Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-116-100/+111
| * | | | Add basic opentracing support (#5544)Jorik Schellekens2019-07-1112-12/+633
| * | | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-113-8/+5
| * | | | Merge pull request #5658 from matrix-org/babolivier/is-jsonBrendan Abolivier2019-07-102-1/+2
| |\ \ \ \
| | * | | | TypoBrendan Abolivier2019-07-101-1/+1
| | * | | | Rename changelog fileBrendan Abolivier2019-07-101-0/+0
| | * | | | Send 3PID bind requests as JSON dataBrendan Abolivier2019-07-102-1/+2
| * | | | | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-109-79/+30
| |/ / / /
| * | | | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-102-2/+13
| * | | | Add a linting script (#5627)Andrew Morgan2019-07-102-0/+13
| * | | | Correct pep517 flag in readme (#5651)Bruno Windels2019-07-102-1/+2
| * | | | 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)Hubert Chathi2019-07-092-4/+2
| * | | | | | Include the original event in /relations (#5626)Andrew Morgan2019-07-094-4/+12
| * | | | | | 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)Richard van der Hoff2019-07-088-81/+44
| * | | | | | Unblacklist some user_directory sytests (#5637)Richard van der Hoff2019-07-092-4/+1
| * | | | | | Better logging for auto-join. (#5643)Richard van der Hoff2019-07-082-0/+8
| |/ / / / /
| * | | | | 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)Richard van der Hoff2019-07-082-39/+11
| * | | | | 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 Morgan2019-07-082-0/+3
| * | | | | 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 Morgan2019-07-053-7/+24
| * | | | | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-057-196/+3
| | |_|/ / | |/| | |
| * | | | remove dead transaction persist code (#5622)Richard van der Hoff2019-07-054-69/+1
| * | | | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-056-16/+148
| | | | * Use set_defaults(func=) styleErik Johnston2019-07-151-11/+8
| | | | * Move creation of ArgumentParser to callerErik Johnston2019-07-152-11/+8
| | | | * Fix up commentsErik Johnston2019-07-152-3/+3
| | | | * Change add_arguments to be a static methodErik Johnston2019-07-155-5/+39
| | | | * NewsfileErik Johnston2019-07-021-0/+1
| | | | * Add basic admin cmd appErik Johnston2019-07-023-6/+257
| | | |/
| | | * NewsfileErik Johnston2019-07-021-0/+1
| | | * Add basic function to get all data for a user out of synapseErik Johnston2019-07-024-1/+478
* | | | dockerfile updateAmber H. Brown2019-07-262-69/+3
* | | | add a waitAmber H. Brown2019-07-181-0/+2
* | | | fix shhs-v1.1.1.7-optAmber H. Brown2019-07-171-1/+1
* | | | fix shhs-v1.1.1.6-optAmber H. Brown2019-07-171-1/+1
* | | | fixAmber H. Brown2019-07-171-1/+1
* | | | fixAmber H. Brown2019-07-171-2/+2
* | | | fixAmber H. Brown2019-07-172-5/+4
* | | | try nowAmber H. Brown2019-07-171-3/+3
* | | | try nowAmber H. Brown2019-07-171-2/+2
* | | | see if we can do a build!Amber H. Brown2019-07-172-1/+84
* | | | Merge remote-tracking branch 'origin/develop' into shhs shhs-v1.1.1Amber H. Brown2019-07-05109-1126/+1109
|\| | |
| * | | 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...Amber Brown2019-07-054-5/+62
| * | | Add a sytest blacklist file (#5611)Andrew Morgan2019-07-055-148/+43
| * | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-07-043-6/+26
| |\ \ \
| * | | | 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)Richard van der Hoff2019-07-033-31/+44
* | | | | lintingAmber H. Brown2019-07-051-1/+0
* | | | | lintingAmber H. Brown2019-07-052-26/+0
* | | | | lintingAmber H. Brown2019-07-056-27/+25
* | | | | Merge tag 'v1.1.0' into shhs shhs-v1.1Amber H. Brown2019-07-053-4/+20
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update changelog v1.1.0 github/release-v1.1.0 release-v1.1.0Erik Johnston2019-07-041-0/+10
| * | | | 1.1.0Erik Johnston2019-07-044-4/+9
| * | | | 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 Morgan2019-07-042-1/+2
| |/ / /
* | | | Merge remote-tracking branch 'origin/develop' into shhsAmber H. Brown2019-07-03108-202/+464
|\| | |
| * | | 1.1.0rc2 v1.1.0rc2Richard van der Hoff2019-07-036-5/+18
| * | | 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 Morgan2019-07-032-19/+1
| * | | Fix media repo breaking (#5593)Amber Brown2019-07-026-24/+58
| * | | tweak changelog v1.1.0rc1Richard van der Hoff2019-07-021-10/+13
| * | | Merge remote-tracking branch 'origin/master' into release-v1.1.0Richard van der Hoff2019-07-023-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
| * | | | | prepare v1.1.0rc1Richard van der Hoff2019-07-0291-94/+106
| * | | | | 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_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)Amir Zarrinkafsh2019-07-023-1/+3
| * | | | | | | | | | Fix JWT login with new users (#5586)PauRE2019-07-022-6/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge remote-tracking branch 'origin/develop' into shhsAmber H. Brown2019-07-02461-11322/+17745
|\| | | | | | | | |
| * | | | | | | | | fix async/await consentresource (#5585)Amber Brown2019-07-012-1/+4
| * | | | | | | | | 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)Amber Brown2019-06-2912-174/+162
| * | | | | | | | | 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)Amber Brown2019-06-282-1/+5
| * | | | | | | | | 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)Daniel Hoffend2019-06-275-1/+18
| * | | | | | | | | 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 Morgan2019-06-273-2/+19
| * | | | | | | | | 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)Richard van der Hoff2019-06-274-17/+58
| * | | | | | | | | 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)Richard van der Hoff2019-06-274-154/+99
| * | | | | | | | | Fix JWT login (#5555)PauRE2019-06-273-1/+3
| * | | | | | | | | 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)Richard van der Hoff2019-06-272-9/+14
| * | | | | | | | | | 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-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/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-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-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
| * | | | | | | | | | Improve docs on choosing server_name (#5558)Richard van der Hoff2019-06-262-13/+19
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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
| | |\ \ \ \ \ \ \
| | | * | | | | | | Update changelog to better expain password reset change (#5545) github/release-v1.0.0 release-v1.0.0Andrew Morgan2019-06-242-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 Morgan2019-06-253-52/+91
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developRichard van der Hoff2019-06-255-8/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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)Richard van der Hoff2019-06-253-3/+4
| * | | | | | | | | 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
| |/ / / / / / / /
| * | | | | | | | 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_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_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_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-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_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