Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | | | | | | | | | Speed up _calculate_state_delta | Erik Johnston | 2018-07-24 | 1 | -10/+3 | |
| |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #3584 from matrix-org/erikj/use_cached | Erik Johnston | 2018-07-23 | 3 | -1/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Comments | Erik Johnston | 2018-07-23 | 2 | -2/+6 | |
| * | | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | Only get cached state from context in persist_event | Erik Johnston | 2018-07-23 | 2 | -1/+16 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #3582 from matrix-org/erikj/fixup_stateless | Erik Johnston | 2018-07-23 | 4 | -8/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | Fix missing attributes on workers. | Erik Johnston | 2018-07-23 | 3 | -8/+14 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #3581 from matrix-org/erikj/fixup_stateless | Erik Johnston | 2018-07-23 | 2 | -7/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | Fix EventContext when using workers | Erik Johnston | 2018-07-23 | 1 | -7/+7 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #3579 from matrix-org/erikj/stateless_contexts_4 | Erik Johnston | 2018-07-23 | 14 | -99/+260 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Update docstrings to make sense | Erik Johnston | 2018-07-23 | 1 | -5/+8 | |
| * | | | | | | | | | | | | | | | | Merge branch 'develop' into erikj/stateless_contexts_4 | Richard van der Hoff | 2018-07-23 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #3577 from matrix-org/erikj/cleanup_context | Erik Johnston | 2018-07-23 | 3 | -63/+82 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Fix unit tests | Erik Johnston | 2018-07-23 | 2 | -15/+40 | |
| | * | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | | Add support for updating state | Erik Johnston | 2018-07-23 | 2 | -9/+42 | |
| | * | | | | | | | | | | | | | | | Use new getters | Erik Johnston | 2018-07-23 | 9 | -31/+59 | |
| | * | | | | | | | | | | | | | | | Make EventContext lazy load state | Erik Johnston | 2018-07-23 | 2 | -44/+115 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | pep8 | Erik Johnston | 2018-07-23 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+0 | |
| * | | | | | | | | | | | | | | | Refcator EventContext to accept state during init | Erik Johnston | 2018-07-23 | 2 | -63/+82 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #3520 from matrix-org/matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 4 | -22/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 103 | -4671/+5379 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 8 | -27/+33 | |
* | | | | | | | | | | | | | | | | Merge pull request #3572 from matrix-org/rav/linearizer_cancellation | Richard van der Hoff | 2018-07-20 | 3 | -6/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Changelog | Richard van der Hoff | 2018-07-20 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | Test and fix support for cancellation in Linearizer | Richard van der Hoff | 2018-07-20 | 2 | -6/+53 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixes | Richard van der Hoff | 2018-07-20 | 6 | -164/+88 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | changelogs | Richard van der Hoff | 2018-07-20 | 2 | -0/+2 | |
| * | | | | | | | | | | | | | | | Combine Limiter and Linearizer | Richard van der Hoff | 2018-07-20 | 4 | -161/+59 | |
| * | | | | | | | | | | | | | | | Improvements to the Limiter | Richard van der Hoff | 2018-07-20 | 2 | -14/+21 | |
| * | | | | | | | | | | | | | | | Add a sleep to the Limiter to fix stack overflows. | Richard van der Hoff | 2018-07-20 | 2 | -7/+24 | |
* | | | | | | | | | | | | | | | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 8 | -3/+569 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #3564 from matrix-org/hawkowl/markdown | Richard van der Hoff | 2018-07-19 | 5 | -2879/+2499 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into hawkowl/markdown | Amber Brown | 2018-07-19 | 1 | -7/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-07-19 | 1 | -7/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Update r0.33.0 release notes github/release-v0.33.0 release-v0.33.0 | Richard van der Hoff | 2018-07-19 | 1 | -7/+17 | |
| | * | | | | | | | | | | | | | | fixes | Amber Brown | 2018-07-19 | 2 | -1/+2 | |
| | * | | | | | | | | | | | | | | fix up weird translation things | Amber Brown | 2018-07-19 | 1 | -806/+813 | |
| | * | | | | | | | | | | | | | | changelog | Amber Brown | 2018-07-19 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | make pyproject point at it | Amber Brown | 2018-07-19 | 1 | -2/+27 | |
| | * | | | | | | | | | | | | | | rst -> md | Amber Brown | 2018-07-19 | 2 | -2867/+2454 | |
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-07-19 | 3 | -8/+8 | |
|\| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | 0.33.0 final changelog v0.33.0 | Amber Brown | 2018-07-19 | 21 | -13/+28 | |
| * | | | | | | | | | | | | | | 0.33 final | Amber Brown | 2018-07-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | update changelogs | Amber Brown | 2018-07-19 | 6 | -2/+4 | |
| * | | | | | | | | | | | | | | Revert "0.33.0rc1 changelog" | Amber Brown | 2018-07-19 | 20 | -27/+10 | |
* | | | | | | | | | | | | | | | Don't spew errors because we can't save metrics (#3563) | Amber Brown | 2018-07-19 | 3 | -6/+25 | |
* | | | | | | | | | | | | | | | Merge pull request #3507 from Peetz0r/patch-1 | Richard van der Hoff | 2018-07-19 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | change http links to https | Peter | 2018-07-10 | 1 | -8/+8 | |
* | | | | | | | | | | | | | | | revert 00bc979 | Richard van der Hoff | 2018-07-19 | 1 | -4/+3 | |
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.0' into develop | Richard van der Hoff | 2018-07-19 | 23 | -14/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #3561 from matrix-org/rav/disable_logcontext_warning | Richard van der Hoff | 2018-07-19 | 2 | -3/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-19 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | Disable logcontext warning | Richard van der Hoff | 2018-07-19 | 1 | -3/+4 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | 0.33.0rc1 changelog v0.33.0rc1 | Amber Brown | 2018-07-18 | 20 | -10/+27 | |
| * | | | | | | | | | | | | | | bump to 0.33.0rc1 | Amber Brown | 2018-07-18 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge pull request #3556 from matrix-org/rav/background_processes | Richard van der Hoff | 2018-07-19 | 9 | -104/+67 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Make Distributor run its processes as a background process | Richard van der Hoff | 2018-07-18 | 2 | -78/+22 | |
| * | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | Run things as background processes | Richard van der Hoff | 2018-07-18 | 7 | -26/+44 | |
* | | | | | | | | | | | | | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460) | Amber Brown | 2018-07-19 | 13 | -101/+116 | |
* | | | | | | | | | | | | | | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_code | Erik Johnston | 2018-07-19 | 2 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | pep8 | Erik Johnston | 2018-07-18 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-18 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | Add response code to response timer metrics | Erik Johnston | 2018-07-18 | 1 | -3/+5 | |
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #3559 from matrix-org/rav/pep8_config | Amber Brown | 2018-07-19 | 2 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | add config for pep8 | Richard van der Hoff | 2018-07-18 | 1 | -3/+8 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #3553 from matrix-org/rav/background_process_tracking | Richard van der Hoff | 2018-07-18 | 3 | -5/+187 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Resource tracking for background processes | Richard van der Hoff | 2018-07-18 | 2 | -5/+186 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-18 | 2 | -43/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Add changelog | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Merge branch 'develop' into rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-04 | 152 | -642/+2188 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Remove event re-signing hacks | Richard van der Hoff | 2018-06-07 | 1 | -43/+0 | |
* | | | | | | | | | | | | | | | | Merge pull request #3514 from matrix-org/dbkr/turn_dont_add_defaults | David Baker | 2018-07-18 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | 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 | 2 | -2/+3 | |
* | | | | | | | | | | | | | | | | Merge pull request #3546 from matrix-org/rav/fix_erasure_over_federation | Richard van der Hoff | 2018-07-17 | 3 | -56/+133 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | add a comment | Richard van der Hoff | 2018-07-17 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-17 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | Fix visibility of events from erased users over federation | Richard van der Hoff | 2018-07-17 | 2 | -56/+130 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_server | Richard van der Hoff | 2018-07-17 | 4 | -138/+409 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | fix imports | Richard van der Hoff | 2018-07-17 | 2 | -0/+2 | |
| * | | | | | | | | | | | | | | | | add a comment | Richard van der Hoff | 2018-07-17 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | Changelog | Richard van der Hoff | 2018-07-16 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | Attempt to make _filter_events_for_server more efficient | Richard van der Hoff | 2018-07-16 | 1 | -17/+23 | |
| * | | | | | | | | | | | | | | | | Add a test which profiles filter_events_for_server in a large room | Richard van der Hoff | 2018-07-16 | 1 | -2/+155 | |
| * | | | | | | | | | | | | | | | | Move filter_events_for_server out of FederationHandler | Richard van der Hoff | 2018-07-16 | 3 | -138/+245 | |
* | | | | | | | | | | | | | | | | | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 13 | -934/+939 | |
* | | | | | | | | | | | | | | | | | Merge pull request #3544 from matrix-org/erikj/fixup_stream_cache | Erik Johnston | 2018-07-17 | 3 | -1/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Use efficient .intersection | Erik Johnston | 2018-07-17 | 1 | -4/+1 | |
| * | | | | | | | | | | | | | | | | Add unit test | Erik Johnston | 2018-07-17 | 1 | -0/+16 | |
| * | | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-17 | 1 | -0/+0 | |
| * | | | | | | | | | | | | | | | | Fix perf regression in PR #3530 | Erik Johnston | 2018-07-17 | 1 | -1/+6 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #3530 from matrix-org/erikj/stream_cache | Amber Brown | 2018-07-17 | 3 | -11/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Fixup unit test | Erik Johnston | 2018-07-13 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-13 | 1 | -0/+0 | |
| * | | | | | | | | | | | | | | | | Don't return unknown entities in get_entities_changed | Erik Johnston | 2018-07-13 | 1 | -8/+1 | |
* | | | | | | | | | | | | | | | | | Merge pull request #3540 from krombel/enforce_isort | Amber Brown | 2018-07-17 | 8 | -9/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | rename 'isort' to 'check_isort' as requested | Krombel | 2018-07-16 | 2 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | rerun isort with latest version | Krombel | 2018-07-16 | 6 | -20/+4 | |
| * | | | | | | | | | | | | | | | | | check isort by travis | Krombel | 2018-07-16 | 14 | -13/+37 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Fix develop because I broke it :( (#3535) | Amber Brown | 2018-07-14 | 3 | -2/+5 | |
* | | | | | | | | | | | | | | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet | Amber Brown | 2018-07-14 | 18 | -165/+102 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | fix sytests | Amber Brown | 2018-07-14 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | add changelog | Krombel | 2018-07-13 | 2 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | rename assert_params_in_request to assert_params_in_dict | Krombel | 2018-07-13 | 11 | -33/+33 | |
| * | | | | | | | | | | | | | | | | | Use parse_{int,str} and assert from http.servlet | Krombel | 2018-07-13 | 14 | -155/+91 | |
* | | | | | | | | | | | | | | | | | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 10 | -98/+97 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #3533 from matrix-org/rav/fix_federation_ratelimite_queue | Richard van der Hoff | 2018-07-13 | 3 | -10/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | better changelog | Richard van der Hoff | 2018-07-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | Fix unit tests | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | Make FederationRateLimiter queue requests properly | Richard van der Hoff | 2018-07-13 | 1 | -10/+23 | |
| |/ / / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / / / | typo | Matthew Hodgson | 2018-07-13 | 1 | -3/+3 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #3521 from matrix-org/rav/optimise_stream_change_cache | Richard van der Hoff | 2018-07-12 | 2 | -8/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-12 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | Reduce set building in get_entities_changed | Richard van der Hoff | 2018-07-12 | 1 | -8/+12 | |
* | | | | | | | | | | | | | | | | Merge pull request #3316 from matrix-org/rav/enforce_report_api | Richard van der Hoff | 2018-07-12 | 2 | -2/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-12 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | Merge branch 'develop' into rav/enforce_report_api | Richard van der Hoff | 2018-07-12 | 370 | -2555/+5185 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #3505 from matrix-org/erikj/receipts_cahce | Erik Johnston | 2018-07-12 | 3 | -7/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Update return value docstring | Erik Johnston | 2018-07-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | Use 'is not None' and add comments | Erik Johnston | 2018-07-10 | 1 | -2/+6 | |
| * | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-10 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | Use stream cache in get_linearized_receipts_for_room | Erik Johnston | 2018-07-10 | 2 | -5/+14 | |
| | * | | | | | | | | | | | | | | Enforce the specified API for report_event | Richard van der Hoff | 2018-05-31 | 1 | -2/+23 | |
| | | | | | * | | | | | | | | | | add trailing comma | Matthew Hodgson | 2018-07-23 | 1 | -1/+1 | |
| | | | | | * | | | | | | | | | | yes, we do need to invalidate the device_id_exists_cache when deleting a remo... | Matthew Hodgson | 2018-07-19 | 1 | -1/+0 | |
| | | | | | * | | | | | | | | | | spell out that include_deleted_devices requires include_all_devices | Matthew Hodgson | 2018-07-19 | 1 | -1/+5 | |
| | | | | | * | | | | | | | | | | changelog | Matthew Hodgson | 2018-07-12 | 1 | -0/+1 | |
| | | | | | * | | | | | | | | | | shift to using an explicit deleted flag on m.device_list_update EDUs | Matthew Hodgson | 2018-07-12 | 2 | -20/+25 | |
| | | | | | * | | | | | | | | | | WIP to announce deleted devices over federation | Matthew Hodgson | 2018-07-12 | 3 | -14/+44 | |
| |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #3498 from OlegGirko/fix_attrs_syntax | Amber Brown | 2018-07-11 | 2 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | changelog entry | Amber Brown | 2018-07-11 | 1 | -0/+0 | |
| * | | | | | | | | | | | | | | | Use more portable syntax using attrs package. | Oleg Girko | 2018-07-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | s/becuase/because/g | Matthew Hodgson | 2018-07-10 | 3 | -4/+4 | |
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Attempt to include db threads in cpu usage stats (#3496) | Richard van der Hoff | 2018-07-10 | 4 | -20/+39 | |
* | | | | | | | | | | | | | | | Refactor logcontext resource usage tracking (#3501) | Richard van der Hoff | 2018-07-10 | 5 | -130/+146 | |
* | | | | | | | | | | | | | | | another typo | Matthew Hodgson | 2018-07-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | typo (i think) | Matthew Hodgson | 2018-07-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge pull request #3497 from matrix-org/rav/measure_fetch_event_loop | Richard van der Hoff | 2018-07-10 | 2 | -19/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-09 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Add CPU metrics for _fetch_event_list | Richard van der Hoff | 2018-07-09 | 1 | -19/+32 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #3464 from matrix-org/hawkowl/isort-run | Richard van der Hoff | 2018-07-09 | 335 | -1528/+1609 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | changelog | Amber Brown | 2018-07-09 | 1 | -0/+0 | |
| * | | | | | | | | | | | | | | run isort | Amber Brown | 2018-07-09 | 334 | -1528/+1609 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | / / / / / / / / / / | Add an isort configuration (#3463) | Amber Brown | 2018-07-09 | 2 | -0/+12 | |
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | changelog v0.32.2 github/release-v0.32.2 release-v0.32.2 | Amber Brown | 2018-07-07 | 2 | -1/+9 | |
* | | | | | | | | | | | | | version | Amber Brown | 2018-07-07 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Correct attrs package name in requirements (#3492) | Amber Brown | 2018-07-07 | 3 | -1/+3 | |
* | | | | | | | | | | | | | Merge tag 'v0.32.1' | Richard van der Hoff | 2018-07-06 | 3 | -4/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Prepare 0.32.1 release v0.32.1 github/release-v0.32.1 release-v0.32.1 | Richard van der Hoff | 2018-07-06 | 3 | -2/+10 | |
| * | | | | | | | | | | | | | Merge pull request #3488 from matrix-org/rav/fix-netaddr-dep | Richard van der Hoff | 2018-07-06 | 2 | -3/+2 | |
|/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Add explicit dependency on netaddr | Richard van der Hoff | 2018-07-06 | 2 | -3/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | 0.32.0 version bump, update changelog v0.32.0 github/release-v0.32.0 release-v0.32.0 | Neil Johnson | 2018-07-06 | 2 | -1/+5 | |
* | | | | | | | | | | | | | changelog v0.32.0rc1 | Amber Brown | 2018-07-05 | 29 | -19/+47 | |
* | | | | | | | | | | | | | ACL changelog | Amber Brown | 2018-07-05 | 1 | -0/+1 | |
* | | | | | | | | | | | | | bump version to 0.32.0rc1 | Amber Brown | 2018-07-05 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'hera/rav/server_acls' into develop | Neil Johnson | 2018-07-05 | 5 | -4/+213 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Implementation of server_acls | Richard van der Hoff | 2018-07-04 | 5 | -4/+213 | |
* | | | | | | | | | | | | | | Merge pull request #3483 from matrix-org/rav/more_server_name_validation | Erik Johnston | 2018-07-05 | 5 | -13/+68 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | More server_name validation | Richard van der Hoff | 2018-07-04 | 5 | -13/+68 | |
* | | | | | | | | | | | | | | Merge pull request #3481 from matrix-org/rav/fix_cachedescriptor_test | Richard van der Hoff | 2018-07-04 | 2 | -2/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Reinstate lost run_on_reactor in unit test | Richard van der Hoff | 2018-07-04 | 2 | -2/+16 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #3473 from matrix-org/erikj/thread_cache | Erik Johnston | 2018-07-04 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Correct newsfile | Erik Johnston | 2018-07-02 | 2 | -0/+1 | |
| * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-02 | 1 | -0/+0 | |
| * | | | | | | | | | | | | | Invalidate cache on correct thread | Erik Johnston | 2018-07-02 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | Merge pull request #3474 from matrix-org/erikj/py3_auth | Erik Johnston | 2018-07-04 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-02 | 1 | -0/+0 | |
| * | | | | | | | | | | | | | Avoid relying on int vs None comparison | Erik Johnston | 2018-07-02 | 1 | -1/+5 | |
| * | | | | | | | | | | | | | Ensure that we define sender_domain | Erik Johnston | 2018-07-02 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Reject invalid server names (#3480) | Richard van der Hoff | 2018-07-03 | 5 | -25/+122 | |
* | | | | | | | | | | | | | Merge pull request #3470 from matrix-org/matthew/fix-utf8-logging | Richard van der Hoff | 2018-07-02 | 2 | -2/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | news snippet | Matthew Hodgson | 2018-07-02 | 1 | -0/+1 | |
| * | | | | | | | | | | | | replace invalid utf8 with \ufffd | Matthew Hodgson | 2018-07-02 | 1 | -2/+2 | |
| * | | | | | | | | | | | | a fix which doesn't NPE everywhere | Matthew Hodgson | 2018-07-01 | 1 | -9/+17 | |
| * | | | | | | | | | | | | don't mix unicode strings with utf8-in-byte-strings | Matthew Hodgson | 2018-07-01 | 1 | -2/+9 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #3467 from matrix-org/hawkowl/contributor-requirements | Matthew Hodgson | 2018-06-30 | 2 | -5/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | topfile | Amber Brown | 2018-06-29 | 1 | -0/+0 | |
| * | | | | | | | | | | | | clarification on what "real names" are | Amber Brown | 2018-06-29 | 1 | -5/+9 | |
* | | | | | | | | | | | | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking | Erik Johnston | 2018-06-29 | 5 | -30/+319 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | topfile update | Amber Brown | 2018-06-28 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | topfile | Amber Brown | 2018-06-27 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | try and clean up | Amber Brown | 2018-06-27 | 1 | -3/+6 | |
| * | | | | | | | | | | | | | pep8 | Amber Brown | 2018-06-27 | 2 | -11/+6 | |
| * | | | | | | | | | | | | | cleanups | Amber Brown | 2018-06-27 | 1 | -1/+4 | |
| * | | | | | | | | | | | | | cleanups | Amber Brown | 2018-06-27 | 1 | -13/+15 | |
| * | | | | | | | | | | | | | stylistic cleanup | Amber Brown | 2018-06-27 | 1 | -6/+18 | |
| * | | | | | | | | | | | | | cleanups | Amber Brown | 2018-06-27 | 1 | -7/+6 | |
| * | | | | | | | | | | | | | handle federation not telling us about prev_events | Amber Brown | 2018-06-27 | 4 | -27/+301 | |
* | | | | | | | | | | | | | | Merge pull request #3465 from matrix-org/matthew/as_ip_lock | Matthew Hodgson | 2018-06-28 | 5 | -5/+69 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | add test | Matthew Hodgson | 2018-06-28 | 1 | -0/+33 | |
| * | | | | | | | | | | | | | add towncrier snippet | Matthew Hodgson | 2018-06-28 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | fix tests | Matthew Hodgson | 2018-06-28 | 2 | -3/+16 | |
| * | | | | | | | | | | | | | add ip_range_whitelist parameter to limit where ASes can connect from | Matthew Hodgson | 2018-06-28 | 3 | -2/+19 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 40 | -62/+79 | |
* | | | | | | | | | | | | | Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454) | Amber Brown | 2018-06-28 | 2 | -2/+4 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Better testing framework for homeserver-using things (#3446) | Amber Brown | 2018-06-27 | 3 | -0/+309 | |
* | | | | | | | | | | | | Merge pull request #3452 from matrix-org/revert-3451-hawkowl/sorteddict-api | Matthew Hodgson | 2018-06-26 | 2 | -4/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Revert "Try to not use as much CPU in the StreamChangeCache" | Matthew Hodgson | 2018-06-26 | 2 | -4/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #3451 from matrix-org/hawkowl/sorteddict-api | Matthew Hodgson | 2018-06-26 | 2 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | fixes | Amber Brown | 2018-06-26 | 1 | -2/+2 | |
| * | | | | | | | | | | | | fixes | Amber Brown | 2018-06-26 | 2 | -2/+2 | |
| * | | | | | | | | | | | | try and make loading items from the cache faster | Amber Brown | 2018-06-26 | 1 | -2/+4 | |
* | | | | | | | | | | | | | Merge pull request #3449 from matrix-org/dbkr/fix_deactivate_account_multiple... | Matthew Hodgson | 2018-06-26 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix error on deleting users pending deactivation | David Baker | 2018-06-26 | 1 | -1/+3 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #3448 from matrix-org/matthew/gdpr-deactivate-admin-api | Matthew Hodgson | 2018-06-26 | 3 | -3/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | update doc for deactivate API | Matthew Hodgson | 2018-06-26 | 2 | -3/+16 | |
| * | | | | | | | | | | | | add GDPR erase param to deactivate API | Matthew Hodgson | 2018-06-26 | 2 | -1/+13 | |
* | | | | | | | | | | | | | Merge pull request #3438 from turt2live/travis/dont-print-access-tokens-in-logs | Amber Brown | 2018-06-26 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Don't print invalid access tokens in the logs | Travis Ralston | 2018-06-24 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | Merge pull request #3442 from matrix-org/matthew/allow-unconsented-parts | Erik Johnston | 2018-06-25 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | allow non-consented users to still part rooms (to let us autopart them) | Matthew Hodgson | 2018-06-25 | 1 | -2/+6 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #3443 from matrix-org/erikj/fast_filter_servers | Erik Johnston | 2018-06-25 | 1 | -0/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Actually fix it | Erik Johnston | 2018-06-25 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | Comment | Erik Johnston | 2018-06-25 | 1 | -0/+8 | |
| * | | | | | | | | | | | | | Fix bug with assuming wrong type | Erik Johnston | 2018-06-25 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | Add fast path to _filter_events_for_server | Erik Johnston | 2018-06-25 | 1 | -1/+34 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | typos | Matthew Hodgson | 2018-06-25 | 1 | -1/+1 | |
* | | | | | | | | | | | | | typo | Matthew Hodgson | 2018-06-25 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Need to pass reactor to endpoint fac | Erik Johnston | 2018-06-25 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Use towncrier to build the changelog (#3425) | Amber Brown | 2018-06-25 | 20 | -1/+55 | |
* | | | | | | | | | | | | | Merge pull request #3441 from matrix-org/erikj/redo_erasure | Erik Johnston | 2018-06-25 | 9 | -26/+216 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add UserErasureWorkerStore to workers | Erik Johnston | 2018-06-25 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili... | Erik Johnston | 2018-06-25 | 8 | -26/+214 | |
| |/ / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / | Remove all global reactor imports & pass it around explicitly (#3424) | Amber Brown | 2018-06-25 | 9 | -22/+29 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 8 | -214/+26 | |
* | | | | | | | | | | | | Merge pull request #3435 from matrix-org/rav/fix_event_push_actions_tablescan | Richard van der Hoff | 2018-06-22 | 1 | -1/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Deleting from event_push_actions needs to use an index | Mark Haines | 2018-06-22 | 1 | -1/+8 | |
* | | | | | | | | | | | | | Merge pull request #3434 from matrix-org/rav/search_logging | Richard van der Hoff | 2018-06-22 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Also log number of events for serach context | Erik Johnston | 2018-06-22 | 1 | -0/+5 | |
| * | | | | | | | | | | | | Add some logging to search queries | Erik Johnston | 2018-06-22 | 1 | -0/+9 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #3432 from matrix-org/rav/joined_hosts_cache_non_iterable | Richard van der Hoff | 2018-06-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Make _get_joined_hosts_cache cache non-iterable | Erik Johnston | 2018-06-22 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #3430 from matrix-org/rav/configurable_push_action_rotation | Richard van der Hoff | 2018-06-22 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Make push actions rotation configurable | Erik Johnston | 2018-06-22 | 1 | -3/+5 | |
* | | | | | | | | | | | | | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 8 | -26/+214 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Filter out erased messages | Richard van der Hoff | 2018-06-12 | 2 | -22/+68 | |
| * | | | | | | | | | | | | | mark accounts as erased when requested | Richard van der Hoff | 2018-06-12 | 3 | -4/+20 | |
| * | | | | | | | | | | | | | UserErasureStore | Richard van der Hoff | 2018-06-12 | 3 | -0/+126 | |
* | | | | | | | | | | | | | | Merge pull request #3428 from matrix-org/erikj/persisted_pdu | Erik Johnston | 2018-06-22 | 2 | -30/+27 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | simplify get_persisted_pdu | Richard van der Hoff | 2018-06-12 | 2 | -30/+27 | |
* | | | | | | | | | | | | | | Merge pull request #3427 from matrix-org/erikj/remove_filters | Erik Johnston | 2018-06-22 | 3 | -92/+35 | |
|\| | | | | | | | | | | | | | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | remove dead filter_events_for_clients | Richard van der Hoff | 2018-06-12 | 3 | -92/+35 |