Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor `get_events_as_list` (#5699) | Richard van der Hoff | 2019-07-17 | 2 | -48/+75 |
* | Merge pull request #5597 from matrix-org/erikj/admin_api_cmd | Erik Johnston | 2019-07-16 | 8 | -13/+357 |
|\ | |||||
| * | Remove pointless description | Erik Johnston | 2019-07-16 | 1 | -1/+0 |
| * | Clean up arg name and remove lying comment | Erik Johnston | 2019-07-16 | 1 | -7/+5 |
| * | Fix typo in synapse/app/admin_cmd.py | Erik Johnston | 2019-07-16 | 1 | -1/+1 |
| * | Fix invoking add_argument from homeserver.py | Erik Johnston | 2019-07-15 | 1 | -1/+1 |
| * | s/exfiltrate_user_data/export_user_data/ | Erik Johnston | 2019-07-15 | 1 | -1/+1 |
| * | Add FileExfiltrationWriter | Erik Johnston | 2019-07-15 | 1 | -1/+69 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmd | Erik Johnston | 2019-07-15 | 293 | -2140/+3248 |
| |\ | |/ |/| | |||||
* | | Return a different error from Invalid Password when a user is deactivated (#5... | Andrew Morgan | 2019-07-15 | 3 | -0/+26 |
* | | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Erik Johnston | 2019-07-15 | 6 | -7/+423 |
|\ \ | |||||
| * | | Fixup docstrings | Erik Johnston | 2019-07-12 | 1 | -7/+5 |
| * | | pep8 | Erik Johnston | 2019-07-05 | 1 | -4/+0 |
| * | | Remove FileExfiltrationWriter | Erik Johnston | 2019-07-05 | 1 | -63/+0 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi... | Erik Johnston | 2019-07-05 | 217 | -1407/+1732 |
| |\ \ | |||||
| * | | | Assume key existence. Update docstrings | Erik Johnston | 2019-07-05 | 2 | -9/+11 |
| * | | | Fixup from review comments. | Erik Johnston | 2019-07-04 | 2 | -22/+27 |
| * | | | Apply comment fixups from code review | Erik Johnston | 2019-07-03 | 1 | -6/+6 |
* | | | | Add a `docker` type to the towncrier configuration (#5673) | Richard van der Hoff | 2019-07-12 | 7 | -14/+27 |
* | | | | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 14 | -31/+253 |
* | | | | fix typo: backgroud -> background | Andrew Morgan | 2019-07-12 | 2 | -5/+5 |
* | | | | fix changelog name | Richard van der Hoff | 2019-07-12 | 1 | -0/+0 |
* | | | | Update reverse_proxy.rst (#5397) | Ulrik Günther | 2019-07-12 | 2 | -0/+3 |
* | | | | Add missing space in default logging file format generated by the Docker imag... | Slavi Pantaleev | 2019-07-12 | 2 | -1/+2 |
* | | | | Upgrade Alpine Linux used in the Docker image (3.8 -> 3.10) (#5619) | Slavi Pantaleev | 2019-07-12 | 2 | -2/+3 |
* | | | | Add a mechanism for per-test configs (#5657) | Richard van der Hoff | 2019-07-12 | 2 | -1/+55 |
* | | | | Use /src for checking out synapse during sytests (#5664) | Amber Brown | 2019-07-11 | 2 | -0/+4 |
* | | | | Improved docs on setting up Postgresql (#5661) | Lrizika | 2019-07-11 | 2 | -4/+16 |
* | | | | small typo fix (#5655) | Andrew Morgan | 2019-07-11 | 2 | -1/+2 |
* | | | | Clean up exception handling for access_tokens (#5656) | Richard van der Hoff | 2019-07-11 | 6 | -100/+111 |
* | | | | Add basic opentracing support (#5544) | Jorik Schellekens | 2019-07-11 | 12 | -12/+633 |
* | | | | Inline issue_access_token (#5659) | Richard van der Hoff | 2019-07-11 | 3 | -8/+5 |
* | | | | Merge pull request #5658 from matrix-org/babolivier/is-json | Brendan Abolivier | 2019-07-10 | 2 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Typo | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 |
| * | | | | Rename changelog file | Brendan Abolivier | 2019-07-10 | 1 | -0/+0 |
| * | | | | Send 3PID bind requests as JSON data | Brendan Abolivier | 2019-07-10 | 2 | -1/+2 |
* | | | | | Remove access-token support from RegistrationStore.register (#5642) | Richard van der Hoff | 2019-07-10 | 9 | -79/+30 |
|/ / / / | |||||
* | | | | Don't bundle aggregations when retrieving the original event (#5654) | Andrew Morgan | 2019-07-10 | 2 | -2/+13 |
* | | | | Add a linting script (#5627) | Andrew Morgan | 2019-07-10 | 2 | -0/+13 |
* | | | | Correct pep517 flag in readme (#5651) | Bruno Windels | 2019-07-10 | 2 | -1/+2 |
* | | | | Merge pull request #5638 from matrix-org/babolivier/invite-json | Brendan Abolivier | 2019-07-09 | 2 | -4/+19 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into babolivier/invite-json | Brendan Abolivier | 2019-07-08 | 241 | -1918/+2403 |
| |\ \ \ \ | |||||
| * | | | | | Changelog | Brendan Abolivier | 2019-07-08 | 1 | -0/+1 |
| * | | | | | Lint | Brendan Abolivier | 2019-07-08 | 1 | -1/+2 |
| * | | | | | Use application/json when querying the IS's /store-invite endpoint | Brendan Abolivier | 2019-07-08 | 1 | -4/+17 |
* | | | | | | remove unused and unnecessary check for FederationDeniedError (#5645) | Hubert Chathi | 2019-07-09 | 2 | -4/+2 |
* | | | | | | Include the original event in /relations (#5626) | Andrew Morgan | 2019-07-09 | 4 | -4/+12 |
* | | | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-self | Brendan Abolivier | 2019-07-09 | 3 | -0/+52 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Lint | Brendan Abolivier | 2019-07-08 | 1 | -2/+2 |
| * | | | | | | Add test case | Brendan Abolivier | 2019-07-08 | 1 | -0/+47 |
| * | | | | | | Changelog | Brendan Abolivier | 2019-07-08 | 1 | -0/+1 |
| * | | | | | | Allow newly-registered users to lookup their own profiles | Brendan Abolivier | 2019-07-08 | 1 | -0/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Remove access-token support from RegistrationHandler.register (#5641) | Richard van der Hoff | 2019-07-08 | 8 | -81/+44 |
* | | | | | | Unblacklist some user_directory sytests (#5637) | Richard van der Hoff | 2019-07-09 | 2 | -4/+1 |
* | | | | | | Better logging for auto-join. (#5643) | Richard van der Hoff | 2019-07-08 | 2 | -0/+8 |
|/ / / / / | |||||
* | | | | | Update ModuleApi to avoid register(generate_token=True) (#5640) | Richard van der Hoff | 2019-07-08 | 2 | -8/+57 |
* | | | | | Factor out some redundant code in the login impl (#5639) | Richard van der Hoff | 2019-07-08 | 2 | -39/+11 |
* | | | | | Move get_or_create_user to test code (#5628) | Richard van der Hoff | 2019-07-08 | 3 | -60/+60 |
* | | | | | Add a few more common environment directory names to black exclusion (#5630) | Andrew Morgan | 2019-07-08 | 2 | -0/+3 |
* | | | | | Add default push rule to ignore reactions (#5623) | J. Ryan Stinnett | 2019-07-05 | 2 | -0/+14 |
* | | | | | Add origin_server_ts and sender fields to m.replace (#5613) | Andrew Morgan | 2019-07-05 | 3 | -7/+24 |
* | | | | | Remove support for invite_3pid_guest. (#5625) | Richard van der Hoff | 2019-07-05 | 7 | -196/+3 |
| |_|/ / |/| | | | |||||
* | | | | remove dead transaction persist code (#5622) | Richard van der Hoff | 2019-07-05 | 4 | -69/+1 |
* | | | | Fixes to the federation rate limiter (#5621) | Richard van der Hoff | 2019-07-05 | 6 | -16/+148 |
* | | | | Make errors about email password resets much clearer (#5616) | Andrew Morgan | 2019-07-05 | 2 | -11/+9 |
* | | | | Improve the backwards compatibility re-exports of synapse.logging.context (#5... | Amber Brown | 2019-07-05 | 4 | -5/+62 |
* | | | | Add a sytest blacklist file (#5611) | Andrew Morgan | 2019-07-05 | 5 | -148/+43 |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-07-04 | 3 | -6/+26 |
|\ \ \ \ | |||||
| * | | | | Update changelog v1.1.0 github/release-v1.1.0 release-v1.1.0 | Erik Johnston | 2019-07-04 | 1 | -0/+10 |
| * | | | | 1.1.0 | Erik Johnston | 2019-07-04 | 4 | -4/+9 |
| * | | | | Merge pull request #5615 from matrix-org/anoa/fix_changelog_email_resets | Erik Johnston | 2019-07-04 | 2 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | Suggest people use a config file for Docker instead of env vars | Andrew Morgan | 2019-07-04 | 2 | -1/+2 |
| |/ / / / | |||||
* | | | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 98 | -233/+249 |
* | | | | | Fix 'utime went backwards' errors on daemonization. (#5609) | Richard van der Hoff | 2019-07-03 | 3 | -31/+44 |
|/ / / / | |||||
* | | | | 1.1.0rc2 v1.1.0rc2 | Richard van der Hoff | 2019-07-03 | 6 | -5/+18 |
* | | | | Fix a number of "Starting txn from sentinel context" warnings (#5605) | Richard van der Hoff | 2019-07-03 | 5 | -6/+35 |
* | | | | Remove SMTP_* env var functionality from docker conf (#5596) | Andrew Morgan | 2019-07-03 | 2 | -19/+1 |
* | | | | Fix media repo breaking (#5593) | Amber Brown | 2019-07-02 | 6 | -24/+58 |
* | | | | tweak changelog v1.1.0rc1 | Richard van der Hoff | 2019-07-02 | 1 | -10/+13 |
* | | | | Merge remote-tracking branch 'origin/master' into release-v1.1.0 | Richard van der Hoff | 2019-07-02 | 3 | -5/+7 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #5552 from matrix-org/rav/github_templates | Richard van der Hoff | 2019-06-26 | 3 | -5/+7 |
| |\ \ \ \ | |||||
| | * | | | | changelog | Richard van der Hoff | 2019-06-25 | 1 | -0/+1 |
| | * | | | | Update github templates | Richard van der Hoff | 2019-06-25 | 1 | -2/+3 |
| | * | | | | Update SUPPORT.md | Richard van der Hoff | 2019-06-25 | 1 | -3/+3 |
* | | | | | | prepare v1.1.0rc1 | Richard van der Hoff | 2019-07-02 | 91 | -94/+106 |
* | | | | | | Complete the SAML2 implementation (#5422) | Richard van der Hoff | 2019-07-02 | 7 | -45/+231 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-07-01 | 55 | -450/+832 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Address review comments | Richard van der Hoff | 2019-07-01 | 1 | -5/+7 |
| * | | | | | | | rename BaseSSORedirectServlet for consistency | Richard van der Hoff | 2019-06-27 | 1 | -3/+3 |
| * | | | | | | | update sample config | Richard van der Hoff | 2019-06-27 | 1 | -6/+13 |
| * | | | | | | | cleanups | Richard van der Hoff | 2019-06-27 | 3 | -11/+18 |
| * | | | | | | | update sample config | Richard van der Hoff | 2019-06-26 | 1 | -0/+13 |
| * | | | | | | | Add support for tracking SAML2 sessions. | Richard van der Hoff | 2019-06-26 | 2 | -3/+56 |
| * | | | | | | | Move all the saml stuff out to a centralised handler | Richard van der Hoff | 2019-06-26 | 4 | -50/+96 |
| * | | | | | | | Revert redundant changes to static js | Richard van der Hoff | 2019-06-26 | 1 | -4/+2 |
| * | | | | | | | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-06-26 | 478 | -11486/+18913 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | changelog | Richard van der Hoff | 2019-06-11 | 1 | -0/+1 |
| * | | | | | | | | Merge tag 'v1.0.0rc3' into rav/saml2_client | Richard van der Hoff | 2019-06-11 | 6 | -2/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Code cleanups and simplifications. | Richard van der Hoff | 2019-06-11 | 6 | -50/+53 |
| * | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_client | Richard van der Hoff | 2019-06-10 | 157 | -1096/+5758 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | SAML2 Improvements and redirect stuff | Alexander Trost | 2019-06-02 | 5 | -2/+55 |
* | | | | | | | | | | | Merge pull request #5587 from matrix-org/erikj/fix_synctl | Erik Johnston | 2019-07-02 | 2 | -6/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-07-02 | 1 | -0/+1 |
| * | | | | | | | | | | | Fix --no-daemonize flag for synctl | Erik Johnston | 2019-07-02 | 1 | -6/+6 |
* | | | | | | | | | | | | Add ability to set timezone for Docker container (#5383) | Amir Zarrinkafsh | 2019-07-02 | 3 | -1/+3 |
* | | | | | | | | | | | | Fix JWT login with new users (#5586) | PauRE | 2019-07-02 | 2 | -6/+4 |
|/ / / / / / / / / / / | |||||
| | | | | | | | | | * | Use set_defaults(func=) style | Erik Johnston | 2019-07-15 | 1 | -11/+8 |
| | | | | | | | | | * | Move creation of ArgumentParser to caller | Erik Johnston | 2019-07-15 | 2 | -11/+8 |
| | | | | | | | | | * | Fix up comments | Erik Johnston | 2019-07-15 | 2 | -3/+3 |
| | | | | | | | | | * | Change add_arguments to be a static method | Erik Johnston | 2019-07-15 | 5 | -5/+39 |
| | | | | | | | | | * | Newsfile | Erik Johnston | 2019-07-02 | 1 | -0/+1 |
| | | | | | | | | | * | Add basic admin cmd app | Erik Johnston | 2019-07-02 | 3 | -6/+257 |
| | | | | | | | | |/ | |||||
| | | | | | | | | * | Newsfile | Erik Johnston | 2019-07-02 | 1 | -0/+1 |
| | | | | | | | | * | Add basic function to get all data for a user out of synapse | Erik Johnston | 2019-07-02 | 4 | -1/+478 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | fix async/await consentresource (#5585) | Amber Brown | 2019-07-01 | 2 | -1/+4 |
* | | | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop | Erik Johnston | 2019-07-01 | 2 | -2/+20 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fixup comment | Erik Johnston | 2019-07-01 | 1 | -6/+13 |
| * | | | | | | | | Newsfile | Erik Johnston | 2019-06-21 | 1 | -0/+1 |
| * | | | | | | | | Fix sync tightloop bug. | Erik Johnston | 2019-06-21 | 1 | -2/+12 |
* | | | | | | | | | Make the http server handle coroutine-making REST servlets (#5475) | Amber Brown | 2019-06-29 | 12 | -174/+162 |
* | | | | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit | Brendan Abolivier | 2019-06-28 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Only ratelimit when sending the email | Brendan Abolivier | 2019-06-28 | 1 | -1/+2 |
| * | | | | | | | | | Changelog | Brendan Abolivier | 2019-06-28 | 1 | -0/+1 |
| * | | | | | | | | | Don't update the ratelimiter before sending a 3PID invite | Brendan Abolivier | 2019-06-28 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Don't log GC 0s at INFO (#5557) | Amber Brown | 2019-06-28 | 2 | -1/+5 |
* | | | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ... | Amber Brown | 2019-06-28 | 7 | -9/+190 |
* | | | | | | | | | Added possibilty to disable local password authentication (#5092) | Daniel Hoffend | 2019-06-27 | 5 | -1/+18 |
* | | | | | | | | | Include systemd-python in Debian package to allow logging to journal (#5261) | Silke Hofstra | 2019-06-27 | 2 | -1/+8 |
* | | | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543) | Andrew Morgan | 2019-06-27 | 3 | -2/+19 |
* | | | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices | Erik Johnston | 2019-06-27 | 4 | -37/+98 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Review comments | Erik Johnston | 2019-06-27 | 2 | -7/+5 |
| * | | | | | | | | Move changelog | Erik Johnston | 2019-06-26 | 1 | -0/+0 |
| * | | | | | | | | Refactor and comment sync device list code | Erik Johnston | 2019-06-26 | 1 | -17/+53 |
| * | | | | | | | | Use batch_iter and correct docstring | Erik Johnston | 2019-06-26 | 1 | -15/+12 |
| * | | | | | | | | Rename get_users_whose_devices_changed | Erik Johnston | 2019-06-26 | 3 | -5/+5 |
| * | | | | | | | | Newsfile | Erik Johnston | 2019-06-26 | 1 | -0/+1 |
| * | | | | | | | | Refactor get_user_ids_changed to pull less from DB | Erik Johnston | 2019-06-26 | 3 | -28/+57 |
* | | | | | | | | | Docker image: Add a migrate_config mode (#5567) | Richard van der Hoff | 2019-06-27 | 4 | -17/+58 |
* | | | | | | | | | Docker image: open the non-TLS port by default. (#5568) | Richard van der Hoff | 2019-06-27 | 2 | -0/+2 |
* | | | | | | | | | Deprecate the env var way of running the docker image (#5566) | Richard van der Hoff | 2019-06-27 | 4 | -154/+99 |
* | | | | | | | | | Fix JWT login (#5555) | PauRE | 2019-06-27 | 3 | -1/+3 |
* | | | | | | | | | Merge pull request #5565 from matrix-org/rav/docker/fix_log_config | Richard van der Hoff | 2019-06-27 | 3 | -1/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2019-06-26 | 1 | -0/+1 |
| * | | | | | | | | | Docker: generate our own log config | Richard van der Hoff | 2019-06-26 | 1 | -1/+8 |
| * | | | | | | | | | Add support for SYNAPSE_CONFIG_DIR | Richard van der Hoff | 2019-06-26 | 2 | -0/+5 |
* | | | | | | | | | | Reduce the amount of stuff we send in the docker context (#5564) | Richard van der Hoff | 2019-06-27 | 2 | -9/+14 |
* | | | | | | | | | | Merge pull request #5563 from matrix-org/rav/docker/data_dir | Richard van der Hoff | 2019-06-27 | 3 | -4/+25 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2019-06-26 | 1 | -0/+1 |
| * | | | | | | | | | Docker image: add support for SYNAPSE_DATA_DIR parameter | Richard van der Hoff | 2019-06-26 | 2 | -4/+17 |
| * | | | | | | | | | document supported env vars for docker 'generate' option | Richard van der Hoff | 2019-06-26 | 1 | -0/+7 |
* | | | | | | | | | | Merge pull request #5562 from matrix-org/rav/docker/no-generate-keys | Richard van der Hoff | 2019-06-27 | 2 | -8/+24 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2019-06-26 | 1 | -0/+1 |
| * | | | | | | | | | | Docker: only run --generate-keys when generating config on-the-fly. | Richard van der Hoff | 2019-06-26 | 1 | -7/+21 |
| * | | | | | | | | | | improve logging for generate_config_from_template | Richard van der Hoff | 2019-06-26 | 1 | -1/+2 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #5561 from matrix-org/rav/docker/refactor | Richard van der Hoff | 2019-06-27 | 2 | -62/+118 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2019-06-26 | 1 | -0/+1 |
| * | | | | | | | | | isort | Richard van der Hoff | 2019-06-25 | 1 | -4/+5 |
| * | | | | | | | | | Add a main() function | Richard van der Hoff | 2019-06-25 | 1 | -8/+11 |
| * | | | | | | | | | Factor out a run_generate_config function | Richard van der Hoff | 2019-06-25 | 1 | -17/+28 |
| * | | | | | | | | | Factor out "generate_config_from_template" | Richard van der Hoff | 2019-06-25 | 1 | -41/+81 |
* | | | | | | | | | | Merge pull request #5570 from almereyda/patch-2 | Richard van der Hoff | 2019-06-27 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fix changelog | Richard van der Hoff | 2019-06-27 | 1 | -1/+1 |
| * | | | | | | | | | | Create 5570.misc | jon r | 2019-06-27 | 1 | -0/+1 |
| * | | | | | | | | | | Update purge_api README | jon r | 2019-06-27 | 1 | -2/+2 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5313 from twrist/patch-1 | Richard van der Hoff | 2019-06-27 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Create 5313.misc | Ike Johnson | 2019-06-02 | 1 | -0/+1 |
| * | | | | | | | | | Update HAProxy example rules | Ike Johnson | 2019-06-02 | 1 | -2/+4 |
* | | | | | | | | | | Improve docs on choosing server_name (#5558) | Richard van der Hoff | 2019-06-26 | 2 | -13/+19 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Remove & changelog (#5548) | Amber Brown | 2019-06-26 | 2 | -54/+1 |
* | | | | | | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-06-25 | 3 | -2/+7 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'release-v1.0.0' | Andrew Morgan | 2019-06-25 | 2 | -1/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Update changelog to better expain password reset change (#5545) github/release-v1.0.0 release-v1.0.0 | Andrew Morgan | 2019-06-24 | 2 | -1/+6 |
| * | | | | | | | | Fix broken link in MSC1711 FAQ | Richard van der Hoff | 2019-06-25 | 1 | -1/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Prevent multiple upgrades on the same room at once (#5051) | Andrew Morgan | 2019-06-25 | 3 | -52/+91 |
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Richard van der Hoff | 2019-06-25 | 5 | -8/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Increase default log level for docker image to INFO. (#5547) | Richard van der Hoff | 2019-06-25 | 2 | -5/+3 |
| * | | | | | | | | Update docker image to use Python 3.7. (#5546) | Richard van der Hoff | 2019-06-25 | 3 | -3/+4 |
* | | | | | | | | | Grafana dashboard updates | Richard van der Hoff | 2019-06-25 | 1 | -1/+6814 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add extremities graphs to grafana dashboard | Richard van der Hoff | 2019-06-25 | 1 | -23/+832 |
| * | | | | | | | | format json for grafana dashboard | Richard van der Hoff | 2019-06-25 | 1 | -1/+6005 |
|/ / / / / / / / | |||||
* | | | | | | | | Add info about black to code_style.rst (#5537) | Andrew Morgan | 2019-06-24 | 2 | -45/+43 |
* | | | | | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_options | Richard van der Hoff | 2019-06-24 | 4 | -6/+43 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | changelog | Richard van der Hoff | 2019-06-24 | 1 | -0/+1 |
| * | | | | | | | | Add "--open-private-ports" cmdline option | Richard van der Hoff | 2019-06-24 | 3 | -6/+27 |
| * | | | | | | | | Add --data-directory commandline argument | Richard van der Hoff | 2019-06-24 | 1 | -0/+15 |
* | | | | | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaults | Richard van der Hoff | 2019-06-24 | 30 | -107/+88 |
|\| | | | | | | | | |||||
| * | | | | | | | | changelog | Richard van der Hoff | 2019-06-24 | 1 | -0/+1 |
| * | | | | | | | | Don't load the generated config as the default. | Richard van der Hoff | 2019-06-24 | 29 | -94/+60 |
| * | | | | | | | | Ensure that all config options have sensible defaults | Richard van der Hoff | 2019-06-24 | 4 | -13/+27 |
* | | | | | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metrics | Richard van der Hoff | 2019-06-24 | 3 | -29/+53 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | black | Richard van der Hoff | 2019-06-24 | 1 | -6/+2 |
| * | | | | | | | | | Avoid raising exceptions in metrics | Richard van der Hoff | 2019-06-24 | 1 | -8/+14 |
| * | | | | | | | | | Merge branch 'develop' into rav/cleanup_metrics | Richard van der Hoff | 2019-06-24 | 397 | -10437/+9513 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2019-06-19 | 1 | -0/+1 |
| * | | | | | | | | | | Sanity-checking for metrics updates | Richard van der Hoff | 2019-06-19 | 1 | -7/+33 |
| * | | | | | | | | | | Simplify PerformanceCounters.update interface | Richard van der Hoff | 2019-06-19 | 1 | -11/+12 |
| * | | | | | | | | | | Remove unused _get_event_counters | Richard van der Hoff | 2019-06-19 | 1 | -7/+1 |
* | | | | | | | | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicrooms | Brendan Abolivier | 2019-06-24 | 6 | -20/+49 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 6 | -20/+49 |
* | | | | | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_token | Erik Johnston | 2019-06-24 | 3 | -17/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-24 | 1 | -0/+1 |
| * | | | | | | | | | | | Fix /messages on workers when no from param specified. | Erik Johnston | 2019-06-24 | 2 | -17/+19 |
* | | | | | | | | | | | | Merge pull request #5516 from matrix-org/rav/acme_key_path | Richard van der Hoff | 2019-06-24 | 10 | -12/+62 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2019-06-24 | 5 | -2/+3 |
| * | | | | | | | | | | | Remove unused Config.config_dir_path attribute | Richard van der Hoff | 2019-06-24 | 1 | -3/+0 |
| * | | | | | | | | | | | Allow configuration of the path used for ACME account keys. | Richard van der Hoff | 2019-06-24 | 4 | -7/+59 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522) | Richard van der Hoff | 2019-06-24 | 35 | -67/+104 |
* | | | | | | | | | | | Factor acme bits out to a separate file (#5521) | Richard van der Hoff | 2019-06-24 | 3 | -53/+94 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversal | Richard van der Hoff | 2019-06-24 | 2 | -6/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use monotonic clock where possible for metrics | Richard van der Hoff | 2019-06-19 | 2 | -6/+15 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Drop support for cpu_affinity (#5525) | Richard van der Hoff | 2019-06-22 | 6 | -74/+2 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Improve help and cmdline option names for --generate-config options (#5512) | Richard van der Hoff | 2019-06-21 | 2 | -22/+29 |
* | | | | | | | | | Refactor Config parser and add some comments. (#5511) | Richard van der Hoff | 2019-06-21 | 2 | -14/+36 |
* | | | | | | | | | Improve logging when generating config files (#5510) | Richard van der Hoff | 2019-06-21 | 4 | -1/+8 |
* | | | | | | | | | Only import jinja2 when needed (#5514) | Andrew Morgan | 2019-06-21 | 2 | -1/+3 |
* | | | | | | | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509) | Richard van der Hoff | 2019-06-21 | 2 | -1/+2 |
* | | | | | | | | | Fix logging error when a tampered event is detected. (#5500) | Richard van der Hoff | 2019-06-21 | 2 | -1/+1 |
* | | | | | | | | | Merge pull request #5513 from matrix-org/erikj/fix_messages_token | Erik Johnston | 2019-06-21 | 2 | -0/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-06-21 | 1 | -0/+1 |
| * | | | | | | | | | Fix /messages on worker when no token supplied | Erik Johnston | 2019-06-21 | 1 | -0/+2 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #5505 from matrix-org/erikj/messages_worker | Erik Johnston | 2019-06-21 | 3 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Update docs/workers.rst | Erik Johnston | 2019-06-21 | 1 | -1/+1 |
| * | | | | | | | | Newsfile | Erik Johnston | 2019-06-21 | 1 | -0/+1 |
| * | | | | | | | | Support pagination API in client_reader worker | Erik Johnston | 2019-06-21 | 2 | -0/+9 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremities | Erik Johnston | 2019-06-21 | 3 | -1/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Black | Erik Johnston | 2019-06-20 | 1 | -2/+2 |
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_... | Erik Johnston | 2019-06-20 | 400 | -10564/+9688 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add descriptions and remove redundant set(..) | Erik Johnston | 2019-06-19 | 2 | -4/+7 |
| * | | | | | | | | | Only count non-cache state resolution | Erik Johnston | 2019-06-18 | 1 | -3/+3 |
| * | | | | | | | | | Use consistent buckets | Erik Johnston | 2019-06-18 | 1 | -1/+1 |
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-06-17 | 1 | -0/+1 |
| * | | | | | | | | | Add metric fo number of state groups in resolution | Erik Johnston | 2019-06-17 | 1 | -0/+10 |
| * | | | | | | | | | Add metrics for len of new extremities persisted. | Erik Johnston | 2019-06-17 | 1 | -1/+23 |
* | | | | | | | | | | Improve email notification logging (#5502) | Neil Johnson | 2019-06-20 | 2 | -1/+2 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Run Black. (#5482) | Amber Brown | 2019-06-20 | 376 | -10399/+9153 |
* | | | | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error | Erik Johnston | 2019-06-19 | 2 | -9/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix logline | Erik Johnston | 2019-06-18 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi... | Erik Johnston | 2019-06-18 | 387 | -9715/+17324 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-04-10 | 1 | -0/+1 |
| * | | | | | | | | | Handle the case of `get_missing_events` failing | Erik Johnston | 2019-04-10 | 1 | -9/+20 |
* | | | | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events | Erik Johnston | 2019-06-19 | 7 | -1/+166 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Run as background process and fix comments | Erik Johnston | 2019-06-19 | 3 | -4/+7 |
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-18 | 1 | -0/+1 |
| * | | | | | | | | | | Add experimental option to reduce extremities. | Erik Johnston | 2019-06-18 | 6 | -1/+162 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5490 from matrix-org/rav/xmlsec_in_docker | Richard van der Hoff | 2019-06-19 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2019-06-18 | 1 | -0/+1 |
| * | | | | | | | | | | Include xmlsec in the docker image | Richard van der Hoff | 2019-06-18 | 1 | -1/+3 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typo | Brendan Abolivier | 2019-06-19 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix typo in deactivation background job | Brendan Abolivier | 2019-06-19 | 2 | -1/+2 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #4276 from Ralith/performance-advice | Richard van der Hoff | 2019-06-18 | 3 | -7/+29 |
|\ \ \ \ \ \ \ \ \ \ |