1
0
Commit Graph

1666 Commits

Author SHA1 Message Date
Andrew Morgan
f8baba9c54 Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revoked 2020-02-26 12:26:11 +00:00
Andrew Morgan
4ab5cf88a2 Land improved room list based on room stats (#6019) 2020-02-26 12:12:33 +00:00
Andrew Morgan
f5a623f070 Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings 2020-02-26 12:09:38 +00:00
Andrew Morgan
2ac458d86d Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions 2020-02-26 12:08:58 +00:00
Andrew Morgan
31c75f338a Merge pull request #6125 from matrix-org/babolivier/deactivation-invite 2020-02-26 12:07:37 +00:00
Andrew Morgan
90900898ad Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978) 2020-02-26 12:03:29 +00:00
Andrew Morgan
eba1b9c156 Fix dummy event insertion consent bug (#6053) 2020-02-25 17:54:48 +00:00
Andrew Morgan
f6d3b67360 Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2 2020-02-25 17:54:41 +00:00
Andrew Morgan
41e59e6ac3 Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips 2020-02-25 17:54:30 +00:00
Andrew Morgan
4c42e1a042 Stop advertising unsupported flows for registration (#6107) 2020-02-25 17:53:48 +00:00
Andrew Morgan
e9387cea79 Refactor the user-interactive auth handling (#6105) 2020-02-25 17:53:22 +00:00
Andrew Morgan
b979833dbc Refactor code for calculating registration flows (#6106) 2020-02-25 17:50:27 +00:00
Andrew Morgan
e034f14fca Use the federation blacklist for requests to untrusted Identity Servers (#6000) 2020-02-25 17:46:09 +00:00
Andrew Morgan
b4c2acd7af Implement MSC2290 (#6043) 2020-02-25 15:42:28 +00:00
Andrew Morgan
74912d4eab Add 'failure_ts' column to 'destinations' table (#6016) 2020-02-25 14:28:24 +00:00
Andrew Morgan
e1f4c52e88 Fix well-known lookups with the federation certificate whitelist (#5997) 2020-02-25 14:28:16 +00:00
Andrew Morgan
15a9ca24aa Fix for structured logging tests stomping on logs (#6023) 2020-02-25 14:27:36 +00:00
Andrew Morgan
9b9dfc2766 Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-register 2020-02-25 14:22:17 +00:00
Andrew Morgan
1dfbad8f10 Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction 2020-02-25 13:57:56 +00:00
Andrew Morgan
136caf4221 Fix existing v2 identity server calls (MSC2140) (#6013) 2020-02-25 13:45:26 +00:00
Andrew Morgan
e75de4107d Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users 2020-02-25 11:53:22 +00:00
Andrew Morgan
6bedb3fe1c Merge pull request #5934 from matrix-org/erikj/censor_redactions 2020-02-25 11:41:35 +00:00
Andrew Morgan
0a3f3e30c4 Add a build info metric to Prometheus (#6005) 2020-02-25 11:37:27 +00:00
Andrew Morgan
87856c6aa9 Servers-known-about statistic (#5981) 2020-02-25 11:37:02 +00:00
Andrew Morgan
3c34ddab01 Remove extraneous unittest.DEBUG's 2020-02-25 11:36:04 +00:00
Andrew Morgan
476932cdef Increase expected state events in tests for new room by one 2020-02-25 11:14:11 +00:00
Andrew Morgan
91e030ae12 Fix and refactor room and user stats (#5971) 2020-02-25 10:16:48 +00:00
Andrew Morgan
6c058e3206 Remove unnecessary parentheses around return statements (#5931) 2020-02-24 17:54:53 +00:00
Andrew Morgan
3a59bd253e Revert "Use the v2 lookup API for 3PID invites (#5897)"
This reverts commit 978f263e7c, reversing
changes made to 4f6ee99818.
2020-02-24 17:23:46 +00:00
Andrew Morgan
3d5f1ebf06 Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent 2020-02-24 17:19:09 +00:00
Andrew Morgan
978f263e7c Use the v2 lookup API for 3PID invites (#5897) 2020-02-24 17:15:16 +00:00
Andrew Morgan
4f6ee99818 Config templating (#5900) 2020-02-21 11:38:45 +00:00
Andrew Morgan
35a521bd6f Implement a structured logging output system. (#5680) 2020-02-21 11:38:13 +00:00
Andrew Morgan
0c67c66e4f Merge pull request #5864 from matrix-org/erikj/reliable_lookups 2020-02-21 11:32:21 +00:00
Andrew Morgan
d0cde0f655 Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_registration 2020-02-21 11:22:20 +00:00
Andrew Morgan
12e21b5a80 Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail 2020-02-21 11:01:35 +00:00
Andrew Morgan
7d03cd449e Refactor the Appservice scheduler code (#5886) 2020-02-21 10:51:25 +00:00
Andrew Morgan
480d7e2cac Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookup 2020-02-20 16:00:11 +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
408959c9d9 Merge pull request #5788 from matrix-org/rav/metaredactions 2020-02-20 15:58:43 +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
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
471a6b1b56 Convert RedactionTestCase to modern test style (#5768) 2020-02-19 16:05:44 +00:00
Andrew Morgan
c544308db4 Fix some error cases in the caching layer. (#5749) 2020-02-19 16:05:16 +00:00
Andrew Morgan
bc34ac53ec Fix servlet metric names (#5734) 2020-02-19 15:13:08 +00:00
Andrew Morgan
f590f77a16 Replace returnValue with return (#5736) 2020-02-19 15:11:59 +00:00
Andrew Morgan
bf6300e0a1 Fix stack overflow in Keyring (#5724) 2020-02-19 11:50:18 +00:00