| Commit message (Expand) | Author | Age | Files | Lines |
* | allow self-signed certificates | Jeroen | 2018-06-26 | 3 | -35/+36 |
* | formatting changes for pep8 | Jeroen | 2018-06-25 | 4 | -5/+8 |
* | send SNI for federation requests | Jeroen | 2018-06-24 | 15 | -13/+71 |
* | 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 |
| |_|_|_|/ / /
|/| | | | | | |
|
* | | | | | | | Merge pull request #3324 from matrix-org/rav/remove_dead_method | Richard van der Hoff | 2018-06-04 | 1 | -26/+0 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Remove was_forgotten_at | Richard van der Hoff | 2018-06-01 | 1 | -26/+0 |
| | |/ / / / /
| |/| | | | | |
|
* | | | | | | | Merge pull request #3334 from matrix-org/rav/cache_factor_override | Richard van der Hoff | 2018-06-04 | 4 | -4/+18 |
|\ \ \ \ \ \ \
| |_|_|_|/ / /
|/| | | | | | |
|
| * | | | | | | Add hacky cache factor override system | Erik Johnston | 2018-06-04 | 4 | -4/+18 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Fix replication metrics | Richard van der Hoff | 2018-06-04 | 1 | -2/+2 |
* | | | | | | Hopefully, fix LaterGuage error handling | Richard van der Hoff | 2018-06-04 | 1 | -3/+6 |
|/ / / / / |
|
* | | | | | Put python's logs into Trial when running unit tests (#3319) | Amber Brown | 2018-06-04 | 1 | -13/+27 |
* | | | | | Merge pull request #3328 from intelfx/fix-metrics-LaterGauge-usage | Amber Brown | 2018-06-04 | 1 | -1/+1 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | federation/send_queue.py: fix usage of LaterGauge | Ivan Shapovalov | 2018-06-03 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge pull request #3317 from thegcat/feature/3312-add_ipv6_to_blacklist_exam... | Richard van der Hoff | 2018-06-01 | 1 | -0/+3 |
|\ \ \ \ |
|
| * | | | | Add private IPv6 addresses to preview blacklist #3312 | Felix Schäfer | 2018-06-01 | 1 | -0/+3 |
* | | | | | Merge pull request #3264 from matrix-org/neil/sign-up-stats | Neil Johnson | 2018-06-01 | 4 | -1/+60 |
|\ \ \ \ \ |
|
| * | | | | | remove unnecessary INSERT | Neil Johnson | 2018-06-01 | 1 | -1/+0 |
| * | | | | | create users index on creation_ts | Neil Johnson | 2018-05-29 | 1 | -0/+20 |
| * | | | | | create index in background | Neil Johnson | 2018-05-29 | 1 | -0/+7 |
| * | | | | | bump version | Neil Johnson | 2018-05-29 | 1 | -1/+1 |
| * | | | | | daily user type phone home stats | Neil Johnson | 2018-05-22 | 2 | -0/+33 |
* | | | | | | Merge pull request #3318 from matrix-org/rav/ignore_depth_on_rrs | Richard van der Hoff | 2018-06-01 | 1 | -29/+30 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Handle RRs which arrive before their events | Richard van der Hoff | 2018-06-01 | 1 | -25/+19 |
| * | | | | | Ignore depth when updating read-receipts | Richard van der Hoff | 2018-06-01 | 1 | -30/+37 |
|/ / / / / |
|
* | | | | | code_style.rst: formatting | Richard van der Hoff | 2018-05-31 | 1 | -1/+1 |
* | | | | | Run Prometheus on a different port, optionally. (#3274) | Amber Brown | 2018-05-31 | 16 | -26/+192 |
* | | | | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'... | Amber Brown | 2018-05-31 | 29 | -101/+116 |
* | | | | | Merge pull request #3303 from NotAFile/py3-memoryview | Amber Brown | 2018-05-30 | 3 | -6/+30 |
|\ \ \ \ \ |
|
| * | | | | | add remaining memoryview changes | Adrian Tschira | 2018-05-29 | 2 | -4/+12 |
| * | | | | | use memoryview in py3 | Adrian Tschira | 2018-05-29 | 2 | -2/+18 |
* | | | | | | Merge pull request #3281 from NotAFile/py3-six-isinstance | Amber Brown | 2018-05-30 | 3 | -13/+18 |
|\ \ \ \ \ \ |
|
| * | | | | | | pep8 | Adrian Tschira | 2018-05-29 | 1 | -0/+1 |
| * | | | | | | fix recursion error | Adrian Tschira | 2018-05-24 | 1 | -7/+5 |
| * | | | | | | remaining isintance fixes | Adrian Tschira | 2018-05-24 | 3 | -8/+14 |
* | | | | | | | Update some comments and docstrings in SyncHandler | Richard van der Hoff | 2018-05-29 | 1 | -1/+11 |
* | | | | | | | Merge pull request #3304 from matrix-org/rav/exempt_as_users_from_gdpr | Richard van der Hoff | 2018-05-29 | 3 | -0/+5 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | fix tests | Richard van der Hoff | 2018-05-29 | 1 | -0/+1 |
| * | | | | | | | Exempt AS-registered users from doing gdpr | Richard van der Hoff | 2018-05-29 | 2 | -0/+4 |
| | |/ / / / /
| |/| | | | | |
|
* | | | | | | | Merge pull request #3302 from krombel/py3_extend_tox_testing | Richard van der Hoff | 2018-05-29 | 1 | -1/+28 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | extend tox testing for py3 to avoid regressions | Krombel | 2018-05-29 | 1 | -1/+28 |
|/ / / / / / |
|
* | | | | | | Merge pull request #3299 from matrix-org/matthew/macos-fixes | Amber Brown | 2018-05-29 | 1 | -0/+4 |
|\ \ \ \ \ \ |
|
| * | | | | | | pep8 | Matthew Hodgson | 2018-05-29 | 1 | -0/+1 |
| * | | | | | | disable CPUMetrics if no /proc/self/stat | Matthew Hodgson | 2018-05-29 | 1 | -0/+3 |
* | | | | | | | fix another dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -2/+2 |
|/ / / / / / |
|
* | | | | | | fix dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -4/+4 |
* | | | | | | Merge pull request #3256 from matrix-org/3218-official-prom | Amber Brown | 2018-05-28 | 40 | -1311/+575 |
|\ \ \ \ \ \ |
|
| * | | | | | | fix up tests | Amber Brown | 2018-05-28 | 1 | -3/+3 |
| * | | | | | | update to more consistently use seconds in any metrics or logging | Amber Brown | 2018-05-28 | 4 | -38/+38 |
| * | | | | | | invalid syntax :( | Amber Brown | 2018-05-28 | 1 | -2/+1 |
| * | | | | | | add comment about why unreg | Amber Brown | 2018-05-28 | 1 | -0/+2 |
| * | | | | | | update metrics to be in seconds | Amber Brown | 2018-05-28 | 4 | -37/+38 |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 47 | -197/+686 |
| |\ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
* | | | | | | | Merge pull request #3288 from matrix-org/rav/no_spam_guests | Richard van der Hoff | 2018-05-25 | 2 | -1/+12 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Fix default for send_server_notice_to_guests | Richard van der Hoff | 2018-05-25 | 1 | -1/+1 |
| * | | | | | | | Avoid sending consent notice to guest users | Richard van der Hoff | 2018-05-25 | 2 | -1/+12 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_room | Richard van der Hoff | 2018-05-25 | 2 | -12/+19 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Let users leave the server notice room after joining | Richard van der Hoff | 2018-05-25 | 2 | -12/+19 |
* | | | | | | | | Merge pull request #3283 from NotAFile/py3-state | Amber Brown | 2018-05-24 | 1 | -23/+25 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | py3-ize state.py | Adrian Tschira | 2018-05-24 | 1 | -23/+25 |
| | |_|/ / / / /
| |/| | | | | | |
|
* | | | | | | | | Merge pull request #3279 from NotAFile/py3-more-iteritems | Amber Brown | 2018-05-24 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | more iteritems | Adrian Tschira | 2018-05-24 | 1 | -4/+6 |
| |/ / / / / / / |
|
* | | | | | | | | Merge pull request #3280 from NotAFile/py3-more-misc | Amber Brown | 2018-05-24 | 5 | -11/+13 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
| * | | | | | | | Misc. py3 fixes | Adrian Tschira | 2018-05-24 | 5 | -11/+13 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #3278 from NotAFile/py3-storage-base | Amber Brown | 2018-05-24 | 1 | -17/+22 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Py3 storage/_base.py | Adrian Tschira | 2018-05-24 | 1 | -17/+22 |
| | |_|_|_|_|/
| |/| | | | | |
|
* | | | | | | | Merge pull request #3244 from NotAFile/py3-six-4 | Amber Brown | 2018-05-24 | 15 | -49/+69 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | replace some iteritems with six | Adrian Tschira | 2018-05-19 | 15 | -49/+69 |
* | | | | | | | | Merge pull request #3246 from NotAFile/py3-repr-string | Amber Brown | 2018-05-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | use repr, not str | Adrian Tschira | 2018-05-19 | 1 | -1/+1 |
| |/ / / / / / / |
|
* | | | | | | | | Merge pull request #3247 from NotAFile/py3-misc | Amber Brown | 2018-05-24 | 3 | -5/+18 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | use stand-in value if maxint is not available | Adrian Tschira | 2018-05-19 | 1 | -1/+7 |
| * | | | | | | | | fix py3 intern and remove unnecessary py3 encode | Adrian Tschira | 2018-05-19 | 1 | -1/+6 |
| * | | | | | | | | py3-ize url preview | Adrian Tschira | 2018-05-19 | 1 | -3/+5 |
| |/ / / / / / / |
|
* | | | | | | | | Merge pull request #3245 from NotAFile/batch-iter | Amber Brown | 2018-05-24 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
| * | | | | | | | Add batch_iter to utils | Adrian Tschira | 2018-05-19 | 1 | -0/+18 |
| |/ / / / / / |
|
* | | | | | | | Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir | David Baker | 2018-05-24 | 2 | -0/+11 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Remove users from user directory on deactivate | David Baker | 2018-05-24 | 2 | -0/+11 |
* | | | | | | | | Merge pull request #3243 from NotAFile/py3-six-3 | Erik Johnston | 2018-05-24 | 6 | -11/+23 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Replace some more comparisons with six | Adrian Tschira | 2018-05-19 | 6 | -11/+23 |
| | |/ / / / / /
| |/| | | | | | |
|
* | | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-05-24 | 2 | -5/+24 |
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | / /
| | |_|_|_|/ /
| |/| | | | | |
|
| * | | | | | | Update CHANGES.rst v0.30.0 github/release-v0.30.0 release-v0.30.0 | Neil Johnson | 2018-05-24 | 1 | -5/+5 |
| * | | | | | | Update CHANGES.rst | Neil Johnson | 2018-05-24 | 1 | -1/+1 |
| * | | | | | | update for v0.30.0 | Neil Johnson | 2018-05-24 | 1 | -4/+23 |
| * | | | | | | bump version | Neil Johnson | 2018-05-24 | 1 | -1/+1 |
* | | | | | | | Merge pull request #3261 from matrix-org/erikj/pagination_fixes | Erik Johnston | 2018-05-24 | 1 | -9/+22 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Use iter* methods | Erik Johnston | 2018-05-22 | 1 | -7/+7 |
| * | | | | | | | Fix that states is a dict of dicts | Erik Johnston | 2018-05-22 | 1 | -1/+4 |
| * | | | | | | | get_domains_from_state returns list of tuples | Erik Johnston | 2018-05-22 | 1 | -2/+12 |
* | | | | | | | | Merge pull request #3267 from matrix-org/erikj/iter_filter | Erik Johnston | 2018-05-24 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \
| |_|_|_|/ / / /
|/| | | | | | | |
|
| * | | | | | | | s/values/itervalues/ | Erik Johnston | 2018-05-23 | 1 | -1/+1 |
| * | | | | | | | Use iter* methods for _filter_events_for_server | Erik Johnston | 2018-05-23 | 1 | -4/+4 |
* | | | | | | | | Merge branch 'release-v0.30.0' into develop | Richard van der Hoff | 2018-05-24 | 8 | -19/+128 |
|\ \ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | | |
|
| * | | | | | | | Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url | Richard van der Hoff | 2018-05-24 | 3 | -9/+32 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Allow overriding the server_notices user's avatar | Richard van der Hoff | 2018-05-23 | 3 | -9/+32 |
| * | | | | | | | | Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | | |
|
| | * | | | | | | | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 4 | -8/+55 |
| | |\ \ \ \ \ \ \ |
|
| | * | | | | | | | | Use the localpart in the consent uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
| * | | | | | | | | | Merge docs on consent bits from PR #3268 into release branch | Richard van der Hoff | 2018-05-23 | 4 | -23/+271 |
| |\ \ \ \ \ \ \ \ \
| | |_|/ / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages | Richard van der Hoff | 2018-05-23 | 3 | -7/+50 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Support for putting %(consent_uri)s in messages | Richard van der Hoff | 2018-05-23 | 3 | -7/+50 |
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| * | | | | | | | | | fix typo | Richard van der Hoff | 2018-05-23 | 1 | -1/+1 |
| * | | | | | | | | | Merge pull request #3270 from matrix-org/rav/block_remote_server_notices | Richard van der Hoff | 2018-05-23 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| | * | | | | | | | | Block attempts to send server notices to remote users | Richard van der Hoff | 2018-05-23 | 1 | -0/+4 |
| |/ / / / / / / / |
|
| * | | | | | | | | style v0.30.0-rc1 | Neil Johnson | 2018-05-23 | 1 | -3/+4 |
| * | | | | | | | | bump version and changelog | Neil Johnson | 2018-05-23 | 2 | -1/+37 |
| | |/ / / / / /
| |/| | | | | | |
|
* | | | | | | | | Merge pull request #3268 from matrix-org/rav/privacy_policy_docs | Richard van der Hoff | 2018-05-23 | 4 | -23/+271 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| / / / / / /
| |/ / / / / / |
|
| * | | | | | | consent_tracking.md: clarify link | Richard van der Hoff | 2018-05-23 | 1 | -1/+1 |
| * | | | | | | minor post-review tweaks | Richard van der Hoff | 2018-05-23 | 2 | -5/+5 |
| * | | | | | | mention public_baseurl | Richard van der Hoff | 2018-05-23 | 1 | -0/+9 |
| * | | | | | | fix wrapping | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
| * | | | | | | Using the manhole to send server notices | Richard van der Hoff | 2018-05-23 | 1 | -0/+13 |
| * | | | | | | Notes on the manhole | Richard van der Hoff | 2018-05-23 | 1 | -0/+43 |
| * | | | | | | consent_tracking: formatting etc | Richard van der Hoff | 2018-05-23 | 1 | -8/+7 |
| * | | | | | | server_notices.md: fix link | Richard van der Hoff | 2018-05-23 | 1 | -2/+2 |
| * | | | | | | consent tracking docs | Richard van der Hoff | 2018-05-23 | 3 | -25/+154 |
| * | | | | | | Some docs about server notices | Richard van der Hoff | 2018-05-23 | 1 | -0/+53 |
|/ / / / / / |
|
* | | | | | | Merge pull request #3265 from matrix-org/erikj/limit_pagination | Erik Johnston | 2018-05-22 | 1 | -9/+6 |
|\ \ \ \ \ \ |
|
| * | | | | | | Remove unused string formatting param | Erik Johnston | 2018-05-22 | 1 | -1/+0 |
| * | | | | | | Don't support limitless pagination | Erik Johnston | 2018-05-22 | 1 | -8/+6 |
|/ / / / / / |
|
* | | | | | | fix synchrotron | hera | 2018-05-22 | 1 | -1/+1 |
* | | | | | | custom error code for not leaving server notices room | Richard van der Hoff | 2018-05-22 | 2 | -0/+2 |
| |_|_|_|/
|/| | | | |
|
* | | | | | comment typo | David Baker | 2018-05-22 | 1 | -1/+1 |
| |_|_|/
|/| | | |
|
| | | * | pepeightttt | Amber Brown | 2018-05-23 | 1 | -0/+1 |
| | | * | add back CPU metrics | Amber Brown | 2018-05-23 | 1 | -1/+35 |
| | | * | fixes | Amber Brown | 2018-05-23 | 3 | -13/+13 |
| | | * | more cleanup | Amber Brown | 2018-05-22 | 3 | -9/+11 |
| | | * | cleanup | Amber Brown | 2018-05-22 | 9 | -29/+64 |
| | | * | cleanup pep8 errors | Amber Brown | 2018-05-22 | 5 | -37/+114 |
| | | * | tests/metrics is gone now | Amber Brown | 2018-05-22 | 1 | -1/+1 |
| | | * | fixes | Amber Brown | 2018-05-22 | 7 | -24/+52 |
| | | * | fix the test failures | Amber Brown | 2018-05-22 | 1 | -1/+1 |