Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 2 | -0/+2 |
|\ | |||||
| * | Merge pull request #3555 from matrix-org/erikj/client_apis_move | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
| |\ | | | | | | | Make client_reader support some more read only APIs | ||||
| | * | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 5 | -0/+4 |
| | |\ | |||||
| | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-23 | 29 | -10/+10 |
| | |\ \ | | | | | | | | | | | | | | | | erikj/client_apis_move | ||||
| | * | | | Newsfile | Erik Johnston | 2018-07-18 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | changelog | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* / | | | Changelog | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
|/ / / | |||||
* | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | |||||
* | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | |||||
* | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | |||||
* | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | |||||
* | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+0 |
| |/ |/| | |||||
* | | Merge branch 'develop' into matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 17 | -2/+11 |
|\ \ | |||||
| * | | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 1 | -0/+0 |
| | | | |||||
| * | | Changelog | Richard van der Hoff | 2018-07-20 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #3571 from matrix-org/rav/limiter_fixes | Richard van der Hoff | 2018-07-20 | 2 | -0/+2 |
| |\ \ | | | | | | | | | A set of improvements to the Limiter | ||||
| | * | | changelogs | Richard van der Hoff | 2018-07-20 | 2 | -0/+2 |
| | | | | |||||
| * | | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 1 | -0/+0 |
| |/ / | |||||
| * | | changelog | Amber Brown | 2018-07-19 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into develop | Amber Brown | 2018-07-19 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | 0.33.0 final changelog v0.33.0 | Amber Brown | 2018-07-19 | 20 | -13/+0 |
| | | | | |||||
| | * | | update changelogs | Amber Brown | 2018-07-19 | 6 | -2/+4 |
| | | | | |||||
| | * | | Revert "0.33.0rc1 changelog" | Amber Brown | 2018-07-19 | 19 | -0/+10 |
| | | | | | | | | | | | | | | | | This reverts commit 21d3b879433e040babd43c89b62827f92e3ac861. | ||||
| * | | | Don't spew errors because we can't save metrics (#3563) | Amber Brown | 2018-07-19 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/release-v0.33.0' into develop | Richard van der Hoff | 2018-07-19 | 20 | -10/+1 |
| |\| | | |||||
| | * | | changelog | Richard van der Hoff | 2018-07-19 | 1 | -0/+1 |
| | | | | |||||
| | * | | 0.33.0rc1 changelog v0.33.0rc1 | Amber Brown | 2018-07-18 | 19 | -10/+0 |
| | | | | |||||
| * | | | Merge pull request #3556 from matrix-org/rav/background_processes | Richard van der Hoff | 2018-07-19 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Run things as background processes | ||||
| | * | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460) | Amber Brown | 2018-07-19 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_code | Erik Johnston | 2018-07-19 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Add response code to response timer metrics | ||||
| | * | | | | Newsfile | Erik Johnston | 2018-07-18 | 1 | -0/+1 |
| | | |_|/ | | |/| | | |||||
| * | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #3553 from matrix-org/rav/background_process_tracking | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | Resource tracking for background processes | ||||
| | * | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| | |/ | |||||
| * | | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Remove event re-signing hacks | ||||
| | * | | Add changelog | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #3514 from matrix-org/dbkr/turn_dont_add_defaults | David Baker | 2018-07-18 | 1 | -0/+1 |
| |\ \ \ | | |_|/ | |/| | | Comment dummy TURN parameters in default config | ||||
| | * | | I failed to correctly guess the PR number | David Baker | 2018-07-11 | 1 | -0/+0 |
| | | | | |||||
| | * | | Comment dummy TURN parameters in default config | David Baker | 2018-07-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This default config is parsed and used a base before the actual config is overlaid, so with these values not commented out, the code to detect when no turn params were set and refuse to generate credentials was never firing because the dummy default was always set. | ||||
| * | | | changelog | Richard van der Hoff | 2018-07-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_server | Richard van der Hoff | 2018-07-17 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Refactor and optimze filter_events_for_server | ||||
| | * | | | Changelog | Richard van der Hoff | 2018-07-16 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Newsfile | Erik Johnston | 2018-07-17 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Merge pull request #3530 from matrix-org/erikj/stream_cache | Amber Brown | 2018-07-17 | 1 | -0/+0 |
| |\ \ \ \ | | | | | | | | | | | | | Don't return unknown entities in get_entities_changed | ||||
| | * | | | | Newsfile | Erik Johnston | 2018-07-13 | 1 | -0/+0 |
| | |/ / / | |||||
| * | | | | check isort by travis | Krombel | 2018-07-16 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix develop because I broke it :( (#3535) | Amber Brown | 2018-07-14 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet | Amber Brown | 2018-07-14 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Use parse and asserts from http.servlet | ||||
| | * | | | | add changelog | Krombel | 2018-07-13 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 1 | -0/+0 |
| |/ / / / | |||||
| * | | | | better changelog | Richard van der Hoff | 2018-07-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | changelog | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge pull request #3521 from matrix-org/rav/optimise_stream_change_cache | Richard van der Hoff | 2018-07-12 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Reduce set building in get_entities_changed | ||||
| | * | | | changelog | Richard van der Hoff | 2018-07-12 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | changelog | Richard van der Hoff | 2018-07-12 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge pull request #3505 from matrix-org/erikj/receipts_cahce | Erik Johnston | 2018-07-12 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | Use stream cache in get_linearized_receipts_for_room | ||||
| | * | | Newsfile | Erik Johnston | 2018-07-10 | 1 | -0/+1 |
| | | | | |||||
* | | | | changelog | Matthew Hodgson | 2018-07-12 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #3498 from OlegGirko/fix_attrs_syntax | Amber Brown | 2018-07-11 | 1 | -0/+0 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use more portable syntax using attrs package. Newer syntax attr.ib(factory=dict) is just a syntactic sugar for attr.ib(default=attr.Factory(dict)) It was introduced in newest version of attrs package (18.1.0) and doesn't work with older versions. We should either require minimum version of attrs to be 18.1.0, or use older (slightly more verbose) syntax. Requiring newest version is not a good solution because Linux distributions may have older version of attrs (17.4.0 in Fedora 28), and requiring to build (and package) newer version just to use newer syntactic sugar in only one test is just too much. It's much better to fix that test to use older syntax. Signed-off-by: Oleg Girko <ol@infoserver.lv> | ||||
| * | | changelog entry | Amber Brown | 2018-07-11 | 1 | -0/+0 |
| | | | |||||
* | | | Attempt to include db threads in cpu usage stats (#3496) | Richard van der Hoff | 2018-07-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | Let's try to include time spent in the DB threads in the per-request/block cpu usage metrics. | ||||
* | | | Refactor logcontext resource usage tracking (#3501) | Richard van der Hoff | 2018-07-10 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | Factor out the resource usage tracking out to a separate object, which can be passed around and copied independently of the logcontext itself. | ||||
* | | | changelog | Richard van der Hoff | 2018-07-09 | 1 | -0/+1 |
|/ / | |||||
* | | changelog | Amber Brown | 2018-07-09 | 1 | -0/+0 |
| | | |||||
* | | Add an isort configuration (#3463) | Amber Brown | 2018-07-09 | 1 | -0/+0 |
| | | |||||
* | | changelog v0.32.2 github/release-v0.32.2 release-v0.32.2 | Amber Brown | 2018-07-07 | 1 | -1/+0 |
| | | |||||
* | | Correct attrs package name in requirements (#3492) | Amber Brown | 2018-07-07 | 2 | -0/+2 |
| | | |||||
* | | changelog v0.32.0rc1 | Amber Brown | 2018-07-05 | 28 | -19/+0 |
| | | |||||
* | | ACL changelog | Amber Brown | 2018-07-05 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #3483 from matrix-org/rav/more_server_name_validation | Erik Johnston | 2018-07-05 | 1 | -0/+1 |
|\ \ | | | | | | | More server_name validation | ||||
| * | | More server_name validation | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | We need to do a bit more validation when we get a server name, but don't want to be re-doing it all over the shop, so factor out a separate parse_and_validate_server_name, and do the extra validation. Also, use it to verify the server name in the config file. | ||||
* | | | Merge pull request #3481 from matrix-org/rav/fix_cachedescriptor_test | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Reinstate lost run_on_reactor in unit test | ||||
| * | | Reinstate lost run_on_reactor in unit test | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
| |/ | | | | | | | | | | | | | | | a61738b removed a call to run_on_reactor from a unit test, but that call was doing something useful, in making the function in question asynchronous. Reinstate the call and add a check that we are testing what we wanted to be testing. | ||||
* | | Merge pull request #3473 from matrix-org/erikj/thread_cache | Erik Johnston | 2018-07-04 | 1 | -0/+1 |
|\ \ | | | | | | | Invalidate cache on correct thread | ||||
| * | | Correct newsfile | Erik Johnston | 2018-07-02 | 2 | -0/+1 |
| | | | |||||
| * | | Newsfile | Erik Johnston | 2018-07-02 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #3474 from matrix-org/erikj/py3_auth | Erik Johnston | 2018-07-04 | 1 | -0/+0 |
|\ \ \ | |_|/ |/| | | Fix up auth check | ||||
| * | | Newsfile | Erik Johnston | 2018-07-02 | 1 | -0/+0 |
| |/ | |||||
* | | Reject invalid server names (#3480) | Richard van der Hoff | 2018-07-03 | 1 | -0/+1 |
| | | | | | | | | | | Make sure that server_names used in auth headers are sane, and reject them with a sensible error code, before they disappear off into the depths of the system. | ||||
* | | news snippet | Matthew Hodgson | 2018-07-02 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #3467 from matrix-org/hawkowl/contributor-requirements | Matthew Hodgson | 2018-06-30 | 1 | -0/+0 |
|\ | | | | | Clarify "real name" in contributor requirements | ||||
| * | topfile | Amber Brown | 2018-06-29 | 1 | -0/+0 |
| | | |||||
* | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking | Erik Johnston | 2018-06-29 | 1 | -0/+1 |
|\ \ | | | | | | | Check the state of prev_events a bit more thoroughly when coming over federation | ||||
| * | | topfile update | Amber Brown | 2018-06-28 | 1 | -2/+1 |
| | | | |||||
| * | | topfile | Amber Brown | 2018-06-27 | 1 | -0/+2 |
| | | | |||||
* | | | add towncrier snippet | Matthew Hodgson | 2018-06-28 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 1 | -0/+1 |
| | | |||||
* | | Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454) | Amber Brown | 2018-06-28 | 1 | -0/+0 |
|/ | |||||
* | Better testing framework for homeserver-using things (#3446) | Amber Brown | 2018-06-27 | 1 | -0/+0 |
| | |||||
* | Revert "Try to not use as much CPU in the StreamChangeCache" | Matthew Hodgson | 2018-06-26 | 1 | -0/+0 |
| | |||||
* | fixes | Amber Brown | 2018-06-26 | 1 | -0/+0 |
| | |||||
* | Use towncrier to build the changelog (#3425) | Amber Brown | 2018-06-25 | 15 | -0/+10 |