1
0
Commit Graph

15515 Commits

Author SHA1 Message Date
Andrew Morgan
65c59f31bb Merge pull request #5809 from matrix-org/erikj/handle_pusher_stop 2020-02-20 15:59:46 +00:00
Andrew Morgan
57c2254daa Don't load the media repo when configured to use an external media repo (#5754) 2020-02-20 15:59:36 +00:00
Andrew Morgan
2a2111708f Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known 2020-02-20 15:59:29 +00:00
Andrew Morgan
ba68fd2ccc Merge pull request #5826 from matrix-org/erikj/reduce_event_pauses 2020-02-20 15:59:20 +00:00
Andrew Morgan
6eb66cd7b9 Cross-signing [1/4] -- hidden devices (#5759) 2020-02-20 15:59:10 +00:00
Andrew Morgan
59ad464464 Merge pull request #5843 from matrix-org/erikj/workers_hist_vis 2020-02-20 15:59:01 +00:00
Andrew Morgan
b8c92399b9 Merge pull request #5839 from tcitworld/fix-purge-remote-media-script 2020-02-20 15:58:54 +00:00
Andrew Morgan
408959c9d9 Merge pull request #5788 from matrix-org/rav/metaredactions 2020-02-20 15:58:43 +00:00
Andrew Morgan
c24b899d5a Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_sync 2020-02-20 15:58:17 +00:00
Andrew Morgan
e0333c9bcd Return 404 instead of 403 when retrieving an event without perms (#5798) 2020-02-20 15:58:09 +00:00
Andrew Morgan
27251dbbe6 Account validity: allow defining HTML templates to serve the us… (#5807) 2020-02-20 15:57:39 +00:00
Andrew Morgan
7fbc573c4a Merge pull request #5810 from matrix-org/erikj/no_server_reachable 2020-02-20 15:49:40 +00:00
Andrew Morgan
0d0b430410 Have ClientReaderSlavedStore inherit RegistrationStore (#5806) 2020-02-20 15:49:32 +00:00
Andrew Morgan
6e7f378644 Merge pull request #5808 from matrix-org/erikj/parse_decode_error 2020-02-20 15:49:23 +00:00
Andrew Morgan
e7ffd4a783 Merge pull request #5805 from matrix-org/erikj/validate_state 2020-02-20 15:49:15 +00:00
Andrew Morgan
233743a408 Merge pull request #5801 from matrix-org/erikj/recursive_tombstone 2020-02-20 15:49:08 +00:00
Andrew Morgan
d6f7efaa0c Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_room 2020-02-20 15:48:59 +00:00
Andrew Morgan
9d0cc25ba9 Merge pull request #5790 from matrix-org/erikj/groups_request_errors 2020-02-20 15:48:52 +00:00
Andrew Morgan
ee0bb90a23 Merge pull request #5804 from matrix-org/erikj/match_against_state_key 2020-02-20 15:48:44 +00:00
Andrew Morgan
83ff056228 Change user deactivated errcode to USER_DEACTIVATED and use it (#5686) 2020-02-20 15:47:36 +00:00
Andrew Morgan
d3e927bcbb Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_known 2020-02-20 15:44:08 +00:00
Andrew Morgan
f04902acb8 Remove DelayedCall debugging from test runs (#5787) 2020-02-20 15:43:32 +00:00
Andrew Morgan
6067698906 Merge pull request #5796 from matrix-org/erikj/disable_codecov_report 2020-02-20 15:43:23 +00:00
Andrew Morgan
7f38706f18 Merge pull request #5793 from matrix-org/erikj/fix_bg_update 2020-02-20 15:43:10 +00:00
Andrew Morgan
d0b8e90ac7 Merge pull request #5792 from matrix-org/erikj/fix_bg_update 2020-02-20 15:43:01 +00:00
Andrew Morgan
e6b6281122 Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keys 2020-02-20 15:41:49 +00:00
Andrew Morgan
bab6f6052c Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_state 2020-02-20 15:41:31 +00:00
Andrew Morgan
b7424f4943 Remove non-functional 'expire_access_token' setting (#5782) 2020-02-20 15:41:21 +00:00
Andrew Morgan
d478a36ae4 Room Complexity Client Implementation (#5783) 2020-02-20 15:41:08 +00:00
Andrew Morgan
2765c80376 Merge pull request #5774 from matrix-org/erikj/fix_rejected_membership 2020-02-20 15:40:59 +00:00
Andrew Morgan
e18528a059 Merge pull request #5752 from matrix-org/erikj/forgotten_user 2020-02-20 15:40:51 +00:00
Andrew Morgan
cfa8e2c554 Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqlite 2020-02-20 15:39:22 +00:00
Andrew Morgan
1fb5b9c09d Update the device list cache when keys/query is called (#5693) 2020-02-20 15:38:32 +00:00
Andrew Morgan
5a4f72ab94 Fix debian packages for sid being called buster. (#5775) 2020-02-20 15:18:36 +00:00
Andrew Morgan
1ab4dac3d7 Merge pull request #5780 from matrix-org/baboliver/loopingcall-args 2020-02-20 15:18:26 +00:00
Andrew Morgan
6aea5db0a2 Merge branch 'master' into develop 2020-02-19 16:07:20 +00:00
Andrew Morgan
bdcb8f47fc yet more changelog attribution fixes 2020-02-19 16:07:13 +00:00
Andrew Morgan
0d163652e9 1.2.1 2020-02-19 16:06:57 +00:00
Andrew Morgan
c89770f0e6 Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1 2020-02-19 16:06:06 +00:00
Andrew Morgan
471a6b1b56 Convert RedactionTestCase to modern test style (#5768) 2020-02-19 16:05:44 +00:00
Andrew Morgan
f945474952 Merge pull request #5767 from matrix-org/rav/redactions/cross_room_id 2020-02-19 16:05:34 +00:00
Andrew Morgan
c544308db4 Fix some error cases in the caching layer. (#5749) 2020-02-19 16:05:16 +00:00
Andrew Morgan
f7bf143f5d Merge branch 'master' into develop 2020-02-19 15:14:59 +00:00
Andrew Morgan
2569fdf82b 1.2.0 2020-02-19 15:14:49 +00:00
Andrew Morgan
01d1c028e0 Merge tag 'v1.2.0rc2' into develop 2020-02-19 15:13:44 +00:00
Andrew Morgan
39c3119c69 1.2.0rc2 2020-02-19 15:13:36 +00:00
Andrew Morgan
915d3d680a Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch 2020-02-19 15:13:27 +00:00
Andrew Morgan
88c330362e Stop trying to fetch events with event_id=None. (#5753) 2020-02-19 15:13:17 +00:00
Andrew Morgan
bc34ac53ec Fix servlet metric names (#5734) 2020-02-19 15:13:08 +00:00
Andrew Morgan
4b9bb9eeeb Add a prometheus metric for active cache lookups. (#5750) 2020-02-19 15:12:58 +00:00