summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge pull request #3449 from matrix-org/dbkr/fix_deactivate_account_multiple...Matthew Hodgson2018-06-261-1/+3
| |\ \ \ \
| | * | | | Fix error on deleting users pending deactivationDavid Baker2018-06-261-1/+3
| |/ / / /
| * | | | Merge pull request #3448 from matrix-org/matthew/gdpr-deactivate-admin-apiMatthew Hodgson2018-06-263-3/+28
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | update doc for deactivate APIMatthew Hodgson2018-06-262-3/+16
| | * | | add GDPR erase param to deactivate APIMatthew Hodgson2018-06-262-1/+13
| * | | | Merge pull request #3438 from turt2live/travis/dont-print-access-tokens-in-logsAmber Brown2018-06-261-2/+2
| |\ \ \ \
| | * | | | Don't print invalid access tokens in the logsTravis Ralston2018-06-241-2/+2
| * | | | | Merge pull request #3442 from matrix-org/matthew/allow-unconsented-partsErik Johnston2018-06-251-2/+6
| |\ \ \ \ \
| | * | | | | allow non-consented users to still part rooms (to let us autopart them)Matthew Hodgson2018-06-251-2/+6
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #3443 from matrix-org/erikj/fast_filter_serversErik Johnston2018-06-251-0/+41
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Actually fix itErik Johnston2018-06-251-3/+3
| | * | | | CommentErik Johnston2018-06-251-0/+8
| | * | | | Fix bug with assuming wrong typeErik Johnston2018-06-251-2/+2
| | * | | | Add fast path to _filter_events_for_serverErik Johnston2018-06-251-1/+34
| |/ / / /
| * | | | typosMatthew Hodgson2018-06-251-1/+1
| * | | | typoMatthew Hodgson2018-06-251-1/+1
| * | | | Need to pass reactor to endpoint facErik Johnston2018-06-251-1/+1
| * | | | Use towncrier to build the changelog (#3425)Amber Brown2018-06-2520-1/+55
| * | | | Merge pull request #3441 from matrix-org/erikj/redo_erasureErik Johnston2018-06-259-26/+216
| |\ \ \ \
| | * | | | Add UserErasureWorkerStore to workersErik Johnston2018-06-251-0/+2
| | * | | | Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili...Erik Johnston2018-06-258-26/+214
| | |/ / /
| * / / / Remove all global reactor imports & pass it around explicitly (#3424)Amber Brown2018-06-259-22/+29
| |/ / /
| * | | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility"Richard van der Hoff2018-06-228-214/+26
| * | | Merge pull request #3435 from matrix-org/rav/fix_event_push_actions_tablescanRichard van der Hoff2018-06-221-1/+8
| |\ \ \
| | * | | Deleting from event_push_actions needs to use an indexMark Haines2018-06-221-1/+8
| * | | | Merge pull request #3434 from matrix-org/rav/search_loggingRichard van der Hoff2018-06-221-0/+14
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Also log number of events for serach contextErik Johnston2018-06-221-0/+5
| | * | | Add some logging to search queriesErik Johnston2018-06-221-0/+9
| |/ / /
| * | | Merge pull request #3432 from matrix-org/rav/joined_hosts_cache_non_iterableRichard van der Hoff2018-06-221-1/+1
| |\ \ \
| | * | | Make _get_joined_hosts_cache cache non-iterableErik Johnston2018-06-221-1/+1
| * | | | Merge pull request #3430 from matrix-org/rav/configurable_push_action_rotationRichard van der Hoff2018-06-221-3/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make push actions rotation configurableErik Johnston2018-06-221-3/+5
| * | | | Merge pull request #3431 from matrix-org/rav/erasure_visibilityErik Johnston2018-06-228-26/+214
| |\ \ \ \
| | * | | | Filter out erased messagesRichard van der Hoff2018-06-122-22/+68
| | * | | | mark accounts as erased when requestedRichard van der Hoff2018-06-123-4/+20
| | * | | | UserErasureStoreRichard van der Hoff2018-06-123-0/+126
| * | | | | Merge pull request #3428 from matrix-org/erikj/persisted_pduErik Johnston2018-06-222-30/+27
| |\| | | |
| | * | | | simplify get_persisted_pduRichard van der Hoff2018-06-122-30/+27
| * | | | | Merge pull request #3427 from matrix-org/erikj/remove_filtersErik Johnston2018-06-223-92/+35
| |\| | | | | | |/ / / | |/| | |
| | * | | remove dead filter_events_for_clientsRichard van der Hoff2018-06-123-92/+35
| * | | | Merge pull request #3383 from matrix-org/rav/hacky_speedup_state_group_cacheRichard van der Hoff2018-06-223-32/+61
| |\ \ \ \
| | * | | | Disable partial state group caching for wildcard lookupsRichard van der Hoff2018-06-223-32/+61
| |/ / / /
| * | | | Merge pull request #3382 from matrix-org/rav/optimise_state_groupsRichard van der Hoff2018-06-221-5/+1
| |\ \ \ \
| | * | | | Optimise state_group_cache updateRichard van der Hoff2018-06-111-5/+1
| * | | | | Merge pull request #3419 from matrix-org/rav/events_per_requestRichard van der Hoff2018-06-223-1/+23
| |\ \ \ \ \
| | * | | | | Indirect evt_count updates via method callRichard van der Hoff2018-06-222-1/+12
| | * | | | | Log number of events fetched from DBRichard van der Hoff2018-06-213-1/+12
| * | | | | | Merge pull request #3418 from matrix-org/rav/fix_metric_descAmber Brown2018-06-221-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix description of "python_gc_time" metricRichard van der Hoff2018-06-211-1/+1
| * | | | | | | Pass around the reactor explicitly (#3385)Amber Brown2018-06-2225-93/+141
| * | | | | | | Populate synapse_federation_client_sent_pdu_destinations:count again (#3386)Amber Brown2018-06-211-3/+7
| * | | | | | | Fix tcp protocol metrics naming (#3410)Amber Brown2018-06-211-18/+35
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #3416 from matrix-org/rav/restart_indicatorRichard van der Hoff2018-06-202-12/+19
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Write a clear restart indicator in logsRichard van der Hoff2018-06-202-12/+19
| * | | | | | Merge pull request #3399 from costacruise/masterRichard van der Hoff2018-06-201-2/+6
| |\ \ \ \ \ \
| | * | | | | | Add error code to room creation errorMichael Wagner2018-06-141-2/+6
| * | | | | | | Fix inflight requests metric (incorrect name & traceback) (#3413)Amber Brown2018-06-201-3/+7
| | |/ / / / / | |/| | | | |
| * | | | | | spell gauge correctlyMatthew Hodgson2018-06-161-1/+1
| * | | | | | Merge branch 'master' into developRichard van der Hoff2018-06-146-47/+243
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge tag 'v0.31.2'Richard van der Hoff2018-06-146-47/+243
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | link to spec proposal from changelog v0.31.2 github/release-v0.31.2 release-v0.31.2Richard van der Hoff2018-06-141-0/+3
| | | * | | | | v0.31.2Richard van der Hoff2018-06-141-1/+2
| | | * | | | | changelog for 0.31.2Richard van der Hoff2018-06-141-0/+6
| | | * | | | | Merge pull request #3397 from matrix-org/rav/adjust_auth_rulesRichard van der Hoff2018-06-144-46/+232
| | | |\ \ \ \ \
| | | | * | | | | Fix broken unit testRichard van der Hoff2018-06-141-2/+14
| | | | * | | | | remove spurious debugRichard van der Hoff2018-06-141-2/+0
| | | | * | | | | Make default state_default 50Richard van der Hoff2018-06-142-20/+167
| | | | * | | | | Clarify interface for event_authRichard van der Hoff2018-06-141-18/+16
| | | | * | | | | Refactor get_send_level to take a power_levels eventRichard van der Hoff2018-06-142-8/+39
| | | | |/ / / /
| * | | | | | | add a last seen metric (#3396)Amber Brown2018-06-141-0/+21
| * | | | | | | Remove run_on_reactor (#3395)Amber Brown2018-06-1413-63/+6
| * | | | | | | Merge pull request #3368 from matrix-org/rav/fix_federation_client_hostRichard van der Hoff2018-06-131-14/+51
| |\ \ \ \ \ \ \
| | * | | | | | | Fix federation_client to send the right HostRichard van der Hoff2018-06-121-14/+51
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #3389 from turt2live/travis/name_metricsAmber Brown2018-06-1311-11/+11
| |\ \ \ \ \ \ \
| | * | | | | | | The flag is named enable_metrics, not collect_metricsTravis Ralston2018-06-1211-11/+11
| | |/ / / / / /
| * | | | | | | Merge pull request #3390 from turt2live/travis/appsvc-metricsAmber Brown2018-06-131-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Use the RegistryProxy for appservices tooTravis Ralston2018-06-121-1/+2
| |/ / / / / /
| * | | | | | Merge pull request #3276 from matrix-org/dbkr/unbindDavid Baker2018-06-116-16/+115
| |\ \ \ \ \ \
| | * | | | | | pep8David Baker2018-06-061-3/+3
| | * | | | | | More doc fixesDavid Baker2018-06-061-2/+2
| | * | | | | | fix pep8David Baker2018-06-051-3/+5
| | * | | | | | doc fixesDavid Baker2018-06-052-7/+7
| | * | | | | | DocstringDavid Baker2018-06-041-0/+14
| | * | | | | | Fix commentDavid Baker2018-06-041-1/+1
| | * | | | | | Missing yieldDavid Baker2018-06-041-1/+1
| | * | | | | | docstringDavid Baker2018-06-041-1/+9
| | * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/unbindDavid Baker2018-05-2424-74/+485
| | |\ \ \ \ \ \
| | * | | | | | | pep8David Baker2018-05-244-8/+13
| | * | | | | | | commentDavid Baker2018-05-241-0/+4
| | * | | | | | | Unbind 3pids when they're deleted tooDavid Baker2018-05-242-3/+18
| | * | | | | | | Hit the 3pid unbind endpoint on deactivationDavid Baker2018-05-234-12/+63
| * | | | | | | | fix idiotic typo in state resMatthew Hodgson2018-06-111-2/+2
| | | | | | | * | Enforce the specified API for report_eventRichard van der Hoff2018-05-311-2/+23
* | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-1028-178/+531
|\| | | | | | | |
| * | | | | | | | Merge branch 'master' into developNeil Johnson2018-06-082-1/+13
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge tag 'v0.31.1'Neil Johnson2018-06-083-5/+20
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | tweak changelog v0.31.1 github/release-v0.31.1 release-v0.31.1Neil Johnson2018-06-081-2/+4
| | | * | | | | | Update CHANGES.rstNeil Johnson2018-06-081-1/+1
| | | * | | | | | changelog a bump versionNeil Johnson2018-06-082-1/+11
| | | | |_|/ / / | | | |/| | | |
| | | * | | | | Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
| | | * | | | | fix various changelog bugs and typosMatthew Hodgson2018-06-081-4/+3
| * | | | | | | Merge pull request #3372 from matrix-org/rav/better_verification_loggingDavid Baker2018-06-081-6/+25
| |\ \ \ \ \ \ \
| | * | | | | | | Try to log more helpful info when a sig verification failsRichard van der Hoff2018-06-081-6/+25
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #3371 from matrix-org/rav/fix_get_missing_eventsDavid Baker2018-06-081-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
| | |/ / / / / /
| * / / / / / / fix various changelog bugs and typosMatthew Hodgson2018-06-071-4/+3
| |/ / / / / /
| * | | | | | Merge pull request #3344 from Half-Shot/hs/as-metricsWill Hunt2018-06-071-0/+22
| |\ \ \ \ \ \
| | * | | | | | Let's try labels instead of label, that might workWill Hunt2018-06-051-3/+3
| | * | | | | | Add metrics to track appservice transactionsWill Hunt2018-06-051-0/+22
| * | | | | | | Merge pull request #3363 from matrix-org/rav/fix_purgeRichard van der Hoff2018-06-071-7/+5
| |\ \ \ \ \ \ \
| | * | | | | | | fix logRichard van der Hoff2018-06-071-1/+1
| | * | | | | | | Fix event-purge-by-ts admin APIRichard van der Hoff2018-06-071-6/+4
| * | | | | | | | Merge pull request #3355 from matrix-org/rav/fix_federation_backfillRichard van der Hoff2018-06-071-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix sql error in _get_state_groups_from_groupsRichard van der Hoff2018-06-061-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge pull request #3356 from matrix-org/rav/add_missing_attr_depAmber Brown2018-06-071-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add missing dependency on attrRichard van der Hoff2018-06-061-0/+1
| | |/ / / / / / /
| * | | | | | | | Merge branch 'master' into developNeil Johnson2018-06-062-1/+59
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge tag 'v0.31.0'Neil Johnson2018-06-06113-1642/+1426
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | 7 char sha in changelog v0.31.0 github/release-v0.31.0 release-v0.31.0Neil Johnson2018-06-061-3/+3
| | | * | | | | | Update CHANGES.rstNeil Johnson2018-06-061-4/+4
| | | * | | | | | bump version and changelogNeil Johnson2018-06-062-3/+12
| | | * | | | | | Fix metric documentation tables (#3341)Amber Brown2018-06-061-20/+30
| | | * | | | | | Add note to changelog on prometheus metricsRichard van der Hoff2018-06-061-1/+4
| | | * | | | | | Merge commit 'b7e7fd2' into release-v0.31.0Richard van der Hoff2018-06-062-5/+8
| | | |\ \ \ \ \ \
| | | * | | | | | | bump version and changelog v0.31.0-rc1Neil Johnson2018-06-042-1/+47
| * | | | | | | | | Merge pull request #3349 from t3chguy/redact_as_request_tokenRichard van der Hoff2018-06-062-3/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | also redact __str__ of ApplicationService used for loggingMichael Telatynski2018-06-061-1/+5
| | * | | | | | | | redact_uri in two missed log pathsMichael Telatynski2018-06-061-2/+2
| * | | | | | | | | Merge pull request #3347 from krombel/py3_extend_tox_2Amber Brown2018-06-061-11/+19
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | update tox.ini to cover 292 succeeding testsKrombel2018-06-051-11/+19
| * | | | | | | | | | Merge pull request #3348 from intelfx/fix-sortedcontainersAmber Brown2018-06-061-27/+22
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | federation/send_queue.py: fix usage of sortedcontainers.SortedDictIvan Shapovalov2018-06-061-27/+22
| | |/ / / / / / / / /
| * / / / / / / / / / Fix metric documentation tables (#3341)Amber Brown2018-06-061-20/+30
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3327 from t3chguy/redact_as_request_tokenRichard van der Hoff2018-06-053-9/+18
| |\| | | | | | | |
| | * | | | | | | | factor out uri redaction into a method on httpMichael Telatynski2018-06-053-13/+17
| | * | | | | | | | Strip `access_token` from outgoing requests using existing regexMichael Telatynski2018-06-021-1/+6
| * | | | | | | | | Merge pull request #3340 from ArchangeGabriel/patch-1Richard van der Hoff2018-06-051-9/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | doc/postgres.rest: fix displaying of the last command blockBruno Pagani2018-06-041-9/+9
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2018-06-051-0/+3
| |\| | | | | | | |
| | * | | | | | | | Merge pull request #3290 from rubo77/patch-7Richard van der Hoff2018-05-301-0/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | remove trailing whitespaceRichard van der Hoff2018-05-301-2/+2
| | | * | | | | | | | fix english and wrap commentRichard van der Hoff2018-05-301-1/+2
| | | * | | | | | | | add link to thorough instruction how to configure consentRuben Barkow2018-05-251-0/+2
| | |/ / / / / / / /
| * | | | | / / / / Port to sortedcontainers (with tests!) (#3332)Amber Brown2018-06-066-35/+241
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3324 from matrix-org/rav/remove_dead_methodRichard van der Hoff2018-06-041-26/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove was_forgotten_atRichard van der Hoff2018-06-011-26/+0
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #3334 from matrix-org/rav/cache_factor_overrideRichard van der Hoff2018-06-044-4/+18
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Add hacky cache factor override systemErik Johnston2018-06-044-4/+18
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Fix replication metricsRichard van der Hoff2018-06-041-2/+2
| * | | | | | | Hopefully, fix LaterGuage error handlingRichard van der Hoff2018-06-041-3/+6
| |/ / / / / /
| * | | | | | Put python's logs into Trial when running unit tests (#3319)Amber Brown2018-06-041-13/+27
| * | | | | | Merge pull request #3328 from intelfx/fix-metrics-LaterGauge-usageAmber Brown2018-06-041-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | federation/send_queue.py: fix usage of LaterGaugeIvan Shapovalov2018-06-031-1/+1
| |/ / / / /
* | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-0459-181/+496
|\| | | | |
| * | | | | Merge pull request #3317 from thegcat/feature/3312-add_ipv6_to_blacklist_exam...Richard van der Hoff2018-06-011-0/+3
| |\ \ \ \ \
| | * | | | | Add private IPv6 addresses to preview blacklist #3312Felix Schäfer2018-06-011-0/+3
| * | | | | | Merge pull request #3264 from matrix-org/neil/sign-up-statsNeil Johnson2018-06-014-1/+60
| |\ \ \ \ \ \
| | * | | | | | remove unnecessary INSERTNeil Johnson2018-06-011-1/+0
| | * | | | | | create users index on creation_tsNeil Johnson2018-05-291-0/+20
| | * | | | | | create index in backgroundNeil Johnson2018-05-291-0/+7
| | * | | | | | bump versionNeil Johnson2018-05-291-1/+1
| | * | | | | | daily user type phone home statsNeil Johnson2018-05-222-0/+33
| * | | | | | | Merge pull request #3318 from matrix-org/rav/ignore_depth_on_rrsRichard van der Hoff2018-06-011-29/+30
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Handle RRs which arrive before their eventsRichard van der Hoff2018-06-011-25/+19
| | * | | | | | Ignore depth when updating read-receiptsRichard van der Hoff2018-06-011-30/+37
| |/ / / / / /
| * | | | | | code_style.rst: formattingRichard van der Hoff2018-05-311-1/+1
| * | | | | | Run Prometheus on a different port, optionally. (#3274)Amber Brown2018-05-3116-26/+192
| * | | | | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'...Amber Brown2018-05-3129-101/+116
| * | | | | | Merge pull request #3303 from NotAFile/py3-memoryviewAmber Brown2018-05-303-6/+30
| |\ \ \ \ \ \
| | * | | | | | add remaining memoryview changesAdrian Tschira2018-05-292-4/+12
| | * | | | | | use memoryview in py3Adrian Tschira2018-05-292-2/+18
| * | | | | | | Merge pull request #3281 from NotAFile/py3-six-isinstanceAmber Brown2018-05-303-13/+18
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | pep8Adrian Tschira2018-05-291-0/+1
| | * | | | | | fix recursion errorAdrian Tschira2018-05-241-7/+5
| | * | | | | | remaining isintance fixesAdrian Tschira2018-05-243-8/+14
| * | | | | | | Update some comments and docstrings in SyncHandlerRichard van der Hoff2018-05-291-1/+11
| * | | | | | | Merge pull request #3304 from matrix-org/rav/exempt_as_users_from_gdprRichard van der Hoff2018-05-293-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | fix testsRichard van der Hoff2018-05-291-0/+1
| | * | | | | | | Exempt AS-registered users from doing gdprRichard van der Hoff2018-05-292-0/+4
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #3302 from krombel/py3_extend_tox_testingRichard van der Hoff2018-05-291-1/+28
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | extend tox testing for py3 to avoid regressionsKrombel2018-05-291-1/+28
| |/ / / / / /
| * | | | | | Merge pull request #3299 from matrix-org/matthew/macos-fixesAmber Brown2018-05-291-0/+4
| |\ \ \ \ \ \
| | * | | | | | pep8Matthew Hodgson2018-05-291-0/+1
| | * | | | | | disable CPUMetrics if no /proc/self/statMatthew Hodgson2018-05-291-0/+3
| * | | | | | | fix another dumb typoMatthew Hodgson2018-05-291-2/+2
| |/ / / / / /
| * | | | | | fix dumb typoMatthew Hodgson2018-05-291-4/+4
* | | | | | | more commentsMatthew Hodgson2018-06-041-0/+7
* | | | | | | add lazy_load_members to the filter json schemaMatthew Hodgson2018-05-291-1/+4
* | | | | | | pep8Matthew Hodgson2018-05-291-0/+1
* | | | | | | disable CPUMetrics if no /proc/self/statMatthew Hodgson2018-05-291-0/+3
* | | | | | | fix dumb typoMatthew Hodgson2018-05-291-4/+4
* | | | | | | add pydocMatthew Hodgson2018-05-292-27/+67
* | | | | | | merge developMatthew Hodgson2018-05-29242-3342/+7386
|\| | | | | |
| * | | | | | Merge pull request #3256 from matrix-org/3218-official-promAmber Brown2018-05-2840-1311/+575
| |\ \ \ \ \ \
| | * | | | | | fix up testsAmber Brown2018-05-281-3/+3
| | * | | | | | update to more consistently use seconds in any metrics or loggingAmber Brown2018-05-284-38/+38
| | * | | | | | invalid syntax :(Amber Brown2018-05-281-2/+1
| | * | | | | | add comment about why unregAmber Brown2018-05-281-0/+2
| | * | | | | | update metrics to be in secondsAmber Brown2018-05-284-37/+38
| | * | | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-2847-197/+686
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3288 from matrix-org/rav/no_spam_guestsRichard van der Hoff2018-05-252-1/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Fix default for send_server_notice_to_guestsRichard van der Hoff2018-05-251-1/+1
| | * | | | | | | Avoid sending consent notice to guest usersRichard van der Hoff2018-05-252-1/+12
| |/ / / / / / /
| * | | | | | | Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_roomRichard van der Hoff2018-05-252-12/+19
| |\ \ \ \ \ \ \
| | * | | | | | | Let users leave the server notice room after joiningRichard van der Hoff2018-05-252-12/+19
| * | | | | | | | Merge pull request #3283 from NotAFile/py3-stateAmber Brown2018-05-241-23/+25
| |\ \ \ \ \ \ \ \
| | * | | | | | | | py3-ize state.pyAdrian Tschira2018-05-241-23/+25
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #3279 from NotAFile/py3-more-iteritemsAmber Brown2018-05-241-4/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | more iteritemsAdrian Tschira2018-05-241-4/+6
| | |/ / / / / / /
| * | | | | | | | Merge pull request #3280 from NotAFile/py3-more-miscAmber Brown2018-05-245-11/+13
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Misc. py3 fixesAdrian Tschira2018-05-245-11/+13
| |/ / / / / / /
| * | | | | | | Merge pull request #3278 from NotAFile/py3-storage-baseAmber Brown2018-05-241-17/+22
| |\ \ \ \ \ \ \
| | * | | | | | | Py3 storage/_base.pyAdrian Tschira2018-05-241-17/+22
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #3244 from NotAFile/py3-six-4Amber Brown2018-05-2415-49/+69
| |\ \ \ \ \ \ \
| | * | | | | | | replace some iteritems with sixAdrian Tschira2018-05-1915-49/+69
| * | | | | | | | Merge pull request #3246 from NotAFile/py3-repr-stringAmber Brown2018-05-241-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | use repr, not strAdrian Tschira2018-05-191-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge pull request #3247 from NotAFile/py3-miscAmber Brown2018-05-243-5/+18
| |\ \ \ \ \ \ \ \
| | * | | | | | | | use stand-in value if maxint is not availableAdrian Tschira2018-05-191-1/+7
| | * | | | | | | | fix py3 intern and remove unnecessary py3 encodeAdrian Tschira2018-05-191-1/+6
| | * | | | | | | | py3-ize url previewAdrian Tschira2018-05-191-3/+5
| | |/ / / / / / /
| * | | | | | | | Merge pull request #3245 from NotAFile/batch-iterAmber Brown2018-05-241-0/+18
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Add batch_iter to utilsAdrian Tschira2018-05-191-0/+18
| | |/ / / / / /
| * | | | | | | Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dirDavid Baker2018-05-242-0/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Remove users from user directory on deactivateDavid Baker2018-05-242-0/+11
| * | | | | | | | Merge pull request #3243 from NotAFile/py3-six-3Erik Johnston2018-05-246-11/+23
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Replace some more comparisons with sixAdrian Tschira2018-05-196-11/+23
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into developNeil Johnson2018-05-242-5/+24
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Update CHANGES.rst v0.30.0 github/release-v0.30.0 release-v0.30.0Neil Johnson2018-05-241-5/+5
| | * | | | | | Update CHANGES.rstNeil Johnson2018-05-241-1/+1
| | * | | | | | update for v0.30.0Neil Johnson2018-05-241-4/+23
| | * | | | | | bump versionNeil Johnson2018-05-241-1/+1
| * | | | | | | Merge pull request #3261 from matrix-org/erikj/pagination_fixesErik Johnston2018-05-241-9/+22
| |\ \ \ \ \ \ \
| | * | | | | | | Use iter* methodsErik Johnston2018-05-221-7/+7
| | * | | | | | | Fix that states is a dict of dictsErik Johnston2018-05-221-1/+4
| | * | | | | | | get_domains_from_state returns list of tuplesErik Johnston2018-05-221-2/+12
| * | | | | | | | Merge pull request #3267 from matrix-org/erikj/iter_filterErik Johnston2018-05-241-5/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | s/values/itervalues/Erik Johnston2018-05-231-1/+1
| | * | | | | | | Use iter* methods for _filter_events_for_serverErik Johnston2018-05-231-4/+4
| * | | | | | | | Merge branch 'release-v0.30.0' into developRichard van der Hoff2018-05-248-19/+128
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #3273 from matrix-org/rav/server_notices_avatar_urlRichard van der Hoff2018-05-243-9/+32
| | |\ \ \ \ \ \ \
| | | * | | | | | | Allow overriding the server_notices user's avatarRichard van der Hoff2018-05-233-9/+32
| | * | | | | | | | Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uriRichard van der Hoff2018-05-231-1/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uriRichard van der Hoff2018-05-234-8/+55
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Use the localpart in the consent uriRichard van der Hoff2018-05-231-1/+3
| | * | | | | | | | | Merge docs on consent bits from PR #3268 into release branchRichard van der Hoff2018-05-234-23/+271
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #3271 from matrix-org/rav/consent_uri_in_messagesRichard van der Hoff2018-05-233-7/+50
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Support for putting %(consent_uri)s in messagesRichard van der Hoff2018-05-233-7/+50
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | fix typoRichard van der Hoff2018-05-231-1/+1
| | * | | | | | | | | Merge pull request #3270 from matrix-org/rav/block_remote_server_noticesRichard van der Hoff2018-05-231-0/+4
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-07 22:18:41 +0000