summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary iteritemsErik Johnston2018-07-241-1/+1
* Fixup comment (and indent)Erik Johnston2018-07-241-16/+20
* Don't fetch state from the database unless neededErik Johnston2018-07-241-12/+18
* Have _get_new_state_after_events return deltaErik Johnston2018-07-241-17/+48
* Don't require to_delete to have event_idsErik Johnston2018-07-241-36/+55
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_c...Erik Johnston2018-07-2413-315/+408
|\
| * Merge branch 'develop' into rav/logcontext_fixesRichard van der Hoff2018-07-2410-295/+380
| |\
| | * Merge pull request #3555 from matrix-org/erikj/client_apis_moveErik Johnston2018-07-249-284/+359
| | |\
| | | * Merge branch 'develop' into erikj/client_apis_moveErik Johnston2018-07-2412-126/+305
| | | |\
| | | * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api...Erik Johnston2018-07-2333-223/+683
| | | |\ \
| | | * | | Move PaginationHandler to its own fileErik Johnston2018-07-203-245/+269
| | | * | | Move check_in_room_or_world_readable to AuthErik Johnston2018-07-202-34/+40
| | | * | | Add some room read only APIs to client_readerErik Johnston2018-07-181-1/+13
| | | * | | Move RoomContextHandler out of HandlersErik Johnston2018-07-184-6/+12
| | | * | | Split MessageHandler into read only and writersErik Johnston2018-07-185-149/+176
| | * | | | fix idiocyRichard van der Hoff2018-07-241-2/+8
| | * | | | Add some measure blocks to persist_eventsRichard van der Hoff2018-07-231-11/+15
| | | |_|/ | | |/| |
| * | | | another couple of logcontext leaksRichard van der Hoff2018-07-242-5/+10
| * | | | Logcontext fixesRichard van der Hoff2018-07-243-16/+19
| |/ / /
* | | | Remove unnecessary ifErik Johnston2018-07-241-2/+1
* | | | Speed up _calculate_state_deltaErik Johnston2018-07-241-10/+3
|/ / /
* | | CommentsErik Johnston2018-07-232-2/+6
* | | Only get cached state from context in persist_eventErik Johnston2018-07-232-1/+16
* | | Fix missing attributes on workers.Erik Johnston2018-07-233-8/+14
* | | Fix EventContext when using workersErik Johnston2018-07-231-7/+7
* | | Update docstrings to make senseErik Johnston2018-07-231-5/+8
* | | Add support for updating stateErik Johnston2018-07-232-9/+42
* | | Use new gettersErik Johnston2018-07-239-31/+59
* | | Make EventContext lazy load stateErik Johnston2018-07-232-44/+115
* | | pep8Erik Johnston2018-07-231-1/+1
* | | Refcator EventContext to accept state during initErik Johnston2018-07-232-63/+82
| |/ |/|
* | Merge branch 'develop' into matthew/sync_deleted_devicesMatthew Hodgson2018-07-2356-672/+1056
|\ \
| * | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-216-25/+32
| * | Test and fix support for cancellation in LinearizerRichard van der Hoff2018-07-201-6/+22
| * | Merge pull request #3571 from matrix-org/rav/limiter_fixesRichard van der Hoff2018-07-202-94/+39
| |\ \
| | * | Combine Limiter and LinearizerRichard van der Hoff2018-07-202-91/+12
| | * | Improvements to the LimiterRichard van der Hoff2018-07-202-14/+21
| | * | Add a sleep to the Limiter to fix stack overflows.Richard van der Hoff2018-07-201-3/+20
| * | | Admin API for creating new users (#3415)Amber Brown2018-07-203-0/+169
| |/ /
| * | Merge branch 'master' into developAmber Brown2018-07-191-1/+1
| |\ \
| | * | 0.33 finalAmber Brown2018-07-191-1/+1
| * | | Don't spew errors because we can't save metrics (#3563)Amber Brown2018-07-192-6/+24
| * | | revert 00bc979Richard van der Hoff2018-07-191-4/+3
| * | | Merge remote-tracking branch 'origin/release-v0.33.0' into developRichard van der Hoff2018-07-192-4/+5
| |\| |
| | * | Disable logcontext warningRichard van der Hoff2018-07-191-3/+4
| | * | bump to 0.33.0rc1Amber Brown2018-07-181-1/+1
| * | | Merge pull request #3556 from matrix-org/rav/background_processesRichard van der Hoff2018-07-197-52/+62
| |\ \ \
| | * | | Make Distributor run its processes as a background processRichard van der Hoff2018-07-181-26/+18
| | * | | Run things as background processesRichard van der Hoff2018-07-187-26/+44
| * | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460)Amber Brown2018-07-196-15/+88
| * | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_codeErik Johnston2018-07-191-3/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | pep8Erik Johnston2018-07-181-1/+2
| | * | | Add response code to response timer metricsErik Johnston2018-07-181-3/+5
| | | |/ | | |/|
| * | | Merge pull request #3553 from matrix-org/rav/background_process_trackingRichard van der Hoff2018-07-182-5/+186
| |\ \ \ | | |/ / | |/| |
| | * | Resource tracking for background processesRichard van der Hoff2018-07-182-5/+186
| | |/
| * | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacksRichard van der Hoff2018-07-181-43/+0
| |\ \
| | * \ Merge branch 'develop' into rav/drop_re_signing_hacksRichard van der Hoff2018-07-04101-571/+1178
| | |\ \
| | * | | Remove event re-signing hacksRichard van der Hoff2018-06-071-43/+0
| * | | | Merge pull request #3514 from matrix-org/dbkr/turn_dont_add_defaultsDavid Baker2018-07-181-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Comment dummy TURN parameters in default configDavid Baker2018-07-111-2/+2
| * | | | add a commentRichard van der Hoff2018-07-171-0/+2
| * | | | Fix visibility of events from erased users over federationRichard van der Hoff2018-07-171-56/+67
| * | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_serverRichard van der Hoff2018-07-172-138/+147
| |\ \ \ \
| | * | | | fix importsRichard van der Hoff2018-07-171-0/+1
| | * | | | add a commentRichard van der Hoff2018-07-171-0/+2
| | * | | | Attempt to make _filter_events_for_server more efficientRichard van der Hoff2018-07-161-17/+23
| | * | | | Move filter_events_for_server out of FederationHandlerRichard van der Hoff2018-07-162-138/+138
| * | | | | Refactor REST API tests to use explicit reactors (#3351)Amber Brown2018-07-172-3/+4
| * | | | | Use efficient .intersectionErik Johnston2018-07-171-4/+1
| * | | | | Fix perf regression in PR #3530Erik Johnston2018-07-171-1/+6
| * | | | | Merge pull request #3530 from matrix-org/erikj/stream_cacheAmber Brown2018-07-171-8/+1
| |\ \ \ \ \
| | * | | | | Don't return unknown entities in get_entities_changedErik Johnston2018-07-131-8/+1
| * | | | | | rerun isort with latest versionKrombel2018-07-166-20/+4
| * | | | | | check isort by travisKrombel2018-07-1611-11/+27
| * | | | | | Fix develop because I broke it :( (#3535)Amber Brown2018-07-142-2/+5
| * | | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servletAmber Brown2018-07-1417-165/+101
| |\ \ \ \ \ \
| | * | | | | | fix sytestsAmber Brown2018-07-141-1/+1
| | * | | | | | add changelogKrombel2018-07-131-1/+1
| | * | | | | | rename assert_params_in_request to assert_params_in_dictKrombel2018-07-1311-33/+33
| | * | | | | | Use parse_{int,str} and assert from http.servletKrombel2018-07-1314-155/+91
| * | | | | | | Make auth & transactions more testable (#3499)Amber Brown2018-07-148-97/+93
| |/ / / / / /
| * | | | | | Merge pull request #3533 from matrix-org/rav/fix_federation_ratelimite_queueRichard van der Hoff2018-07-131-10/+23
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Make FederationRateLimiter queue requests properlyRichard van der Hoff2018-07-131-10/+23
| | |/ / / /
| * / / / / typoMatthew Hodgson2018-07-131-3/+3
| |/ / / /
| * | | | Merge pull request #3521 from matrix-org/rav/optimise_stream_change_cacheRichard van der Hoff2018-07-121-8/+12
| |\ \ \ \
| | * | | | Reduce set building in get_entities_changedRichard van der Hoff2018-07-121-8/+12
| * | | | | Merge branch 'develop' into rav/enforce_report_apiRichard van der Hoff2018-07-12270-2247/+3387
| |\| | | |
| | * | | | Merge pull request #3505 from matrix-org/erikj/receipts_cahceErik Johnston2018-07-122-7/+20
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Update return value docstringErik Johnston2018-07-121-1/+1
| | | * | | Use 'is not None' and add commentsErik Johnston2018-07-101-2/+6
| | | * | | Use stream cache in get_linearized_receipts_for_roomErik Johnston2018-07-102-5/+14
| * | | | | Enforce the specified API for report_eventRichard van der Hoff2018-05-311-2/+23
* | | | | | add trailing commaMatthew Hodgson2018-07-231-1/+1
* | | | | | yes, we do need to invalidate the device_id_exists_cache when deleting a remo...Matthew Hodgson2018-07-191-1/+0
* | | | | | spell out that include_deleted_devices requires include_all_devicesMatthew Hodgson2018-07-191-1/+5
* | | | | | shift to using an explicit deleted flag on m.device_list_update EDUsMatthew Hodgson2018-07-122-20/+25
* | | | | | WIP to announce deleted devices over federationMatthew Hodgson2018-07-123-14/+44
| |/ / / / |/| | | |
* | | | | s/becuase/because/gMatthew Hodgson2018-07-103-4/+4
| |/ / / |/| | |
* | | | Attempt to include db threads in cpu usage stats (#3496)Richard van der Hoff2018-07-103-20/+38
* | | | Refactor logcontext resource usage tracking (#3501)Richard van der Hoff2018-07-104-130/+146
* | | | another typoMatthew Hodgson2018-07-101-1/+1
* | | | typo (i think)Matthew Hodgson2018-07-101-1/+1
* | | | Add CPU metrics for _fetch_event_listRichard van der Hoff2018-07-091-19/+32
* | | | run isortAmber Brown2018-07-09258-1312/+1336
* | | | versionAmber Brown2018-07-071-1/+1
* | | | Correct attrs package name in requirements (#3492)Amber Brown2018-07-071-1/+1
* | | | Prepare 0.32.1 release v0.32.1 github/release-v0.32.1 release-v0.32.1Richard van der Hoff2018-07-061-1/+1
* | | | Add explicit dependency on netaddrRichard van der Hoff2018-07-061-3/+1
* | | | 0.32.0 version bump, update changelog v0.32.0 github/release-v0.32.0 release-v0.32.0Neil Johnson2018-07-061-1/+1
* | | | bump version to 0.32.0rc1Amber Brown2018-07-051-1/+1
* | | | Implementation of server_aclsRichard van der Hoff2018-07-043-4/+156
* | | | More server_name validationRichard van der Hoff2018-07-043-9/+54
* | | | Merge pull request #3473 from matrix-org/erikj/thread_cacheErik Johnston2018-07-041-1/+2
|\ \ \ \
| * | | | Invalidate cache on correct threadErik Johnston2018-07-021-1/+2
* | | | | Merge pull request #3474 from matrix-org/erikj/py3_authErik Johnston2018-07-041-1/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Avoid relying on int vs None comparisonErik Johnston2018-07-021-1/+5
| * | | | Ensure that we define sender_domainErik Johnston2018-07-021-0/+1
| |/ / /
* | | | Reject invalid server names (#3480)Richard van der Hoff2018-07-032-25/+75
* | | | replace invalid utf8 with \ufffdMatthew Hodgson2018-07-021-2/+2
* | | | a fix which doesn't NPE everywhereMatthew Hodgson2018-07-011-9/+17
* | | | don't mix unicode strings with utf8-in-byte-stringsMatthew Hodgson2018-07-011-2/+9
|/ / /
* | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checkingErik Johnston2018-06-292-29/+71
|\ \ \
| * | | try and clean upAmber Brown2018-06-271-3/+6
| * | | pep8Amber Brown2018-06-271-6/+4
| * | | cleanupsAmber Brown2018-06-271-13/+15
| * | | handle federation not telling us about prev_eventsAmber Brown2018-06-272-26/+65
* | | | fix testsMatthew Hodgson2018-06-281-0/+1
* | | | add ip_range_whitelist parameter to limit where ASes can connect fromMatthew Hodgson2018-06-283-2/+19
* | | | Attempt to be more performant on PyPy (#3462)Amber Brown2018-06-2839-62/+78
* | | | Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454)Amber Brown2018-06-281-2/+4
|/ / /
* | | Revert "Try to not use as much CPU in the StreamChangeCache"Matthew Hodgson2018-06-261-4/+2
* | | Merge pull request #3451 from matrix-org/hawkowl/sorteddict-apiMatthew Hodgson2018-06-261-2/+4
|\ \ \
| * | | fixesAmber Brown2018-06-261-2/+2
| * | | fixesAmber Brown2018-06-261-2/+2
| * | | try and make loading items from the cache fasterAmber Brown2018-06-261-2/+4
* | | | 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-262-1/+13
|\ \ \ \ | |/ / / |/| | |
| * | | update doc for deactivate APIMatthew Hodgson2018-06-261-1/+1
| * | | 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
| | |/ / / | |/| | |
* | | | | 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
* | | | 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
* | | | 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-222-84/+35
|\| | | | | |/ / / |/| | |
| * | | remove dead filter_events_for_clientsRichard van der Hoff2018-06-122-84/+35
* | | | Disable partial state group caching for wildcard lookupsRichard van der Hoff2018-06-222-26/+55
* | | | 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-2218-72/+111
* | | | | | | 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-143-45/+69
|\ \ \ \ \ \
| * \ \ \ \ \ Merge tag 'v0.31.2'Richard van der Hoff2018-06-143-45/+69
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | v0.31.2Richard van der Hoff2018-06-141-1/+2
| | * | | | | Merge pull request #3397 from matrix-org/rav/adjust_auth_rulesRichard van der Hoff2018-06-142-44/+67
| | |\ \ \ \ \
| | | * | | | | Make default state_default 50Richard van der Hoff2018-06-141-20/+14
| | | * | | | | 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-1411-59/+6
* | | | | | | 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
| | |_|_|/ / / | |/| | | | |
* / | | | | | 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-2419-51/+155
| |\ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | Merge branch 'master' into developNeil Johnson2018-06-081-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge tag 'v0.31.1'Neil Johnson2018-06-082-1/+5
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | changelog a bump versionNeil Johnson2018-06-081-1/+1
| | | |_|/ / / | | |/| | | |
| | * | | | | Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
* | | | | | | 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
| | |_|_|_|_|/ | |/| | | | |
* / | | | | | Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
|/ / / / / /
* | | | | | 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-061-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge tag 'v0.31.0'Neil Johnson2018-06-06100-1416/+1218
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | bump version and changelogNeil Johnson2018-06-061-1/+1
| | * | | | | | 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-041-1/+1
* | | | | | | | | 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
* | | | | | | | | federation/send_queue.py: fix usage of sortedcontainers.SortedDictIvan Shapovalov2018-06-061-27/+22
* | | | | | | | | 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 remote-tracking branch 'origin/master' into developRichard van der Hoff2018-06-051-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-063-34/+40
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge pull request #3324 from matrix-org/rav/remove_dead_methodRichard van der Hoff2018-06-041-26/+0
|\ \ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-05 06:41:17 +0000