Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Exempt bot users | Half-Shot | 2019-08-23 | 1 | -1/+1 |
* | Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consent | Half-Shot | 2019-08-23 | 2 | -1/+3 |
|\ | |||||
| * | Add changelog | Half-Shot | 2019-08-23 | 1 | -0/+1 |
| * | Add bot type | Half-Shot | 2019-08-23 | 1 | -1/+2 |
* | | Fix registration test | Half-Shot | 2019-08-23 | 1 | -0/+1 |
* | | newsfile 5902 | Half-Shot | 2019-08-23 | 1 | -0/+1 |
* | | Ignore consent for support users | Half-Shot | 2019-08-23 | 1 | -0/+1 |
* | | Return user_type in get_user_by_id | Half-Shot | 2019-08-23 | 1 | -1/+4 |
|/ | |||||
* | Propagate opentracing contexts through EDUs (#5852) | Jorik Schellekens | 2019-08-22 | 9 | -94/+234 |
* | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis... | Richard van der Hoff | 2019-08-22 | 2 | -53/+5 |
|\ | |||||
| * | Remove shared secret registration from client/r0/register endpoint | Manuel Stahl | 2019-08-22 | 2 | -53/+5 |
* | | Opentracing across workers (#5771) | Jorik Schellekens | 2019-08-22 | 5 | -83/+123 |
* | | Revert "Do not send consent notices if "no-consent-required" is set" | Brendan Abolivier | 2019-08-22 | 1 | -4/+0 |
* | | Revert "Add "require_consent" parameter for registration" | Brendan Abolivier | 2019-08-22 | 3 | -18/+3 |
* | | Do not send consent notices if "no-consent-required" is set | Half-Shot | 2019-08-22 | 1 | -0/+4 |
* | | Add "require_consent" parameter for registration | Half-Shot | 2019-08-22 | 3 | -3/+18 |
* | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail | Erik Johnston | 2019-08-22 | 4 | -72/+164 |
|\ \ | |||||
| * | | Change jitter to be a factor rather than absolute value | Erik Johnston | 2019-08-20 | 2 | -13/+14 |
| * | | Fixup changelog and remove debug logging | Erik Johnston | 2019-08-16 | 3 | -5/+2 |
| * | | Newsfile | Erik Johnston | 2019-08-15 | 1 | -0/+1 |
| * | | Retry well known on fail. | Erik Johnston | 2019-08-15 | 3 | -67/+160 |
* | | | Opentrace e2e keys (#5855) | Jorik Schellekens | 2019-08-22 | 7 | -7/+142 |
* | | | Add missing index on users_in_public_rooms. (#5894) | Richard van der Hoff | 2019-08-22 | 2 | -0/+18 |
* | | | Servlet to purge old rooms (#5845) | Richard van der Hoff | 2019-08-22 | 6 | -0/+232 |
* | | | Improve error msg when key-fetch fails (#5896) | Richard van der Hoff | 2019-08-22 | 2 | -5/+8 |
* | | | Drop some unused tables. (#5893) | Richard van der Hoff | 2019-08-21 | 4 | -47/+23 |
* | | | Refactor the Appservice scheduler code (#5886) | Richard van der Hoff | 2019-08-20 | 3 | -49/+68 |
|\ \ \ | |||||
| * | | | Refactor the Appservice scheduler code | Richard van der Hoff | 2019-08-20 | 3 | -49/+68 |
| | |/ | |/| | |||||
* | | | Avoid deep recursion in appservice recovery (#5885) | Richard van der Hoff | 2019-08-20 | 2 | -18/+26 |
* | | | Opentracing doc update (#5776) | Jorik Schellekens | 2019-08-20 | 2 | -27/+41 |
|/ / | |||||
* | | Merge pull request #5860 from matrix-org/erikj/update_5704_comments | Erik Johnston | 2019-08-19 | 2 | -17/+6 |
|\ \ | |||||
| * | | Newsfile | Erik Johnston | 2019-08-16 | 1 | -0/+1 |
| * | | Remove logging for #5407 and update comments | Erik Johnston | 2019-08-15 | 1 | -17/+5 |
| |/ | |||||
* | | Merge branch 'master' into develop | Brendan Abolivier | 2019-08-17 | 6 | -15/+66 |
|\ \ | |||||
| * | | 1.3.1 v1.3.1 github/release-v1.3.1 release-v1.3.1 | Richard van der Hoff | 2019-08-17 | 5 | -5/+28 |
| * | | Drop dependency on sdnotify (#5871) | Richard van der Hoff | 2019-08-17 | 3 | -11/+38 |
| * | | add attribution | Richard van der Hoff | 2019-08-16 | 1 | -1/+1 |
| * | | Add changelog entry. | Chris Moos | 2019-08-16 | 1 | -0/+1 |
| * | | Fix issue with Synapse not starting up. Fixes #5866. | Chris Moos | 2019-08-16 | 1 | -1/+1 |
* | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_index | Hubert Chathi | 2019-08-16 | 3 | -1/+20 |
|\ \ \ | |||||
| * | | | fix changelog | Hubert Chathi | 2019-08-15 | 1 | -1/+1 |
| * | | | update set_e2e_room_key to agree with fixed index | Hubert Chathi | 2019-08-14 | 1 | -1/+1 |
| * | | | add changelog | Hubert Chathi | 2019-08-14 | 1 | -0/+1 |
| * | | | add the version field to the index for e2e_room_keys | Hubert Chathi | 2019-08-14 | 1 | -0/+18 |
* | | | | Opentracing misc (#5856) | Jorik Schellekens | 2019-08-16 | 4 | -16/+25 |
* | | | | Fix up password reset template config names (#5863) | Andrew Morgan | 2019-08-15 | 3 | -10/+11 |
* | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-08-15 | 6 | -14/+28 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge tag 'v1.3.0' | Brendan Abolivier | 2019-08-15 | 237 | -2739/+4310 |
| |\ \ \ | |||||
| | * | | | 1.3.0 v1.3.0 github/release-v1.3.0 release-v1.3.0 | Brendan Abolivier | 2019-08-15 | 5 | -6/+14 |
| | * | | | Remove libsqlite3-dev from required build dependencies. (#5766) | Andrew Morgan | 2019-08-15 | 3 | -5/+4 |
| | * | | | Merge pull request #5851 from matrix-org/rei/roomdir_maybedeferred | reivilibre | 2019-08-15 | 2 | -2/+10 |
| | |\ \ \ | |||||
| | | * | | | Update changelog.d/5851.bugfix | reivilibre | 2019-08-14 | 1 | -2/+2 |
| | | * | | | Newsfile | Olivier Wilkinson (reivilibre) | 2019-08-14 | 1 | -0/+2 |
| | | * | | | Wrap `get_local_public_room_list` call in `maybeDeferred` because it | Olivier Wilkinson (reivilibre) | 2019-08-14 | 1 | -2/+8 |
| | |/ / / | |||||
| * | | | | make user creation steps clearer | Neil Johnson | 2019-08-08 | 1 | -5/+4 |
* | | | | | Don't create broken room when power_level_content_override.users does not con... | Michael Telatynski | 2019-08-15 | 2 | -1/+14 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookup | Erik Johnston | 2019-08-14 | 5 | -27/+137 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Newsfile | Erik Johnston | 2019-08-13 | 1 | -0/+1 |
| * | | | Retry well-known lookup before expiry. | Erik Johnston | 2019-08-13 | 4 | -27/+136 |
* | | | | 1.3.0rc1 v1.3.0rc1 | Brendan Abolivier | 2019-08-13 | 63 | -62/+75 |
* | | | | Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startup | Brendan Abolivier | 2019-08-13 | 2 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | changelog | Amber H. Brown | 2019-08-14 | 1 | -0/+1 |
| * | | | | fix config being a dict, actually | Amber H. Brown | 2019-08-14 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stop | Erik Johnston | 2019-08-13 | 4 | -21/+55 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove redundant return | Erik Johnston | 2019-08-13 | 1 | -1/+0 |
| * | | | Clarify docstring | Erik Johnston | 2019-08-13 | 1 | -1/+1 |
| * | | | Newsfile | Erik Johnston | 2019-08-01 | 1 | -0/+1 |
| * | | | Handle pusher being deleted during processing. | Erik Johnston | 2019-08-01 | 3 | -21/+55 |
* | | | | Don't load the media repo when configured to use an external media repo (#5754) | Amber Brown | 2019-08-13 | 10 | -91/+188 |
* | | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known | Erik Johnston | 2019-08-13 | 4 | -171/+222 |
|\ \ \ \ | |||||
| * | | | | Make default well known cache global again. | Erik Johnston | 2019-08-13 | 1 | -1/+4 |
| * | | | | Newsfile | Erik Johnston | 2019-08-12 | 1 | -0/+1 |
| * | | | | Move well known lookup into a separate clas | Erik Johnston | 2019-08-07 | 3 | -173/+216 |
| * | | | | Add a lower bound for TTL on well known results. | Erik Johnston | 2019-08-06 | 2 | -2/+6 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pauses | Erik Johnston | 2019-08-13 | 2 | -128/+143 |
|\ \ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2019-08-06 | 1 | -0/+1 |
| * | | | | Don't unnecessarily block notifying of new events. | Erik Johnston | 2019-08-06 | 1 | -128/+142 |
* | | | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_vis | Erik Johnston | 2019-08-12 | 2 | -4/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-08-12 | 1 | -0/+1 |
| * | | | | | Whitelist history visbility sytests for worker mode | Erik Johnston | 2019-08-12 | 1 | -4/+0 |
* | | | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-script | Erik Johnston | 2019-08-12 | 2 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Changelogs should end in '.' or '!' | Erik Johnston | 2019-08-12 | 1 | -1/+1 |
| * | | | | | Fix curl command typo in purge_remote_media.sh | Thomas Citharel | 2019-08-09 | 2 | -1/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #5788 from matrix-org/rav/metaredactions | Richard van der Hoff | 2019-08-12 | 3 | -101/+183 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | changelog | Richard van der Hoff | 2019-07-30 | 1 | -0/+1 |
| * | | | | Handle loops in redaction events | Richard van der Hoff | 2019-07-30 | 2 | -60/+106 |
| * | | | | recursively fetch redactions | Richard van der Hoff | 2019-07-30 | 1 | -32/+36 |
| * | | | | split _get_events_from_db out of _enqueue_events | Richard van der Hoff | 2019-07-29 | 1 | -32/+51 |
| * | | | | Return dicts from _fetch_event_list | Richard van der Hoff | 2019-07-29 | 1 | -15/+27 |
* | | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_sync | Erik Johnston | 2019-08-06 | 2 | -6/+38 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-08-06 | 1 | -0/+1 |
| * | | | | | Handle TimelineBatch being limited and empty. | Erik Johnston | 2019-08-06 | 1 | -6/+37 |
| | |/ / / | |/| | | | |||||
* / | | | | Return 404 instead of 403 when retrieving an event without perms (#5798) | Andrew Morgan | 2019-08-06 | 2 | -3/+12 |
|/ / / / | |||||
* | | | | Account validity: allow defining HTML templates to serve the us… (#5807) | Brendan Abolivier | 2019-08-01 | 8 | -11/+119 |
|\ \ \ \ | |||||
| * | | | | Lint | Brendan Abolivier | 2019-08-01 | 3 | -17/+10 |
| * | | | | Sample config | Brendan Abolivier | 2019-08-01 | 1 | -0/+10 |
| * | | | | Changelog | Brendan Abolivier | 2019-08-01 | 1 | -0/+1 |
| * | | | | Add tests | Brendan Abolivier | 2019-08-01 | 1 | -0/+37 |
| * | | | | Allow defining HTML templates to serve the user on account renewal | Brendan Abolivier | 2019-08-01 | 5 | -9/+76 |
* | | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachable | Erik Johnston | 2019-08-01 | 2 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-08-01 | 1 | -0/+1 |
| * | | | | | Return 502 not 500 when failing to reach any remote server. | Erik Johnston | 2019-08-01 | 1 | -4/+3 |
* | | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806) | Andrew Morgan | 2019-08-01 | 2 | -21/+22 |
* | | | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_error | Erik Johnston | 2019-08-01 | 2 | -1/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-08-01 | 1 | -0/+1 |
| * | | | | | Handle incorrectly encoded query params correctly | Erik Johnston | 2019-08-01 | 1 | -1/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #5805 from matrix-org/erikj/validate_state | Erik Johnston | 2019-08-01 | 2 | -2/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-07-31 | 1 | -0/+1 |
| * | | | | | Validate well-known state events are state events. | Erik Johnston | 2019-07-31 | 1 | -2/+9 |
* | | | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstone | Erik Johnston | 2019-08-01 | 2 | -0/+10 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix spelling. | Erik Johnston | 2019-08-01 | 2 | -2/+4 |
| |/ / / / | |||||
| * | | | | Newsfile | Erik Johnston | 2019-07-31 | 1 | -0/+1 |
| * | | | | Don't allow clients to send tombstones that reference the same room | Erik Johnston | 2019-07-31 | 1 | -0/+7 |
* | | | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_room | Erik Johnston | 2019-08-01 | 2 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-07-31 | 1 | -0/+1 |
| * | | | | | Deny redaction of events in a different room. | Erik Johnston | 2019-07-31 | 1 | -1/+3 |
| |/ / / / | |||||
* | | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errors | Erik Johnston | 2019-08-01 | 3 | -32/+61 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-07-30 | 1 | -0/+1 |
| * | | | | | Don't log as exception when failing durig backfill | Erik Johnston | 2019-07-30 | 1 | -0/+3 |
| * | | | | | Correctly handle errors doing requests to group servers | Erik Johnston | 2019-07-29 | 1 | -32/+57 |
* | | | | | | Merge pull request #5804 from matrix-org/erikj/match_against_state_key | Erik Johnston | 2019-08-01 | 2 | -1/+8 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-07-31 | 1 | -0/+1 |
| * | | | | | Explicitly check that tombstone is a state event before notifying. | Erik Johnston | 2019-07-31 | 1 | -1/+7 |
|/ / / / / | |||||
* | | | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686) | Andrew Morgan | 2019-07-31 | 2 | -1/+3 |
* | | | | | Remove duplicate return statement | Andrew Morgan | 2019-07-31 | 1 | -1/+0 |
* | | | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_known | Erik Johnston | 2019-07-31 | 4 | -17/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-07-31 | 1 | -0/+1 |
| * | | | | | Share SSL options for well-known requests | Erik Johnston | 2019-07-31 | 3 | -17/+19 |
* | | | | | | Remove DelayedCall debugging from test runs (#5787) | Amber Brown | 2019-07-31 | 2 | -6/+1 |
* | | | | | | Merge pull request #5796 from matrix-org/erikj/disable_codecov_report | Erik Johnston | 2019-07-31 | 2 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-07-31 | 1 | -0/+1 |
| * | | | | | Disable codecov reports to GH comments. | Erik Johnston | 2019-07-31 | 1 | -2/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #5793 from matrix-org/erikj/fix_bg_update | Brendan Abolivier | 2019-07-30 | 3 | -1/+23 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Newsfile | Erik Johnston | 2019-07-30 | 1 | -0/+1 |
| * | | | | Don't recreate column | Erik Johnston | 2019-07-30 | 2 | -1/+22 |
* | | | | | Merge pull request #5792 from matrix-org/erikj/fix_bg_update | Erik Johnston | 2019-07-30 | 3 | -1/+2 |
|\| | | | | |||||
| * | | | | Newsfile | Erik Johnston | 2019-07-30 | 1 | -0/+1 |
| * | | | | Fix current_state_events membership background update. | Erik Johnston | 2019-07-30 | 2 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keys | Erik Johnston | 2019-07-30 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2019-07-30 | 1 | -0/+1 |
| * | | | | Unwrap error | Erik Johnston | 2019-07-30 | 1 | -1/+2 |
| * | | | | Fix error handling when fetching remote device keys | Erik Johnston | 2019-07-30 | 1 | -3/+1 |
|/ / / / | |||||
* | | | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_state | Erik Johnston | 2019-07-30 | 2 | -1/+37 |
|\ \ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2019-07-23 | 1 | -0/+1 |
| * | | | | Add unit test for current state membership bg update | Erik Johnston | 2019-07-23 | 1 | -1/+36 |
* | | | | | Remove non-functional 'expire_access_token' setting (#5782) | Richard van der Hoff | 2019-07-30 | 8 | -37/+9 |
| |_|/ / |/| | | | |||||
* | | | | Room Complexity Client Implementation (#5783) | Amber Brown | 2019-07-30 | 8 | -14/+298 |
| |/ / |/| | | |||||
* | | | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membership | Erik Johnston | 2019-07-29 | 2 | -0/+7 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2019-07-26 | 1 | -0/+1 |
| * | | | Fix room summary when rejected events are in state | Erik Johnston | 2019-07-26 | 1 | -0/+6 |
* | | | | Merge pull request #5752 from matrix-org/erikj/forgotten_user | Erik Johnston | 2019-07-29 | 3 | -35/+124 |
|\ \ \ \ | |||||
| * | | | | Expand comment | Erik Johnston | 2019-07-29 | 1 | -0/+5 |
| * | | | | Remove lost comment | Erik Johnston | 2019-07-29 | 1 | -7/+0 |
| |/ / / | |||||
| * | | | Newsfile | Erik Johnston | 2019-07-24 | 1 | -0/+1 |
| * | | | Remove join when calculating room summaries. | Erik Johnston | 2019-07-24 | 1 | -13/+21 |
| * | | | Remove join on room_memberships when fetching rooms for user. | Erik Johnston | 2019-07-24 | 1 | -22/+36 |
| * | | | Add function to get all forgotten rooms for user | Erik Johnston | 2019-07-24 | 2 | -0/+68 |
| |/ / | |||||
* | | | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqlite | Erik Johnston | 2019-07-29 | 3 | -4/+6 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2019-07-29 | 1 | -0/+1 |
| * | | | Update old deps unit test to use old sqlite3 | Erik Johnston | 2019-07-29 | 1 | -2/+3 |
| * | | | Fix current_state bg update to work on old SQLite | Erik Johnston | 2019-07-29 | 1 | -2/+2 |
* | | | | Move some timeout checking logs to DEBUG #5785 | Amber Brown | 2019-07-30 | 3 | -2/+3 |
* | | | | Update the device list cache when keys/query is called (#5693) | Jorik Schellekens | 2019-07-29 | 3 | -74/+137 |
* | | | | Fix debian packages for sid being called buster. (#5775) | Erik Johnston | 2019-07-30 | 3 | -1/+8 |
|/ / / | |||||
* | | | Merge pull request #5780 from matrix-org/baboliver/loopingcall-args | Brendan Abolivier | 2019-07-29 | 2 | -2/+5 |
|\ \ \ | |||||
| * | | | Changelog | Brendan Abolivier | 2019-07-29 | 1 | -0/+1 |
| * | | | Add kwargs and doc | Brendan Abolivier | 2019-07-29 | 1 | -2/+4 |
| * | | | Add ability to pass arguments to looping calls | Brendan Abolivier | 2019-07-29 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-07-26 | 6 | -4/+38 |
|\ \ \ | | |/ | |/| | |||||
| * | | yet more changelog attribution fixes v1.2.1 | Richard van der Hoff | 2019-07-26 | 1 | -2/+2 |
| * | | correct attributions in changelog github/release-v1.2.1 release-v1.2.1 | Richard van der Hoff | 2019-07-26 | 1 | -1/+4 |
| * | | correct attributions in changelog | Richard van der Hoff | 2019-07-26 | 1 | -1/+2 |
| * | | 1.2.1 | Richard van der Hoff | 2019-07-26 | 5 | -4/+30 |
| * | | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1 | Richard van der Hoff | 2019-07-26 | 3 | -4/+38 |
| |\ \ | |||||
| * | | | Log when we receive receipt from a different origin | Erik Johnston | 2019-07-26 | 1 | -13/+22 |
| * | | | Fix DoS when there is a cycle in redaction events | Richard van der Hoff | 2019-07-26 | 1 | -0/+4 |
| * | | | Merge branch 'rav/redactions/cross_room_id' into release-v1.2.1 | Richard van der Hoff | 2019-07-25 | 2 | -0/+28 |
| |\ \ \ | |||||
* | \ \ \ | Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatch | Richard van der Hoff | 2019-07-26 | 3 | -4/+38 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Log when we receive a /make_* request from a different origin | Richard van der Hoff | 2019-07-26 | 3 | -4/+38 |
* | | | | | Convert RedactionTestCase to modern test style (#5768) | Richard van der Hoff | 2019-07-26 | 2 | -36/+39 |
* | | | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_id | Richard van der Hoff | 2019-07-25 | 2 | -0/+28 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | log when a redaction attempts to redact an event in a different room | Richard van der Hoff | 2019-07-25 | 2 | -0/+28 |
| | |/ / | |/| | | |||||
* | | | | Fix some error cases in the caching layer. (#5749) | Richard van der Hoff | 2019-07-25 | 3 | -35/+130 |
* | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-07-25 | 3 | -3/+12 |
|\| | | | |||||
| * | | | 1.2.0 v1.2.0 github/release-v1.2.0 release-v1.2.0 | Andrew Morgan | 2019-07-25 | 3 | -3/+12 |
| |/ / | |||||
* | | | Merge tag 'v1.2.0rc2' into develop | Andrew Morgan | 2019-07-24 | 11 | -32/+101 |
|\| | | |||||
| * | | 1.2.0rc2 v1.2.0rc2 | Andrew Morgan | 2019-07-24 | 3 | -2/+10 |
| * | | Fix servlet metric names (#5734) | Jorik Schellekens | 2019-07-24 | 10 | -31/+92 |
* | | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch | Erik Johnston | 2019-07-24 | 2 | -13/+23 |
|\ \ \ | |||||
| * | | | Update changelog.d/5743.bugfix | Erik Johnston | 2019-07-23 | 1 | -1/+1 |
| * | | | Newsfile | Erik Johnston | 2019-07-23 | 1 | -0/+1 |
| * | | | Log when we receive receipt from a different origin | Erik Johnston | 2019-07-23 | 1 | -13/+22 |
* | | | | Stop trying to fetch events with event_id=None. (#5753) | Richard van der Hoff | 2019-07-24 | 4 | -11/+23 |
* | | | | Add a prometheus metric for active cache lookups. (#5750) | Richard van der Hoff | 2019-07-24 | 3 | -2/+34 |
* | | | | Make Jaeger fully configurable (#5694) | Jorik Schellekens | 2019-07-23 | 4 | -4/+46 |
* | | | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 177 | -1514/+1360 |
| |_|/ |/| | | |||||
* | | | Opentracing Utils (#5722) | Jorik Schellekens | 2019-07-23 | 3 | -101/+357 |
* | | | Merge pull request #5732 from matrix-org/erikj/sdnotify | Erik Johnston | 2019-07-23 | 17 | -14/+67 |
|\ \ \ | |/ / |/| | | |||||
| * | | Also update systemd-with-workers contrib examples | Erik Johnston | 2019-07-23 | 2 | -2/+4 |
| * | | Update example systemd service file | Erik Johnston | 2019-07-22 | 1 | -1/+3 |
| * | | Call startup commands as system triggers. | Erik Johnston | 2019-07-22 | 11 | -11/+29 |
| * | | Newsfile | Erik Johnston | 2019-07-22 | 1 | -0/+1 |
| * | | Add process hooks to tell systemd our state. | Erik Johnston | 2019-07-22 | 2 | -0/+30 |
* | | | Merge pull request #5740 from matrix-org/erikj/worker_flakey_tests | Erik Johnston | 2019-07-23 | 2 | -1/+8 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2019-07-23 | 1 | -0/+1 |
| * | | | Mark flakey tests as blacklisted for worker mode | Erik Johnston | 2019-07-23 | 1 | -1/+7 |
|/ / / | |||||
* | | | Merge pull request #5738 from matrix-org/erikj/faster_update | Erik Johnston | 2019-07-23 | 2 | -18/+31 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2019-07-23 | 1 | -0/+1 |
| * | | | Speed up current state background update. | Erik Johnston | 2019-07-23 | 1 | -18/+30 |
* | | | | Merge pull request #5733 from matrix-org/erikj/exlude_sytest_blacklist | Erik Johnston | 2019-07-23 | 2 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Newsfile | Erik Johnston | 2019-07-22 | 1 | -0/+1 |
| * | | | Don't package sytest-blacklist file. | Erik Johnston | 2019-07-22 | 1 | -1/+1 |
|/ / / | |||||
* | | | Fix logging in workers (#5729) | Amber Brown | 2019-07-22 | 4 | -1/+32 |
* | | | Merge pull request #5730 from matrix-org/erikj/cache_versions | Erik Johnston | 2019-07-22 | 2 | -2/+22 |
|\ \ \ | |||||
| * | | | Update changelog.d/5730.misc | Erik Johnston | 2019-07-22 | 1 | -1/+1 |
| * | | | Newsfile | Erik Johnston | 2019-07-22 | 1 | -0/+1 |
| * | | | Cache get_version_string. | Erik Johnston | 2019-07-22 | 1 | -2/+21 |
| |/ / | |||||
* | | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-type | Jason Robinson | 2019-07-22 | 2 | -3/+4 |
|\ \ \ | |||||
| * | | | Add `user_type` to returned fields in admin API user list endpoints | Jason Robinson | 2019-07-22 | 2 | -3/+4 |
| |/ / | |||||
* | | | Fix stack overflow in Keyring (#5724) | Richard van der Hoff | 2019-07-22 | 3 | -80/+42 |
|\ \ \ | |||||
| * | | | changelog | Richard van der Hoff | 2019-07-19 | 1 | -0/+1 |
| * | | | Add a delay to key lookup lock release to fix stack overflow | Richard van der Hoff | 2019-07-19 | 1 | -2/+8 |
| * | | | Refactor Keyring._start_key_lookups | Richard van der Hoff | 2019-07-19 | 2 | -80/+35 |
* | | | | Merge tag 'v1.2.0rc1' into develop | Andrew Morgan | 2019-07-22 | 54 | -56/+82 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | Make changelog slightly more readable v1.2.0rc1 | Andrew Morgan | 2019-07-22 | 1 | -1/+1 |
| * | | 1.2.0rc1 | Andrew Morgan | 2019-07-22 | 54 | -56/+82 |
* | | | Demo uses deprecated cli option (#5725) | Jorik Schellekens | 2019-07-22 | 2 | -4/+4 |
* | | | Merge branch 'release-v1.2.0' into develop | Jorik Schellekens | 2019-07-22 | 5 | -24/+230 |
|\| | | |||||
| * | | Opentracing Documentation (#5703) | Jorik Schellekens | 2019-07-22 | 5 | -24/+230 |
* | | | Revert "Remove deprecated 'verbose' cli arg" | Jorik Schellekens | 2019-07-19 | 1 | -3/+4 |
* | | | Remove deprecated 'verbose' cli arg | Jorik Schellekens | 2019-07-19 | 1 | -4/+3 |
* | | | Merge pull request #5720 from matrix-org/erikj/transactions_upsert | Erik Johnston | 2019-07-19 | 2 | -0/+21 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2019-07-19 | 1 | -0/+1 |
| * | | | Use upsert when updating destination retry interval | Erik Johnston | 2019-07-19 | 1 | -0/+20 |
| | |/ | |/| | |||||
* | | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_state | Erik Johnston | 2019-07-19 | 2 | -2/+7 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2019-07-18 | 1 | -0/+1 |
| * | | | Delegate to cached version when using get_filtered_current_state_ids | Erik Johnston | 2019-07-18 | 1 | -2/+6 |
* | | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_state | Erik Johnston | 2019-07-19 | 8 | -41/+195 |
|\ \ \ \ | |||||
| * | | | | LoggingTransaction accepts None for callback lists. | Erik Johnston | 2019-07-19 | 3 | -6/+16 |
| * | | | | Update comment for new column | Erik Johnston | 2019-07-19 | 1 | -0/+3 |
| * | | | | Newsfile | Erik Johnston | 2019-07-18 | 1 | -0/+1 |
| * | | | | Use the current_state_events.membership column | Erik Johnston | 2019-07-18 | 1 | -17/+37 |
| * | | | | Track if current_state_events.membership is up to date | Erik Johnston | 2019-07-18 | 1 | -0/+45 |
| * | | | | Add background update for current_state_events.membership column | Erik Johnston | 2019-07-18 | 2 | -0/+54 |
| * | | | | Add membership column to current_state_events table. | Erik Johnston | 2019-07-18 | 5 | -20/+41 |
* | | | | | Don't accept opentracing data from clients. (#5715) | Jorik Schellekens | 2019-07-19 | 2 | -2/+2 |
* | | | | | Add 'rel' attribute to default welcome page. (#5695) | Neil Johnson | 2019-07-19 | 2 | -2/+3 |
* | | | | | Update the coding style doc (#5719) | Richard van der Hoff | 2019-07-19 | 2 | -30/+95 |
| |_|/ / |/| | | | |||||
* | | | | Speed up the PostgreSQL unit tests (#5717) | Amber Brown | 2019-07-19 | 2 | -3/+10 |
* | | | | Remove non-dedicated logging options and command line arguments (#5678) | Amber Brown | 2019-07-19 | 3 | -75/+13 |
| |_|/ |/| | |