summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Actually fix it by adding continueErik Johnston2018-07-251-0/+1
* Fix typo in conditionalErik Johnston2018-07-251-1/+1
* NewsfileErik Johnston2018-07-251-0/+1
* Correctly handle outliers during persist eventsErik Johnston2018-07-251-6/+7
* Merge pull request #3597 from matrix-org/erikj/did_forgetErik Johnston2018-07-245-34/+38
|\
| * Move newsfileErik Johnston2018-07-241-0/+0
| * NewsfileErik Johnston2018-07-241-0/+1
| * Replace usage of get_current_toke with StreamToken.STARTErik Johnston2018-07-242-5/+9
| * Pull out did_forget to worker storeErik Johnston2018-07-242-29/+28
|/
* Merge pull request #3595 from matrix-org/erikj/use_deltasErik Johnston2018-07-242-53/+119
|\
| * Expand on docstring comment about return valueErik Johnston2018-07-241-0/+5
| * Remove unnecessary iteritemsErik Johnston2018-07-241-1/+1
| * Fixup comment (and indent)Erik Johnston2018-07-241-16/+20
| * NewsfileErik Johnston2018-07-241-0/+1
| * 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 pull request #3587 from matrix-org/rav/better_exception_loggingRichard van der Hoff2018-07-242-3/+9
|\ \
| * | changelogRichard van der Hoff2018-07-231-0/+1
| * | Improve logging for exceptions handling PDUsRichard van der Hoff2018-07-231-3/+8
* | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groupsRichard van der Hoff2018-07-244-62/+98
|\ \ \
| * | | Handle delta_ids being None in _update_context_for_auth_eventsRichard van der Hoff2018-07-232-8/+8
| * | | newsfileRichard van der Hoff2018-07-231-0/+1
| * | | Fixes and optimisations for resolve_state_groupsRichard van der Hoff2018-07-231-54/+89
| |/ /
* | | Merge pull request #3583 from matrix-org/rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-244-46/+2
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-2419-317/+437
| |\ \
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-2330-196/+477
| |\ \ \
| * | | | Remove redundant checks on room forgottennessRichard van der Hoff2018-07-234-46/+2
* | | | | Merge pull request #3592 from matrix-org/erikj/speed_up_calculate_state_deltaErik Johnston2018-07-242-12/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_c...Erik Johnston2018-07-2417-315/+415
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3591 from matrix-org/rav/logcontext_fixesRichard van der Hoff2018-07-245-21/+30
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into rav/logcontext_fixesRichard van der Hoff2018-07-2413-295/+386
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3555 from matrix-org/erikj/client_apis_moveErik Johnston2018-07-2411-284/+364
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into erikj/client_apis_moveErik Johnston2018-07-2419-141/+349
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api...Erik Johnston2018-07-2381-3298/+3718
| |\ \ \ \ \ \
| * | | | | | | Update docs/workers.rstErik Johnston2018-07-231-0/+4
| * | | | | | | 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
| * | | | | | | NewsfileErik Johnston2018-07-181-0/+1
| * | | | | | | 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
* | | | | | | | Merge pull request #3590 from matrix-org/rav/persist_events_metricsRichard van der Hoff2018-07-242-11/+22
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | changelogRichard van der Hoff2018-07-241-0/+1
| * | | | | | | 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
| | | * | | | ChangelogRichard van der Hoff2018-07-241-0/+1
| | | * | | | Logcontext fixesRichard van der Hoff2018-07-243-16/+19
| |_|/ / / / |/| | | | |
| | | * | | Remove unnecessary ifErik Johnston2018-07-241-2/+1
| | | * | | NewsfileErik Johnston2018-07-241-0/+1
| | | * | | Speed up _calculate_state_deltaErik Johnston2018-07-241-10/+3
| |_|/ / / |/| | | |
* | | | | Merge pull request #3584 from matrix-org/erikj/use_cachedErik Johnston2018-07-233-1/+21
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | CommentsErik Johnston2018-07-232-2/+6
| * | | | NewsfileErik Johnston2018-07-231-0/+1
| * | | | Only get cached state from context in persist_eventErik Johnston2018-07-232-1/+16
|/ / / /
* | | | Merge pull request #3582 from matrix-org/erikj/fixup_statelessErik Johnston2018-07-234-8/+15
|\ \ \ \
| * | | | NewsfileErik Johnston2018-07-231-0/+1
| * | | | Fix missing attributes on workers.Erik Johnston2018-07-233-8/+14
|/ / / /
* | | | Merge pull request #3581 from matrix-org/erikj/fixup_statelessErik Johnston2018-07-232-7/+8
|\ \ \ \
| * | | | NewsfileErik Johnston2018-07-231-0/+1
| * | | | Fix EventContext when using workersErik Johnston2018-07-231-7/+7
|/ / / /
* | | | Merge pull request #3579 from matrix-org/erikj/stateless_contexts_4Erik Johnston2018-07-2314-99/+260
|\ \ \ \
| * | | | Update docstrings to make senseErik Johnston2018-07-231-5/+8
| * | | | Merge branch 'develop' into erikj/stateless_contexts_4Richard van der Hoff2018-07-230-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3577 from matrix-org/erikj/cleanup_contextErik Johnston2018-07-233-63/+82
|\ \ \ \ \ | |_|_|/ / |/| | | |
| | * | | Fix unit testsErik Johnston2018-07-232-15/+40
| | * | | NewsfileErik Johnston2018-07-231-0/+1
| | * | | 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
| * | | NewsfileErik Johnston2018-07-231-0/+0
| * | | Refcator EventContext to accept state during initErik Johnston2018-07-232-63/+82
|/ / /
* | | Merge pull request #3520 from matrix-org/matthew/sync_deleted_devicesMatthew Hodgson2018-07-234-22/+61
|\ \ \
| * \ \ Merge branch 'develop' into matthew/sync_deleted_devicesMatthew Hodgson2018-07-23103-4671/+5379
| |\ \ \ | |/ / / |/| | |
* | | | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-218-27/+33
* | | | Merge pull request #3572 from matrix-org/rav/linearizer_cancellationRichard van der Hoff2018-07-203-6/+54
|\ \ \ \ | |_|_|/ |/| | |
| * | | ChangelogRichard van der Hoff2018-07-201-0/+1
| * | | Test and fix support for cancellation in LinearizerRichard van der Hoff2018-07-202-6/+53
|/ / /
* | | Merge pull request #3571 from matrix-org/rav/limiter_fixesRichard van der Hoff2018-07-206-164/+88
|\ \ \
| * | | changelogsRichard van der Hoff2018-07-202-0/+2
| * | | Combine Limiter and LinearizerRichard van der Hoff2018-07-204-161/+59
| * | | 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-202-7/+24
* | | | Admin API for creating new users (#3415)Amber Brown2018-07-208-3/+569
|/ / /
* | | Merge pull request #3564 from matrix-org/hawkowl/markdownRichard van der Hoff2018-07-195-2879/+2499
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/develop' into hawkowl/markdownAmber Brown2018-07-191-7/+16
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'master' into developRichard van der Hoff2018-07-191-7/+17
|\ \ \ \
| * | | | Update r0.33.0 release notes github/release-v0.33.0 release-v0.33.0Richard van der Hoff2018-07-191-7/+17
| | * | | fixesAmber Brown2018-07-192-1/+2
| | * | | fix up weird translation thingsAmber Brown2018-07-191-806/+813
| | * | | changelogAmber Brown2018-07-191-0/+1
| | * | | make pyproject point at itAmber Brown2018-07-191-2/+27
| | * | | rst -> mdAmber Brown2018-07-192-2867/+2454
| |/ / / |/| | |
* | | | Merge branch 'master' into developAmber Brown2018-07-193-8/+8
|\| | |
| * | | 0.33.0 final changelog v0.33.0Amber Brown2018-07-1921-13/+28
| * | | 0.33 finalAmber Brown2018-07-191-1/+1
| * | | update changelogsAmber Brown2018-07-196-2/+4
| * | | Revert "0.33.0rc1 changelog"Amber Brown2018-07-1920-27/+10
* | | | Don't spew errors because we can't save metrics (#3563)Amber Brown2018-07-193-6/+25
* | | | Merge pull request #3507 from Peetz0r/patch-1Richard van der Hoff2018-07-191-8/+8
|\ \ \ \
| * | | | change http links to httpsPeter2018-07-101-8/+8
* | | | | revert 00bc979Richard van der Hoff2018-07-191-4/+3
* | | | | Merge remote-tracking branch 'origin/release-v0.33.0' into developRichard van der Hoff2018-07-1923-14/+33
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3561 from matrix-org/rav/disable_logcontext_warningRichard van der Hoff2018-07-192-3/+5
| |\ \ \ \
| | * | | | changelogRichard van der Hoff2018-07-191-0/+1
| | * | | | Disable logcontext warningRichard van der Hoff2018-07-191-3/+4
| |/ / / /
| * | | | 0.33.0rc1 changelog v0.33.0rc1Amber Brown2018-07-1820-10/+27
| * | | | bump to 0.33.0rc1Amber Brown2018-07-181-1/+1
* | | | | Merge pull request #3556 from matrix-org/rav/background_processesRichard van der Hoff2018-07-199-104/+67
|\ \ \ \ \
| * | | | | Make Distributor run its processes as a background processRichard van der Hoff2018-07-182-78/+22
| * | | | | changelogRichard van der Hoff2018-07-181-0/+1
| * | | | | 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-1913-101/+116
* | | | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_codeErik Johnston2018-07-192-3/+7
|\ \ \ \ \ \
| * | | | | | pep8Erik Johnston2018-07-181-1/+2
| * | | | | | NewsfileErik Johnston2018-07-181-0/+1
| * | | | | | Add response code to response timer metricsErik Johnston2018-07-181-3/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #3559 from matrix-org/rav/pep8_configAmber Brown2018-07-192-3/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | changelogRichard van der Hoff2018-07-181-0/+1
| * | | | | add config for pep8Richard van der Hoff2018-07-181-3/+8
|/ / / / /
* | | | | Merge pull request #3553 from matrix-org/rav/background_process_trackingRichard van der Hoff2018-07-183-5/+187
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | changelogRichard van der Hoff2018-07-181-0/+1
| * | | | 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-182-43/+1
|\ \ \ \
| * | | | Add changelogRichard van der Hoff2018-07-041-0/+1
| * | | | Merge branch 'develop' into rav/drop_re_signing_hacksRichard van der Hoff2018-07-04152-642/+2188
| |\ \ \ \
| * | | | | 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-182-2/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | I failed to correctly guess the PR numberDavid Baker2018-07-111-0/+0
| * | | | | Comment dummy TURN parameters in default configDavid Baker2018-07-112-2/+3
* | | | | | Merge pull request #3546 from matrix-org/rav/fix_erasure_over_federationRichard van der Hoff2018-07-173-56/+133
|\ \ \ \ \ \
| * | | | | | add a commentRichard van der Hoff2018-07-171-0/+2
| * | | | | | changelogRichard van der Hoff2018-07-171-0/+1
| * | | | | | Fix visibility of events from erased users over federationRichard van der Hoff2018-07-172-56/+130
|/ / / / / /
* | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_serverRichard van der Hoff2018-07-174-138/+409
|\ \ \ \ \ \
| * | | | | | fix importsRichard van der Hoff2018-07-172-0/+2
| * | | | | | add a commentRichard van der Hoff2018-07-171-0/+2
| * | | | | | ChangelogRichard van der Hoff2018-07-161-0/+1
| * | | | | | Attempt to make _filter_events_for_server more efficientRichard van der Hoff2018-07-161-17/+23
| * | | | | | Add a test which profiles filter_events_for_server in a large roomRichard van der Hoff2018-07-161-2/+155
| * | | | | | Move filter_events_for_server out of FederationHandlerRichard van der Hoff2018-07-163-138/+245
* | | | | | | Refactor REST API tests to use explicit reactors (#3351)Amber Brown2018-07-1713-934/+939
* | | | | | | Merge pull request #3544 from matrix-org/erikj/fixup_stream_cacheErik Johnston2018-07-173-1/+19
|\ \ \ \ \ \ \
| * | | | | | | Use efficient .intersectionErik Johnston2018-07-171-4/+1
| * | | | | | | Add unit testErik Johnston2018-07-171-0/+16
| * | | | | | | NewsfileErik Johnston2018-07-171-0/+0
| * | | | | | | Fix perf regression in PR #3530Erik Johnston2018-07-171-1/+6
|/ / / / / / /
* | | | | | | Merge pull request #3530 from matrix-org/erikj/stream_cacheAmber Brown2018-07-173-11/+4
|\ \ \ \ \ \ \
| * | | | | | | Fixup unit testErik Johnston2018-07-131-3/+3
| * | | | | | | NewsfileErik Johnston2018-07-131-0/+0
| * | | | | | | Don't return unknown entities in get_entities_changedErik Johnston2018-07-131-8/+1
* | | | | | | | Merge pull request #3540 from krombel/enforce_isortAmber Brown2018-07-178-9/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | rename 'isort' to 'check_isort' as requestedKrombel2018-07-162-3/+3
| * | | | | | | | rerun isort with latest versionKrombel2018-07-166-20/+4
| * | | | | | | | check isort by travisKrombel2018-07-1614-13/+37
|/ / / / / / / /
* | | | | | | | Fix develop because I broke it :( (#3535)Amber Brown2018-07-143-2/+5
* | | | | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servletAmber Brown2018-07-1418-165/+102
|\ \ \ \ \ \ \ \
| * | | | | | | | fix sytestsAmber Brown2018-07-141-1/+1
| * | | | | | | | add changelogKrombel2018-07-132-1/+2
| * | | | | | | | 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-1410-98/+97
|/ / / / / / / /
* | | | | | | | Merge pull request #3533 from matrix-org/rav/fix_federation_ratelimite_queueRichard van der Hoff2018-07-133-10/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | better changelogRichard van der Hoff2018-07-131-1/+1
| * | | | | | | changelogRichard van der Hoff2018-07-131-0/+1
| * | | | | | | Fix unit testsRichard van der Hoff2018-07-131-0/+1
| * | | | | | | 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-122-8/+13
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2018-07-121-0/+1
| * | | | | | Reduce set building in get_entities_changedRichard van der Hoff2018-07-121-8/+12
* | | | | | | Merge pull request #3316 from matrix-org/rav/enforce_report_apiRichard van der Hoff2018-07-122-2/+25
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | changelogRichard van der Hoff2018-07-121-0/+1
| * | | | | | Merge branch 'develop' into rav/enforce_report_apiRichard van der Hoff2018-07-12370-2555/+5185
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3505 from matrix-org/erikj/receipts_cahceErik Johnston2018-07-123-7/+21
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Update return value docstringErik Johnston2018-07-121-1/+1
| * | | | | | Use 'is not None' and add commentsErik Johnston2018-07-101-2/+6
| * | | | | | NewsfileErik Johnston2018-07-101-0/+1
| * | | | | | 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
| | | | | | * changelogMatthew Hodgson2018-07-121-0/+1
| | | | | | * 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
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #3498 from OlegGirko/fix_attrs_syntaxAmber Brown2018-07-112-1/+1
|\ \ \ \ \ \
| * | | | | | changelog entryAmber Brown2018-07-111-0/+0
| * | | | | | Use more portable syntax using attrs package.Oleg Girko2018-07-101-1/+1
* | | | | | | s/becuase/because/gMatthew Hodgson2018-07-103-4/+4
| |/ / / / / |/| | | | |
* | | | | | Attempt to include db threads in cpu usage stats (#3496)Richard van der Hoff2018-07-104-20/+39
* | | | | | Refactor logcontext resource usage tracking (#3501)Richard van der Hoff2018-07-105-130/+146
* | | | | | another typoMatthew Hodgson2018-07-101-1/+1
* | | | | | typo (i think)Matthew Hodgson2018-07-101-1/+1
* | | | | | Merge pull request #3497 from matrix-org/rav/measure_fetch_event_loopRichard van der Hoff2018-07-102-19/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | changelogRichard van der Hoff2018-07-091-0/+1
| * | | | | Add CPU metrics for _fetch_event_listRichard van der Hoff2018-07-091-19/+32
|/ / / / /
* | | | | Merge pull request #3464 from matrix-org/hawkowl/isort-runRichard van der Hoff2018-07-09335-1528/+1609
|\ \ \ \ \
| * | | | | changelogAmber Brown2018-07-091-0/+0
| * | | | | run isortAmber Brown2018-07-09334-1528/+1609
|/ / / / /
* | | | / Add an isort configuration (#3463)Amber Brown2018-07-092-0/+12
| |_|_|/ |/| | |
* | | | changelog v0.32.2 github/release-v0.32.2 release-v0.32.2Amber Brown2018-07-072-1/+9
* | | | versionAmber Brown2018-07-071-1/+1
* | | | Correct attrs package name in requirements (#3492)Amber Brown2018-07-073-1/+3
* | | | Merge tag 'v0.32.1'Richard van der Hoff2018-07-063-4/+11
|\ \ \ \
| * | | | Prepare 0.32.1 release v0.32.1 github/release-v0.32.1 release-v0.32.1Richard van der Hoff2018-07-063-2/+10
| * | | | Merge pull request #3488 from matrix-org/rav/fix-netaddr-depRichard van der Hoff2018-07-062-3/+2
|/| | | |
| * | | | Add explicit dependency on netaddrRichard van der Hoff2018-07-062-3/+2
|/ / / /
* | | | 0.32.0 version bump, update changelog v0.32.0 github/release-v0.32.0 release-v0.32.0Neil Johnson2018-07-062-1/+5
* | | | changelog v0.32.0rc1Amber Brown2018-07-0529-19/+47
* | | | ACL changelogAmber Brown2018-07-051-0/+1
* | | | bump version to 0.32.0rc1Amber Brown2018-07-051-1/+1
* | | | Merge remote-tracking branch 'hera/rav/server_acls' into developNeil Johnson2018-07-055-4/+213
|\ \ \ \
| * | | | Implementation of server_aclsRichard van der Hoff2018-07-045-4/+213
* | | | | Merge pull request #3483 from matrix-org/rav/more_server_name_validationErik Johnston2018-07-055-13/+68
|\| | | |
| * | | | More server_name validationRichard van der Hoff2018-07-045-13/+68
* | | | | Merge pull request #3481 from matrix-org/rav/fix_cachedescriptor_testRichard van der Hoff2018-07-042-2/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reinstate lost run_on_reactor in unit testRichard van der Hoff2018-07-042-2/+16
| | |_|/ | |/| |
* | | | Merge pull request #3473 from matrix-org/erikj/thread_cacheErik Johnston2018-07-042-1/+3
|\ \ \ \
| * | | | Correct newsfileErik Johnston2018-07-022-0/+1
| * | | | NewsfileErik Johnston2018-07-021-0/+0
| * | | | Invalidate cache on correct threadErik Johnston2018-07-021-1/+2
* | | | | Merge pull request #3474 from matrix-org/erikj/py3_authErik Johnston2018-07-042-1/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | NewsfileErik Johnston2018-07-021-0/+0
| * | | | 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-035-25/+122
* | | | Merge pull request #3470 from matrix-org/matthew/fix-utf8-loggingRichard van der Hoff2018-07-022-2/+18
|\ \ \ \ | |/ / / |/| | |
| * | | news snippetMatthew Hodgson2018-07-021-0/+1
| * | | 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 #3467 from matrix-org/hawkowl/contributor-requirementsMatthew Hodgson2018-06-302-5/+9
|\ \ \
| * | | topfileAmber Brown2018-06-291-0/+0
| * | | clarification on what "real names" areAmber Brown2018-06-291-5/+9
* | | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checkingErik Johnston2018-06-295-30/+319
|\ \ \ \
| * | | | topfile updateAmber Brown2018-06-281-2/+1
| * | | | topfileAmber Brown2018-06-271-0/+2
| * | | | try and clean upAmber Brown2018-06-271-3/+6
| * | | | pep8Amber Brown2018-06-272-11/+6
| * | | | cleanupsAmber Brown2018-06-271-1/+4
| * | | | cleanupsAmber Brown2018-06-271-13/+15
| * | | | stylistic cleanupAmber Brown2018-06-271-6/+18
| * | | | cleanupsAmber Brown2018-06-271-7/+6
| * | | | handle federation not telling us about prev_eventsAmber Brown2018-06-274-27/+301
* | | | | Merge pull request #3465 from matrix-org/matthew/as_ip_lockMatthew Hodgson2018-06-285-5/+69
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | add testMatthew Hodgson2018-06-281-0/+33
| * | | | add towncrier snippetMatthew Hodgson2018-06-281-0/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-11 23:40:47 +0000