Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | 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 |
* | | | Merge pull request #3383 from matrix-org/rav/hacky_speedup_state_group_cache | Richard van der Hoff | 2018-06-22 | 3 | -32/+61 |
|\ \ \ | |||||
| * | | | Disable partial state group caching for wildcard lookups | Richard van der Hoff | 2018-06-22 | 3 | -32/+61 |
|/ / / | |||||
* | | | Merge pull request #3382 from matrix-org/rav/optimise_state_groups | Richard van der Hoff | 2018-06-22 | 1 | -5/+1 |
|\ \ \ | |||||
| * | | | Optimise state_group_cache update | Richard van der Hoff | 2018-06-11 | 1 | -5/+1 |
* | | | | Merge pull request #3419 from matrix-org/rav/events_per_request | Richard van der Hoff | 2018-06-22 | 3 | -1/+23 |
|\ \ \ \ | |||||
| * | | | | Indirect evt_count updates via method call | Richard van der Hoff | 2018-06-22 | 2 | -1/+12 |
| * | | | | Log number of events fetched from DB | Richard van der Hoff | 2018-06-21 | 3 | -1/+12 |
* | | | | | Merge pull request #3418 from matrix-org/rav/fix_metric_desc | Amber Brown | 2018-06-22 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix description of "python_gc_time" metric | Richard van der Hoff | 2018-06-21 | 1 | -1/+1 |
* | | | | | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 25 | -93/+141 |
* | | | | | | Populate synapse_federation_client_sent_pdu_destinations:count again (#3386) | Amber Brown | 2018-06-21 | 1 | -3/+7 |
* | | | | | | Fix tcp protocol metrics naming (#3410) | Amber Brown | 2018-06-21 | 1 | -18/+35 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #3416 from matrix-org/rav/restart_indicator | Richard van der Hoff | 2018-06-20 | 2 | -12/+19 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Write a clear restart indicator in logs | Richard van der Hoff | 2018-06-20 | 2 | -12/+19 |
* | | | | | Merge pull request #3399 from costacruise/master | Richard van der Hoff | 2018-06-20 | 1 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Add error code to room creation error | Michael Wagner | 2018-06-14 | 1 | -2/+6 |
* | | | | | | Fix inflight requests metric (incorrect name & traceback) (#3413) | Amber Brown | 2018-06-20 | 1 | -3/+7 |
| |/ / / / |/| | | | | |||||
* | | | | | spell gauge correctly | Matthew Hodgson | 2018-06-16 | 1 | -1/+1 |
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-06-14 | 6 | -47/+243 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge tag 'v0.31.2' | Richard van der Hoff | 2018-06-14 | 6 | -47/+243 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | link to spec proposal from changelog v0.31.2 github/release-v0.31.2 release-v0.31.2 | Richard van der Hoff | 2018-06-14 | 1 | -0/+3 |
| | * | | | | v0.31.2 | Richard van der Hoff | 2018-06-14 | 1 | -1/+2 |
| | * | | | | changelog for 0.31.2 | Richard van der Hoff | 2018-06-14 | 1 | -0/+6 |
| | * | | | | Merge pull request #3397 from matrix-org/rav/adjust_auth_rules | Richard van der Hoff | 2018-06-14 | 4 | -46/+232 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix broken unit test | Richard van der Hoff | 2018-06-14 | 1 | -2/+14 |
| | | * | | | | remove spurious debug | Richard van der Hoff | 2018-06-14 | 1 | -2/+0 |
| | | * | | | | Make default state_default 50 | Richard van der Hoff | 2018-06-14 | 2 | -20/+167 |
| | | * | | | | Clarify interface for event_auth | Richard van der Hoff | 2018-06-14 | 1 | -18/+16 |
| | | * | | | | Refactor get_send_level to take a power_levels event | Richard van der Hoff | 2018-06-14 | 2 | -8/+39 |
| | | |/ / / | |||||
* | | | | | | add a last seen metric (#3396) | Amber Brown | 2018-06-14 | 1 | -0/+21 |
* | | | | | | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 13 | -63/+6 |
* | | | | | | Merge pull request #3368 from matrix-org/rav/fix_federation_client_host | Richard van der Hoff | 2018-06-13 | 1 | -14/+51 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix federation_client to send the right Host | Richard van der Hoff | 2018-06-12 | 1 | -14/+51 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #3389 from turt2live/travis/name_metrics | Amber Brown | 2018-06-13 | 11 | -11/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | The flag is named enable_metrics, not collect_metrics | Travis Ralston | 2018-06-12 | 11 | -11/+11 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3390 from turt2live/travis/appsvc-metrics | Amber Brown | 2018-06-13 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Use the RegistryProxy for appservices too | Travis Ralston | 2018-06-12 | 1 | -1/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #3276 from matrix-org/dbkr/unbind | David Baker | 2018-06-11 | 6 | -16/+115 |
|\ \ \ \ \ | |||||
| * | | | | | pep8 | David Baker | 2018-06-06 | 1 | -3/+3 |
| * | | | | | More doc fixes | David Baker | 2018-06-06 | 1 | -2/+2 |
| * | | | | | fix pep8 | David Baker | 2018-06-05 | 1 | -3/+5 |
| * | | | | | doc fixes | David Baker | 2018-06-05 | 2 | -7/+7 |
| * | | | | | Docstring | David Baker | 2018-06-04 | 1 | -0/+14 |
| * | | | | | Fix comment | David Baker | 2018-06-04 | 1 | -1/+1 |
| * | | | | | Missing yield | David Baker | 2018-06-04 | 1 | -1/+1 |
| * | | | | | docstring | David Baker | 2018-06-04 | 1 | -1/+9 |
| * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/unbind | David Baker | 2018-05-24 | 24 | -74/+485 |
| |\ \ \ \ \ | |||||
| * | | | | | | pep8 | David Baker | 2018-05-24 | 4 | -8/+13 |
| * | | | | | | comment | David Baker | 2018-05-24 | 1 | -0/+4 |
| * | | | | | | Unbind 3pids when they're deleted too | David Baker | 2018-05-24 | 2 | -3/+18 |
| * | | | | | | Hit the 3pid unbind endpoint on deactivation | David Baker | 2018-05-23 | 4 | -12/+63 |
* | | | | | | | fix idiotic typo in state res | Matthew Hodgson | 2018-06-11 | 1 | -2/+2 |
* | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-06-08 | 2 | -1/+13 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge tag 'v0.31.1' | Neil Johnson | 2018-06-08 | 3 | -5/+20 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | tweak changelog v0.31.1 github/release-v0.31.1 release-v0.31.1 | Neil Johnson | 2018-06-08 | 1 | -2/+4 |
| | * | | | | | Update CHANGES.rst | Neil Johnson | 2018-06-08 | 1 | -1/+1 |
| | * | | | | | changelog a bump version | Neil Johnson | 2018-06-08 | 2 | -1/+11 |
| | | |_|/ / | | |/| | | | |||||
| | * | | | | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
| | * | | | | fix various changelog bugs and typos | Matthew Hodgson | 2018-06-08 | 1 | -4/+3 |
* | | | | | | Merge pull request #3372 from matrix-org/rav/better_verification_logging | David Baker | 2018-06-08 | 1 | -6/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Try to log more helpful info when a sig verification fails | Richard van der Hoff | 2018-06-08 | 1 | -6/+25 |
* | | | | | | | Merge pull request #3371 from matrix-org/rav/fix_get_missing_events | David Baker | 2018-06-08 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
| |/ / / / / / | |||||
* / / / / / / | fix various changelog bugs and typos | Matthew Hodgson | 2018-06-07 | 1 | -4/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3344 from Half-Shot/hs/as-metrics | Will Hunt | 2018-06-07 | 1 | -0/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Let's try labels instead of label, that might work | Will Hunt | 2018-06-05 | 1 | -3/+3 |
| * | | | | | | Add metrics to track appservice transactions | Will Hunt | 2018-06-05 | 1 | -0/+22 |
* | | | | | | | Merge pull request #3363 from matrix-org/rav/fix_purge | Richard van der Hoff | 2018-06-07 | 1 | -7/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix log | Richard van der Hoff | 2018-06-07 | 1 | -1/+1 |
| * | | | | | | | Fix event-purge-by-ts admin API | Richard van der Hoff | 2018-06-07 | 1 | -6/+4 |
* | | | | | | | | Merge pull request #3355 from matrix-org/rav/fix_federation_backfill | Richard van der Hoff | 2018-06-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix sql error in _get_state_groups_from_groups | Richard van der Hoff | 2018-06-06 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #3356 from matrix-org/rav/add_missing_attr_dep | Amber Brown | 2018-06-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add missing dependency on attr | Richard van der Hoff | 2018-06-06 | 1 | -0/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-06-06 | 2 | -1/+59 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge tag 'v0.31.0' | Neil Johnson | 2018-06-06 | 113 | -1642/+1426 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | 7 char sha in changelog v0.31.0 github/release-v0.31.0 release-v0.31.0 | Neil Johnson | 2018-06-06 | 1 | -3/+3 |
| | * | | | | | | Update CHANGES.rst | Neil Johnson | 2018-06-06 | 1 | -4/+4 |
| | * | | | | | | bump version and changelog | Neil Johnson | 2018-06-06 | 2 | -3/+12 |
| | * | | | | | | Fix metric documentation tables (#3341) | Amber Brown | 2018-06-06 | 1 | -20/+30 |
| | * | | | | | | Add note to changelog on prometheus metrics | Richard van der Hoff | 2018-06-06 | 1 | -1/+4 |
| | * | | | | | | Merge commit 'b7e7fd2' into release-v0.31.0 | Richard van der Hoff | 2018-06-06 | 2 | -5/+8 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | bump version and changelog v0.31.0-rc1 | Neil Johnson | 2018-06-04 | 2 | -1/+47 |
* | | | | | | | | | Merge pull request #3349 from t3chguy/redact_as_request_token | Richard van der Hoff | 2018-06-06 | 2 | -3/+7 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | also redact __str__ of ApplicationService used for logging | Michael Telatynski | 2018-06-06 | 1 | -1/+5 |
| * | | | | | | | | redact_uri in two missed log paths | Michael Telatynski | 2018-06-06 | 1 | -2/+2 |
* | | | | | | | | | Merge pull request #3347 from krombel/py3_extend_tox_2 | Amber Brown | 2018-06-06 | 1 | -11/+19 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | update tox.ini to cover 292 succeeding tests | Krombel | 2018-06-05 | 1 | -11/+19 |
* | | | | | | | | | | Merge pull request #3348 from intelfx/fix-sortedcontainers | Amber Brown | 2018-06-06 | 1 | -27/+22 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | federation/send_queue.py: fix usage of sortedcontainers.SortedDict | Ivan Shapovalov | 2018-06-06 | 1 | -27/+22 |
| |/ / / / / / / / / | |||||
* / / / / / / / / / | Fix metric documentation tables (#3341) | Amber Brown | 2018-06-06 | 1 | -20/+30 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #3327 from t3chguy/redact_as_request_token | Richard van der Hoff | 2018-06-05 | 3 | -9/+18 |
|\| | | | | | | | | |||||
| * | | | | | | | | factor out uri redaction into a method on http | Michael Telatynski | 2018-06-05 | 3 | -13/+17 |
| * | | | | | | | | Strip `access_token` from outgoing requests using existing regex | Michael Telatynski | 2018-06-02 | 1 | -1/+6 |
* | | | | | | | | | Merge pull request #3340 from ArchangeGabriel/patch-1 | Richard van der Hoff | 2018-06-05 | 1 | -9/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc/postgres.rest: fix displaying of the last command block | Bruno Pagani | 2018-06-04 | 1 | -9/+9 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2018-06-05 | 1 | -0/+3 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3290 from rubo77/patch-7 | Richard van der Hoff | 2018-05-30 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | remove trailing whitespace | Richard van der Hoff | 2018-05-30 | 1 | -2/+2 |
| | * | | | | | | | | fix english and wrap comment | Richard van der Hoff | 2018-05-30 | 1 | -1/+2 |
| | * | | | | | | | | add link to thorough instruction how to configure consent | Ruben Barkow | 2018-05-25 | 1 | -0/+2 |
| |/ / / / / / / / | |||||
* | | | | / / / / | Port to sortedcontainers (with tests!) (#3332) | Amber Brown | 2018-06-06 | 6 | -35/+241 |
| |_|_|_|/ / / / |/| | | | | | | |