Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_... | Jeroen | 2018-07-14 | 12 | -0/+7 |
|\ | |||||
| * | 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 |
| |\ | |||||
| | * | 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 |
| |\ | |||||
| | * | 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 |
| |\ | |||||
| | * | Newsfile | Erik Johnston | 2018-07-10 | 1 | -0/+1 |
| * | | Merge pull request #3498 from OlegGirko/fix_attrs_syntax | Amber Brown | 2018-07-11 | 1 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | 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 |
| * | | Refactor logcontext resource usage tracking (#3501) | Richard van der Hoff | 2018-07-10 | 1 | -0/+0 |
| * | | changelog | Richard van der Hoff | 2018-07-09 | 1 | -0/+1 |
| |/ | |||||
| * | changelog | Amber Brown | 2018-07-09 | 1 | -0/+0 |
* | | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 2 | -0/+1 |
|\| | |||||
| * | 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 | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
| * | | 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 | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
| * | | Merge pull request #3473 from matrix-org/erikj/thread_cache | Erik Johnston | 2018-07-04 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | 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 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Newsfile | Erik Johnston | 2018-07-02 | 1 | -0/+0 |
| | |/ | |||||
| * | | Reject invalid server names (#3480) | Richard van der Hoff | 2018-07-03 | 1 | -0/+1 |
| * | | 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 |
| |\ | |||||
| | * | 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 |
| |\ \ | |||||
| | * | | 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 |
* | towncrier changelog | Jeroen | 2018-06-26 | 1 | -0/+1 |